Commit Graph

1477 Commits

Author SHA1 Message Date
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 a4c59e3e50 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-02-07 09:07:57 -05:00
Isaac Connor dec82ecf5c Fix for when specifying page 1 and no pages 2018-02-07 09:07:51 -05:00
Isaac Connor e25af4b40c cleanup, reset result 2018-02-02 16:07:13 -05:00
Isaac Connor dee843d7da add All and remove default from Storage dropdown options 2018-02-02 12:48:49 -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 26ac1fd695 Include soap version in list of onvif cameras 2018-02-01 11:32:13 -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 7c3efc02cd put back old add monitor popup 2018-01-31 11:56:57 -05:00
Isaac Connor b1f2b677c3 remove path from source 2018-01-30 10:09:12 -05:00
Isaac Connor b9a98d34bf strip query and scheme from source 2018-01-29 19:03:16 -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 6acb555c52 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-29 10:42:23 -08:00
Isaac Connor d19b8bc5cf add default value for ServerId in new Storage Object 2018-01-29 10:41:59 -08:00
Isaac Connor 06673019f9 add default values for zmstats, zmaudit, zmtrigger in new Server 2018-01-29 10:41:43 -08:00
Isaac Connor 8979f14314 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-29 11:29:33 -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 4751920423 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-29 07:49:38 -08:00
Isaac Connor 35cda5cf17 Merge sjc04p1fviap02:ZoneMinder into storageareas 2018-01-29 07:45:55 -08:00
Isaac Connor a490c0e5bf Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-29 07:45:37 -08:00
Isaac Connor a782ef1db7 Add debug tests for loading all events 2018-01-29 07:45:28 -08:00
Isaac Connor e672841a8d Add remote server port to monitor url 2018-01-29 07:42:43 -08:00
Isaac Connor 03122b9015 add onFailure logger, and change link to chain so that responses don't just disappear 2018-01-29 07:38:02 -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 0b2d752ea4 Use chosen on the MonitorIds select. 2018-01-29 10:29:59 -05:00
Isaac Connor 2dcb0d183f Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-28 18:07:33 -08:00
Isaac Connor 8a4b17fb50 turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable 2018-01-28 15:13:57 -05:00
Isaac Connor 5d4fde88d9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-27 12:17:13 -08:00
Isaac Connor 456f29fcba Rename column Id OF Monitor_Statuses to simplify JOINS. 2018-01-26 13:39:37 -05: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 703cd332df Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-25 08:43:53 -08:00
Isaac Connor 356015a492 Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla 2018-01-25 08:42:08 -08:00
Isaac Connor 42a27c2ca9 Fix Servers dropdown 2018-01-25 08:41:54 -08:00
Isaac Connor 57bae7cf17 Fix filtering 2018-01-25 09:14:09 -05:00
Isaac Connor fb50f6f996 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-24 17:14:42 -08:00
Isaac cc34a3c566 change button type 2018-01-24 23:08:12 +01:00
Isaac Connor 50fc4a2d94 Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table. 2018-01-24 11:51:11 -05: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 fdf1ef795f Add default value for newStorage['StorageId'] 2018-01-23 13:28:46 -08:00
Isaac Connor 0742217599 Only populate monitorNames if query is valid 2018-01-23 13:28:29 -08:00
Isaac Connor c85bb6e614 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-23 09:44:28 -08:00
Isaac de08e3114e more and less debug 2018-01-23 18:16:37 +01:00
Isaac 8bd1e4cec6 Only show groups filter if there are groups 2018-01-23 18:15:59 +01:00