Commit Graph

4177 Commits

Author SHA1 Message Date
Isaac Connor b4c13d56d6 Merge ../ZoneMinder.master into storageareas 2018-03-06 12:29:59 -05:00
tim 0654c7e3b2 Adding group handling in API 2018-03-04 23:01:52 -08:00
Steve Gilvarry 1c740de5dc
Add Return False to Event Back 2018-03-04 13:37:30 +11:00
Steve Gilvarry db8ab28845
Add return false to window.history.back
Adding this makes it work in Safari
2018-03-04 08:37:21 +11:00
Andrew Bauer ed4dac761a
Merge pull request #2049 from ZoneMinder/fix_2044
Fix 2044
2018-03-03 12:49:57 -06:00
Isaac Connor 2864876d28 fix spacing, add code comment 2018-03-03 09:25:04 -08:00
Isaac Connor c53b6ffbb0 rework montagereview to load data faster and leave event and frame data in json objects 2018-03-02 18:26:50 -08:00
Andrew Bauer 3e77a85549
url to css/spinner.css should be relative
fixes http 404 not found errors for this css file
2018-03-02 17:19:10 -06:00
Isaac Connor 7e628bc3fd add showing groups under Monitor Name on console 2018-03-01 19:23:46 -08:00
Isaac Connor 9a157bf4ca add Type, MaxFPS, AlarmMaxFPS to field defaults 2018-03-01 19:23:27 -08:00
Isaac Connor debe4607bc add Parent and Parents functions 2018-03-01 19:23:03 -08:00
Isaac Connor c5eec7e2fd hide save button on successful form completion so we don't get a duplicate submit 2018-02-27 15:10:45 -08:00
Isaac Connor 83fad681b3 use button tags and hide the button content after click 2018-02-27 11:49:13 -08:00
Isaac Connor c50627fd88 GroupIds needs to be an array 2018-02-27 11:21:04 -08:00
Isaac Connor 0312dc3c2d Add Group saving to Monitor saving 2018-02-27 11:20:52 -08:00
Isaac Connor 67cc7dcf7c Add a GroupIds function to return the groups 2018-02-27 11:20:41 -08:00
Isaac Connor 6a6eb87686 fix defaults 2018-02-26 18:00:02 -08:00
Isaac Connor 793e87c26d Apply chosen style to group and linked monitors dropdown 2018-02-26 17:58:20 -08:00
Isaac Connor 735e36c2a8 split htmlSelect into htmlOptions 2018-02-26 17:08:30 -08:00
Isaac Connor 944298428a break out get_groups_dropdown to call a function called get_dropdown_options to populate thje options 2018-02-26 16:10:10 -08:00
Isaac Connor 92c34f6043 add Groups to monitor edit 2018-02-26 16:09:36 -08:00
Isaac Connor 9d1a8b1e18 Add the danger css tag to cpuload > 5, freeram < 10% and freeswap < 10% 2018-02-26 10:39:45 -08:00
Isaac Connor bfbefc4c32 Use our new Control object to do the saving instead of a generic function 2018-02-26 07:31:48 -08:00
Isaac Connor c6f632325e create an object for Controls entries, with appropriate defaults 2018-02-26 07:31:22 -08:00
Isaac Connor 464b588f08 add a case for toggle, which are booleans and default them to false 2018-02-26 07:29:49 -08:00
Isaac Connor 9480adcc31 include authentication info when building the link to mp4 2018-02-22 13:05:53 -05:00
Isaac Connor c5081d1e4e drop session before executing filter 2018-02-21 13:54:06 -05:00
Isaac Connor 7d88e25ef9 simplify thumbnail/snapshot usage a bit 2018-02-19 17:25:49 -05:00
Isaac Connor 505e726636 turn off debug 2018-02-14 13:51:49 -05:00
Isaac Connor eeb7190812 fix rand replacing in image url 2018-02-14 13:16:30 -05:00
Isaac Connor 4c1abf93ba fixup navbarreloader wrt auth_hash 2018-02-14 13:16:14 -05:00
Isaac Connor 002f22f685 generateAuthHash is already called earlier in index.php, so it will always be up to date. Just include it in the response. 2018-02-14 13:15:22 -05:00
Isaac Connor 45bf4544ca rename SetImageSource to getImageSource which is what it actually does 2018-02-14 11:58:47 -05:00
Isaac Connor a09bf3b097 slightly improve auth debugging 2018-02-14 11:58:00 -05:00
Isaac Connor 2774fded57 add debugging and put NavBarHTML back in message 2018-02-14 11:57:45 -05:00
Isaac Connor 4df8cdc685 add auth_hash updating to the navbar reload. 2018-02-14 10:44:48 -05:00
Isaac Connor c7a43a53f0 Sort the event records 2018-02-13 11:28:06 -05:00
Isaac Connor 535cdf6485 When there isn't an event for the given moment, play the previous one. If still no events found, popup live 2018-02-13 11:27:55 -05:00
Isaac Connor 9fa28106e5 return proper hostname when not using multiple servers 2018-02-12 14:44:58 -05:00
Isaac Connor ad1b9699f1 Remove CssFileExtra 2018-02-11 14:18:40 -05:00
Isaac Connor 7abe7d6fe3 fix centering in buttons 2018-02-11 14:18:26 -05:00
Isaac Connor a35ba812b7 fix merging conditions 2018-02-09 07:57:52 -08:00
Isaac Connor 08c359fdbc add some margin to minTime and maxtime 2018-02-09 07:31:30 -08:00
Isaac Connor 63a214869e rework montagereview to be more performant. 2018-02-09 07:31:19 -08:00
Isaac Connor 6518311022 Use Status and CaptureFPS and AnalysisFPS to do status coloration 2018-02-09 07:31:03 -08:00
Isaac Connor 4b51fed500 Rework order of filters. Put Monitors at the end. recalc selected_monitor_ids 2018-02-09 07:30:53 -08:00
Isaac Connor 6ee133bf6b give some left margin on labels 2018-02-09 07:30:43 -08:00
Isaac Connor c454d5355d adjust column width on console 2018-02-09 07:30:32 -08:00
Isaac Connor cb9eef8563 show No streams found if none were found 2018-02-09 07:30:12 -08:00
Isaac Connor 6b6fdc7cee Log the sql before running it 2018-02-09 07:29:10 -08:00