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

61 Commits

Author SHA1 Message Date
Isaac Connor cf0e4935f1 cleanups, more debugging 
Also, when adding a monitor, a user who is restricted to monitors can't create one, add an error essage about it instead of failing silently.
 2016-10-21 12:43:23 -04:00
Isaac Connor fc540786a5 Move login by auth hash out of actions.php and into index.php. Double quotes to single quotes and google code style changes in indx.php 2016-10-20 11:51:42 -04:00
Isaac Connor 0c956d6728 fix logic when disabling a monitor 2016-10-11 12:11:33 -04:00
Isaac Connor 68936b9af9 code style, replace with ' 2016-10-03 21:58:57 -04:00
Isaac Connor f4418260e7 Should only generate an auth hash if we are logged in. 2016-10-03 21:18:13 -04:00
Isaac Connor 16bee2ef55 only generate auth hash if we are logged in 2016-10-02 14:13:54 -04:00
Isaac Connor 65e33d6c19 synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter 2016-05-27 11:11:30 -04:00
Isaac Connor 1ae23b49bf generateAuthHash early when session is active, it will get cached in session 2016-09-28 09:08:36 -04:00
Isaac Connor 1add270b72 fixup saving Filters and executing them 2016-09-20 12:17:19 -04:00
bhaal2 01ae4de123 Modified so deleting a filter is done by table Id instead of Name 2016-09-15 01:59:31 +10:00
bhaal2 0d83fc5be7 Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters. 2016-09-15 01:27:59 +10:00
Isaac Connor 6d1f85bcd6 fix spacing and code style, and when logging in, change view to console 2016-07-22 16:03:39 -04:00
Isaac Connor c25b680799 Merge branch 'fix_filter_actions' into storageareas 2016-05-27 11:12:18 -04:00
Isaac Connor 4b4add49bd Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas 2016-04-15 13:18:35 -04:00
Isaac Connor ccb5ea766d add the toggle for RecordAudio so that the checkbox works to turn off Audio 2016-04-15 13:16:52 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
SteveGilvarry d40bf89b17 Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
Isaac Connor 51d814ad46 add concurrent to save filter 2016-02-05 11:58:05 -05:00
Isaac Connor c345d697b2 missed dbServer -> dbStorage 2015-12-15 11:21:52 -05:00
Isaac Connor 9ffbaabde5 add save and delete actions for Storage 2015-12-15 11:12:33 -05:00
Isaac Connor 6cfd993890 Merge branch 'master' into multi-server 2015-12-09 10:43:38 -05:00
Isaac Connor 53dec9f26d check for setting of __REQUEST['object'] to silence php NOTICE 2015-12-09 10:43:23 -05:00
Isaac Connor e6c9830728 Use Monitor class instead of old sql 2015-12-09 09:23:36 -05:00
Isaac Connor e4d51e1819 Merge branch 'master' into multi-server 2015-09-28 10:04:23 -04:00
Pliable Pixels d751c3ad61 recaptcha now displays translated message if secret is wrong 2015-09-25 11:11:15 -04:00
Pliable Pixels e5a6889253 fixed conflict 2015-09-24 15:51:16 -04:00
Pliable Pixels 23b549a471 recaptcha fixes to avoid lockout 2015-09-24 15:44:35 -04:00
Pliable Pixels ae6fd7daea fixed constant check when not defined 2015-09-24 09:57:43 -04:00
Isaac Connor 535a760f26 Merge branch 'master' into multi-server 
Conflicts:
	configure.ac
 2015-09-16 09:12:55 -04:00
Isaac Connor fb872315d1 add an error log entry for unknown action 2015-09-16 08:38:53 -04:00
Isaac Connor b680aa41c5 save should be Save 2015-09-15 17:26:31 -04:00
Andrew Bauer 04fcc253bd Merge pull request #1048 from pliablepixels/1046-google-recaptcha 
Google recaptcha
 2015-09-01 08:18:54 -05:00
Pliable Pixels 22a7a1d53d Handled situation where user enables captcha but forgets to supply keys 2015-08-31 20:39:28 -04:00
Pliable Pixels f7fea2fe48 Removed dependency on recaptcha client library 2015-08-29 15:13:15 -04:00
Pliable Pixels 73fa051ef8 Google recaptcha 2015-08-29 13:29:52 -04:00
Andy Bauer 395e628541 Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-29 07:57:18 -05:00
Robin Daermann d68e8e8f68 Restart capture process after deleting a Privacy zone 2015-08-27 10:12:54 +02:00
Robin Daermann dc8a3769e7 Make the capture process restart if a Privacy zone got changed 2015-08-27 09:45:12 +02:00
Andrew Bauer 2fbf79674b Add RTSP Describe checkbox to web console 2015-08-21 10:32:50 -05:00
Linwood-F 987db68452 Fix extra image copy; fix options unset of exif toggle 2015-08-18 14:39:55 -04:00
Andrew Bauer 0dc35553ef modify group delete action 2015-08-15 14:03:11 -05:00
Andrew Bauer 1d688be1a1 propagate canEditGroup permission 2015-08-15 13:22:13 -05:00
Andrew Bauer 2770e752b4 create new permission group "Groups" in php 2015-08-15 11:56:51 -05:00
Isaac Connor 04366e752a add Servers to options, a server editing popup and a server selection to monitors 2015-07-09 11:41:46 -04:00
Andrew Bauer 8657d0a243 Merge pull request #696 from ZoneMinder/improve_deleteEvent 
Improve delete event
 2015-02-09 07:15:27 -06:00
Isaac Connor 4524a61a50 prevent error message in log when Enabled is not checked 2015-02-06 14:15:26 -05:00
Isaac Connor bcdac0104f pass a minimum event hash instead of the event id to deleteEvent 2015-02-06 11:50:07 -05:00
Isaac Connor 74929236e3 put the sendControlCommand(quit) into the right place 2015-01-07 16:56:10 -05:00
Isaac Connor d0138af00c use new sendControlCommand function to send normal commands as well as send the quit command on monitor edit. 2015-01-07 16:24:34 -05:00
Isaac Connor 4c864aec35 fix saving groups 2014-11-25 14:29:15 -05:00