Emmanuel Papin
|
2acfe5b395
|
Fix plugin window title name
|
2015-06-06 18:35:43 +02:00 |
|
Emmanuel Papin
|
905237d7a6
|
Fix undefined variable issue with pOptions and call only pLang for translation
|
2015-05-30 14:33:15 +02:00 |
|
Emmanuel Papin
|
eff56664c3
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Conflicts:
web/lang/de_de.php
web/skins/classic/views/monitor.php
web/skins/classic/views/plugin.php
|
2015-05-28 23:43:13 +02:00 |
|
Emmanuel Papin
|
0241f844d2
|
Add space in array formatting
|
2015-05-15 08:11:51 +02:00 |
|
Emmanuel Papin
|
775da60382
|
Remove any call to ['Name']
|
2015-05-14 20:49:36 +02:00 |
|
Emmanuel Papin
|
676968ed04
|
Add list option for plugins
|
2015-05-14 11:38:38 +02:00 |
Andrew Bauer
|
3a94712db2
|
add translate function
|
2015-05-10 08:10:30 -05:00 |
|
Emmanuel Papin
|
49116a27d7
|
Fix a conflict with php variable
|
2015-05-06 23:16:09 +02:00 |
|
Emmanuel Papin
|
5283369ed6
|
Reintroduce modif after upstream merge
|
2015-05-06 01:03:36 +02:00 |
|
Emmanuel Papin
|
630c8f335f
|
Merge master
|
2015-05-05 23:37:20 +02:00 |
SteveGilvarry
|
45fd7f1eca
|
Found some old open tags left over
|
2015-04-08 20:11:26 +10:00 |
|
Emmanuel Papin
|
63158ebe7d
|
Improve management of plugin options
|
2015-03-08 13:13:49 +01:00 |
|
Emmanuel Papin
|
491df7671d
|
Fix a typo error in a variable name
|
2015-01-04 14:01:01 +01:00 |
|
Emmanuel Papin
|
54d8e103d9
|
Replace short php tags in plugin.php
|
2014-12-22 00:28:16 +01:00 |
|
Emmanuel Papin
|
82ef0edac3
|
Restore conflictuous modifications for plugin support
|
2014-12-13 20:02:58 +01:00 |
|
Emmanuel Papin
|
d961831355
|
Fix conflict when merging upstream master
|
2014-12-13 19:54:54 +01:00 |
|
SteveGilvarry
|
e87e69fa57
|
Ran script to replace all Short open tags
|
2014-12-05 10:44:23 +11:00 |
|
manupap1
|
eae1357a45
|
Support plugins in web user interface
|
2014-11-12 00:53:53 +01:00 |
Isaac Connor
|
3393a63525
|
more updates
|
2013-12-17 12:53:15 -05:00 |
|
Isaac Connor
|
2a45506bff
|
more quoting removal
|
2013-10-17 16:15:04 -04:00 |
nextime
|
33cbd89212
|
Migrate svn to git
|
2013-03-17 00:45:21 +01:00 |