Commit Graph

4100 Commits

Author SHA1 Message Date
Isaac Connor 26ac1fd695 Include soap version in list of onvif cameras 2018-02-01 11:32:13 -05:00
Isaac Connor 212882efb9 db errors should NOT BE FATAL! 2018-02-01 11:31:25 -05:00
Isaac Connor a610d564d1 tweak timeouts 2018-01-31 15:51:12 -05:00
Isaac Connor b390633f70 Fix authHash generation 2018-01-31 14:58:01 -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 018523134e use ZM_BASE_PROTOCOL when loading plugins. https can't load http content 2018-01-31 14:35:23 -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 7ec71868a6 Switch CakePHP-Enum-Behavior to my fixed version 2018-01-29 21:25:40 -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 31b7deb101 Return NULL on error in dbQuery 2018-01-29 10:41:24 -08:00
Isaac Connor c9e32fb344 Check for successful Monitor db Insertion 2018-01-29 10:41:09 -08:00
Isaac Connor e638817cb9 Check for ServerId exists in MonitorObject 2018-01-29 10:40:50 -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 73d84c6b08 fix typo 2018-01-29 07:53:48 -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 bfbd033971 Fix getting stream status updates when # of files open is > 1024. 2018-01-29 07:41:29 -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 fc4edefd81 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-29 07:35:24 -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 8c4a786114 Move status fields out of the object fields 2018-01-29 10:27:46 -05:00
Isaac Connor b1b8b42f2b Fix getting stream status updates when # of files open is > 1024. 2018-01-29 07:21:31 -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 f2b335c7b2 SORT auto server selection in ascending order 2018-01-28 18:07:01 -08:00
Isaac Connor 51d5fd38aa scan the board for the names of the camera inputs 2018-01-28 18:06:13 -08:00
Isaac Connor c59751713b fix redirect 2018-01-28 17:31:00 -05:00
Isaac Connor 0d734a880c add hack to ensure that next and previous operate on time 2018-01-28 17:30:49 -05: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 bc6d8623a6 add a semaphore around the socket creation and retention. I think concurrent processes are messing with the sockets. 2018-01-27 15:03:22 -05: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 bb9d640c01 use instead of ['request'] to fix behaviour when request has been emptied due to failed auth 2018-01-26 12:56:38 -05:00
Isaac Connor 348fdafa4e Update submofule 2018-01-26 11:34:45 -05:00
Isaac Connor 475c465b0d define 2018-01-26 10:39:12 -05:00
Isaac Connor d001ce467e use get for status JSON requests 2018-01-26 10:31:55 -05:00
Isaac Connor a0892b1ffc Whitespace 2018-01-26 10:30:59 -05:00
Isaac Connor 1503c586d2 When there is an error saving, add the invalidFields() info to the error message. Only restart the daemon on success. 2018-01-26 10:30:29 -05:00