Commit Graph

1460 Commits

Author SHA1 Message Date
Isaac Connor 06673019f9 add default values for zmstats, zmaudit, zmtrigger in new Server 2018-01-29 10:41:43 -08: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 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
Isaac Connor 994766fd50 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-22 13:25:38 -08:00
Isaac Connor 8fe0e1bdc0 fix Debug => Logger::Debug 2018-01-22 15:58:01 -05: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 06c9266c62 use snapshot.jpg more 2018-01-22 03:27:01 +01:00
Isaac Connor 181a94de82 test for existence of port in url_parts 2018-01-21 11:10:34 -05:00
Isaac Connor e26747b5cc show port when it's not the standard port 2018-01-19 12:15:26 -05:00
Isaac Connor 95f054c1e6 Show entire path for ffmpeg monitors. Strip out username/password though 2018-01-18 12:40:41 -08:00
Isaac Connor ecd5e01b92 Show port when using Remote Method and Port is non-standard 2018-01-18 10:21:05 -08:00
Isaac Connor ace66cf977 show port in source column 2018-01-17 13:33:22 -08:00
Isaac Connor 494d080740 show port in source column 2018-01-17 13:27:44 -08:00
Isaac Connor 4fecdbd0fa Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-17 12:28:33 -08:00
Isaac Connor 212bfd4a2c add Monitor to info shown on event 2018-01-17 12:20:15 -08:00
Isaac Connor 93623f3fd8 fix filtering by monitor in montagereview 2018-01-17 11:59:54 -08:00
Isaac Connor 1fbb5bc0f8 Fix zmaudit.pl => zmaudit, etc. 2018-01-17 14:22:04 -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 b09bb528a5 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-16 08:42:41 -08:00