Commit Graph

1505 Commits

Author SHA1 Message Date
Isaac Connor 74da3e9c02 fix auth requirement by checking for user when AUTH is on 2014-12-11 17:09:18 -05:00
Isaac Connor fafef86298 Merge branch 'control_improvements' 2014-12-08 16:52:52 -05:00
Isaac Connor 27b9001eb4 default MoveRoot to empty to quiet an error in logs 2014-12-08 16:52:10 -05: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 f57f903aa6 Add views subdir 2014-12-01 16:10:01 -05:00
Isaac Connor af0d9a1065 bug fix for listing the css options.
use SELECTED="SELECTED" instead of just SELECTED
2014-12-01 15:58:00 -05:00
Isaac Connor fed12291be add flat to the subdirs 2014-12-01 15:57:44 -05:00
Isaac Connor 9f7d31949d remove the flat subdir 2014-12-01 15:55:22 -05: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
Isaac Connor d7e08559d6 Merge pull request #582 from hanzese/patch-1
Update et_ee.php
2014-12-01 15:34:53 -05:00
Hannes e60919f19a Update et_ee.php
Translating some code comments.
2014-11-27 03:51:40 +02:00
Hannes 92b65c553e Update et_ee.php
Changing back charset-utf-8.
2014-11-27 03:43:59 +02:00
Isaac Connor ebe602616b needs this one too 2014-11-26 14:30:53 -05:00
Isaac Connor 593f0781d6 this css directory was moved under /web/skins/classic/css/views so we don't need to have it in the SUBDIRS 2014-11-26 11:57:35 -05:00
Isaac Connor 641c94d5be add CSSDescription which is used on the options tab for skin 2014-11-26 11:57:01 -05:00
Isaac Connor 193cb71b71 Add option for setting css to use with the skin. Also happens to add missing elements of the table for the skins tab and cleans up some spacing. Also, use a variable to tell whether to reload the page or not, which is required after you change the skin or css. 2014-11-26 11:55:53 -05:00
Isaac Connor a412799003 Move the skins/classic/views/css dir under skins/classic/css/classic/views and update Makefile.am's to match 2014-11-26 11:29:04 -05:00
Isaac Connor 5bf34de07b Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use. 2014-11-26 11:26:29 -05:00
Isaac Connor bf3ec7b490 Since the css files are in subdirectories now, thise just needs to reference them 2014-11-26 11:24:55 -05:00
Isaac Connor ebb31f12d2 Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use. 2014-11-26 11:23:06 -05:00
Isaac Connor 53b70d27fb Use the global variable which gets setup in web/index.php to look in a subdirectory of web/skins/classic/css to find the css files. 2014-11-26 11:18:03 -05:00
Isaac Connor 4c864aec35 fix saving groups 2014-11-25 14:29:15 -05:00
Emmanuel Papin 4e9c3494b8 Convert french lang file to UTF-8 2014-11-20 20:51:49 +01:00
hanzese 993a186d06 Update et_ee.php
ZoneMinder Estonian Translation by Hannes
2014-11-19 10:25:35 +02:00
hanzese db86ac7b40 Update et_ee.php
ZoneMinder Estonian Translation by Hannes
2014-11-17 18:06:37 +02:00
hanzese 79ca3dd736 Update et_ee.php
ZoneMinder Estonian Translation
2014-11-17 02:53:50 +02:00
Kyle Johnson 35530c627a Initial commit of Logs MVC 2014-11-15 19:03:40 +00:00
Kyle Johnson 0129ca5f74 Rework the ConfigParser component. 2014-11-15 19:03:10 +00:00
Kyle Johnson e7d726bf75 Don't print out the Config string to the file system. 2014-11-15 19:02:54 +00:00
Kyle Johnson fcaa67e3c3 Slight refactor of ConfigParser Component. Needs more work. 2014-11-15 19:02:18 +00:00
Kyle Johnson cf3d0f962c Add view for Configs Edit 2014-11-15 19:02:03 +00:00
Kyle Johnson 9f80a7d5f5 Show a list of Config Key:Value pairs 2014-11-15 19:01:32 +00:00
Kyle Johnson 9268c503af Do not display the "hidden" config category 2014-11-15 19:01:19 +00:00
Kyle Johnson b9f54056da Add component for dumping Config table as HTML 2014-11-15 18:59:58 +00:00
Kyle Johnson de631075d3 Return possible source types ni DB via API 2014-11-15 18:59:24 +00:00
Kyle Johnson 0d57306790 Find category configs only when $category is not null. API 2014-11-15 18:58:58 +00:00
Kyle Johnson 9f150c4e46 Revert "Find category configs only when $category is not null. API"
This reverts commit efbbcadc7dad9aa52a7aab0483546eab48840ae6.
2014-11-15 18:58:51 +00:00
Kyle Johnson b88febeaee Find category configs only when $category is not null. API 2014-11-15 18:58:43 +00:00
Kyle Johnson 0a7ba112ab API support for querying config categories.
Either return a list of distinct categories, or all configs under a
certain category
2014-11-15 18:55:20 +00:00
Isaac Connor 9c30b806f2 don't require SystemView to view/select groups.
Change the way the groups ine is displayed to give people some idea that it might have something to do with grouping
use _POST instead of _REQUEST
2014-11-13 10:38:20 -05:00
Isaac Connor ebe35c2135 handle empty [file] to prevent logzilla 2014-11-13 09:17:54 -05:00
Andrew Bauer 26c9a77590 Update skin.js
Fix issue caused by a previous merge
2014-11-10 12:12:54 -06:00
Isaac Connor 2f32c3895b Merge branch 'release-1.28'
Conflicts:
	web/skins/flat/js/skin.js
2014-10-22 15:10:19 -04:00
Isaac Connor c5a1d9ffa9 fix console refresh in this skin too 2014-10-22 10:58:06 -04:00
Andrew Bauer 23ebbf3887 Update skin.js
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-21 17:22:33 -05:00
Isaac Connor 8d225566b1 Move this line down to mitigate the problem where the console doesn't refresh. 2014-10-20 15:32:30 -04:00
Andrew Bauer 7ea003441d Merge pull request #371 from m-bene/resizeWindows
Reduce window size to exclude task bar area
2014-10-09 14:46:46 -05:00
Isaac Connor bec58a6011 fixes WRT to db logging. I believe fixes issue #504 2014-09-26 14:43:58 -04:00