Commit Graph

535 Commits

Author SHA1 Message Date
Isaac Connor bb924ee078 add report_event_audit 2018-04-10 13:06:01 -07:00
Isaac Connor 053322c2c3 add NextFrameId to Frames 2018-04-03 12:32:14 -07:00
Isaac Connor 7a5d4d3b19 adjust frame_id for bulk frames 2018-04-03 12:31:39 -07:00
Isaac Connor 09e05b1313 Clean up date stuff, use moment for formatting in secs2dbstr etc 2018-04-03 10:38:03 -07:00
Isaac Connor 7346a8c733 add select button 2018-04-03 10:36:58 -07:00
Isaac Connor 793f630ee0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-02 10:43:07 -07:00
Isaac Connor d1dd16b81c fix event_id to EventId 2018-03-28 13:07:53 -07:00
Isaac Connor b4c13d56d6 Merge ../ZoneMinder.master into storageareas 2018-03-06 12:29:59 -05: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 eeb7190812 fix rand replacing in image url 2018-02-14 13:16:30 -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 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 63a214869e rework montagereview to be more performant. 2018-02-09 07:31:19 -08:00
Isaac Connor cb9eef8563 show No streams found if none were found 2018-02-09 07:30:12 -08:00
Isaac Connor 4777808cf0 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-02-08 13:15:41 -05:00
Isaac Connor 95cfdb327d further separate addBtn and cloneBtn, fixes 2018-02-08 13:15:27 -05:00
Isaac Connor 4240dc4bde spacing, add a test for minTime being after maxTime 2018-02-08 09:30:26 -08:00
Isaac Connor cfe53c0ffe Explicitly set the danger class on each line because they can get out of sync when using the All toggle 2018-02-08 09:57:11 -05:00
Isaac Connor babae4629a Update and fix console buttons. Use a separate button for clone 2018-02-08 09:47:16 -05:00
Isaac Connor e25af4b40c cleanup, reset result 2018-02-02 16:07:13 -05:00
Isaac Connor 060e6893cc fix Storage dropdown population and don't clear value on line type change 2018-02-02 12:48:22 -05:00
Isaac Connor 132fff1931 An ok json return with no status is possible now 2018-01-31 14:35:48 -05:00
Isaac Connor a60da6811b revert adding custom port for status updates. It breaks in the non-multiserver case. 2018-01-29 15:17:22 -05:00
Isaac Connor a76fcb331c Remove debugging. Treat can't get semaphore as a non-error 2018-01-29 08:25:46 -08:00
Isaac Connor dc6842bfbd Add remote server port to monitor url 2018-01-29 07:32:40 -08:00
Isaac Connor b793e6659b add onFailure logger, and change link to chain so that responses don't just disappear 2018-01-29 07:32:02 -08:00
Isaac Connor 984d3a2dd1 add Monitor Name to the response listing the available camera feeds 2018-01-29 07:30:46 -08:00
Isaac Connor dc46f23af0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-26 10:17:54 -08:00
Isaac Connor d001ce467e use get for status JSON requests 2018-01-26 10:31:55 -05:00
Isaac Connor 1e3cf9bbf8 handle no streams better 2018-01-25 09:14:21 -08:00
Isaac Connor fb50f6f996 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-24 17:14:42 -08:00
Isaac Connor c7ecd580c1 Fix #81 by testing for non-numeric characters in LIMIT. Change type of input to number, making it harder to enter non-numeric characters 2018-01-24 10:27:01 -05:00
Isaac Connor ea4937b75e put back missing s 2018-01-23 17:47:24 -05:00
Isaac Connor d9252e2d47 Merge branch 'storageareas' into tesla 2018-01-23 13:29:37 -08:00
Isaac Connor 0742217599 Only populate monitorNames if query is valid 2018-01-23 13:28:29 -08:00
Isaac Connor 994766fd50 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-22 13:25:38 -08:00
Isaac Connor 8a27ea3a04 Always populate the monitorNames object, and check for duplicate names when saving an existing Monitor as well as new monitors 2018-01-22 11:42:52 -05:00
Isaac Connor e78a40b45f Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-16 11:02:20 -08:00
Isaac Connor 27ebf1a4aa Comment out debug code 2018-01-16 14:02:04 -05:00
Isaac Connor bfa31297be Merge branch 'storageareas' into tesla 2018-01-12 11:26:19 -08:00
Isaac Connor c139f7a1bf we don't need the group setting in the url 2018-01-12 11:24:52 -08:00
Isaac Connor ff9f43b5a1 put back code to switch to add_monitors 2018-01-12 08:11:25 -08:00
Isaac Connor 666005fb5d fix single event replay by fixing the reference to player which should be vid 2018-01-11 14:42:00 -05:00
Isaac Connor b013da6b95 Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it. 2018-01-11 13:14:11 -05:00
Isaac Connor 74269fea73 make montagereview load event images from the server that the storage is located on 2017-12-22 12:33:30 -08:00
digital-gnome b4c0f13adf Allow nondate values
Supports -# days/hours/etc
2017-12-20 15:23:14 -05:00
digital-gnome d034ae9ab2 Default value for new brackets 2017-12-18 22:58:38 -05:00
Isaac Connor 46673bafdb
Merge pull request #68 from digital-gnome/montagereview-datepicker
Montagereview datepicker
2017-12-18 13:39:58 -05:00
digital-gnome de6ebfc341 Remove chosen from some filter dropdowns and restyle to match 2017-12-17 22:04:10 -05:00