ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,061 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

404 Commits

Author SHA1 Message Date
Emmanuel Papin d961831355 Fix conflict when merging upstream master 2014-12-13 19:54:54 +01:00
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 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 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 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
manupap1 dac1756d0d Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2014-11-14 10:55:05 +01: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
manupap1 eae1357a45 Support plugins in web user interface 2014-11-12 00:53:53 +01: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 2018228daf fix V inputs 2014-08-21 11:58:51 -04:00
Isaac Connor 6564c4359b adjust monitor popup height 2014-08-21 11:15:35 -04:00
Isaac Connor 707f2e84db increase monitor popup height to fit v4l settings in 2014-08-21 11:14:48 -04:00
Isaac Connor f93a28f2be fixup multibuffering so it can have a null value which makes it fall back to config table 2014-08-21 11:13:38 -04:00
Isaac Connor 0834e1b61d I see no reason for these to be posts. They retrieve info, that's it. 2014-07-29 16:15:31 -04:00
Isaac Connor 96322dd59c remove v4l tab that I never used 2014-07-29 14:45:02 -04:00
Isaac Connor b2f1c2fe68 Merge branch 'v4l_to_monitor' 2014-07-24 14:35:23 -04:00
Isaac Connor b3f078eaa5 add the word disabled after function if the monitor is not enabled. 2014-07-23 15:46:37 -04:00
Isaac Connor edd794a993 ensure captures_per_frame >0 
add missing lang entries for MultiBuffer and CapturesPerFrame
 2014-07-14 14:07:28 -04:00
Isaac Connor 9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Isaac Connor 8f88e2a6c0 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-07-08 10:54:16 -04:00
Isaac Connor 2be38d7f32 fix problem editing users, a semi-colon screwed up the if statement. 
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
 2014-07-08 10:52:55 -04:00
Andrew Bauer 371c1bae3d Merge pull request #359 from knnniggett/eyezm 
fix eyezm authentication issue
 2014-07-07 17:57:48 -05:00
Andrew Bauer 5c8c00c1ab Fix double login issue with eyezm 2014-07-07 17:48:33 -05:00
Isaac Connor 70471936a7 get rid of escapeSql and replace it's calls with new PDO-style calls to FetchOne FetchALl,e etc 2014-07-07 10:06:50 -04:00
Andrew Bauer 48d961082c Determine full path to arp 2014-07-05 11:11:36 -05:00
Andrew Bauer c2e2a12995 Merge pull request #406 from m-bene/focusPopup 
focus popup windows
 2014-07-04 13:00:45 -05:00
Andrew Bauer 9a0eb63df2 Merge pull request #415 from m-bene/selectSkin 
make skin selection persistent
 2014-07-04 12:57:37 -05:00
Andrew Bauer 5aad658262 Fixes errors when opening Filters (issue #34) 2014-07-04 11:00:00 -05:00
stevegilvarry a8d60aa727 Fixed missing $ on ARRAY(event[id]). Fixes #455 2014-07-02 23:58:44 +10:00
Isaac Connor 623837115b fix missing ARRAY() around params to dbFetchOne 2014-06-25 14:01:45 -04:00
Isaac Connor 5fac727c2f Users tab should always be available 2014-06-25 13:40:37 -04:00