Emmanuel Papin
|
676968ed04
|
Add list option for plugins
|
2015-05-14 11:38:38 +02:00 |
|
Emmanuel Papin
|
9929233e75
|
Merge branch 'master' into plugin_support_test
Conflicts:
configure.ac
web/lang/fr_fr.php
|
2015-02-25 23:14:25 +01:00 |
ljack
|
8616fdb33d
|
fix import path
|
2015-02-25 18:09:23 +02:00 |
|
ljack
|
6233432559
|
fix import path
|
2015-02-25 18:08:41 +02:00 |
Isaac Connor
|
c3f96ad8ca
|
fix path to the zone point gif
|
2015-02-19 11:11:01 -05:00 |
|
Emmanuel Papin
|
d961831355
|
Fix conflict when merging upstream master
|
2014-12-13 19:54:54 +01:00 |
Isaac Connor
|
5abc58ea14
|
Merge pull request #620 from SteveGilvarry/11-php-short-tags
Replace PHP Short Open Tags - Fixes #11
Works for me too.
|
2014-12-08 14:39:24 -05:00 |
|
Isaac Connor
|
2c1e4a9965
|
fix the paths so that the ptzControls are visible
|
2014-12-08 10:34:25 -05:00 |
SteveGilvarry
|
e87e69fa57
|
Ran script to replace all Short open tags
|
2014-12-05 10:44:23 +11:00 |
|
Isaac Connor
|
82c01479c6
|
move flat css files into the classic skin.
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
|
2014-12-01 15:44:01 -05:00 |