ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,784 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

379 Commits

Author SHA1 Message Date
Isaac Connor 44b11389ce Merge pseudo:sandbox/ZoneMinder.connortechnology into event_thread 2022-01-13 12:00:17 -05:00
Isaac Connor 5312d11e78 Don't both running zmu if monitor Function is set to None 2021-12-10 16:08:43 -05:00
Isaac Connor ee65d3e3dc add cmaeramodels route 2021-09-27 10:57:06 -04:00
Isaac Connor fe734d4e1e Add Manufacturer and CameraModel hasOne relationships 2021-09-27 10:56:50 -04:00
Isaac Connor c66489fb30 rough in api support for Models and Manufacturers 2021-09-25 20:49:30 -04:00
Isaac Connor 34d9f87d6d remove cruft from ServersController.php 2021-09-25 20:44:16 -04:00
Isaac Connor 12783f6edf Add manufacturers, models and servers routes 2021-09-25 20:43:53 -04:00
Isaac Connor 009b3ceffc Fix version of Crud 2021-09-09 13:28:25 -04:00
Isaac Connor dbe16a9cb4 Don't use AUTH_HASH_IPS when talking to zmu as it doesn't support that at this time. 2021-08-26 10:45:36 -04:00
Pliable Pixels 6c3f18a347 allow option to not load the frames DB table 2021-06-27 15:55:10 -04:00
Andrew Bauer b59e911c43 Allow cakephp cache engine to be set during build 2021-06-18 12:12:01 -05:00
Isaac Connor fd9bef228d It is okay to call daemonControl with function==None for command == stop. All others give a warning. Fixes monitors on other servers not stopping when set to None. 2021-06-12 12:21:44 -04:00
Isaac Connor 8511d814df Restore api behaviour. Add zmu output to response 2021-05-28 12:28:35 -04:00
Isaac Connor cf03bb9548 Merge branch 'release-1.36' 2021-05-25 11:34:11 -04:00
Andrew Bauer cb0a421d25 use latest rtspserver commit 2021-05-21 15:10:42 -05:00
Andrew Bauer eb387b5453 use latest rtspserver commit 2021-05-21 15:08:40 -05:00
Isaac Connor 0b4c35c58e Merge pull request #3241 from connortechnology/fix_3239 
Fix 3239
 2021-05-19 20:39:42 -04:00
Isaac Connor 1abbc187e9 Merge pull request #3242 from connortechnology/fix_3232_api_monitor_event_summaries 
Add Event_Summary model so that it is included in monitor listing
 2021-05-19 20:32:50 -04:00
Isaac Connor b1ac0e61a9 put back upstream version 3.2.0 of Crud 2021-05-09 18:18:03 -04:00
Isaac Connor 2cf6ad8089 Switch ZMPacket * to a shared_ptr<ZMPacket>. This is so that in LockedPacket we can unlock and then notify and be confident that packet_ won't have been deleted. Change ZMPacket->timestamp to be a timeval instead of timeval *. This might not have been necessary but I like it. No longer cuse the ZMPacket object to wrap the shared image buffers and timestamps. Use a vector for image_buffers. 2021-05-08 21:14:20 -04:00
Isaac Connor 4385076e66 Fix encrypting password when saving User 2021-04-26 09:40:08 -04:00
Isaac Connor 02a1ecee6f Remove dbeug 2021-04-26 09:40:08 -04:00
Isaac Connor 15a769bcd1 add hashing of passwords on user save 2021-04-23 09:07:50 -04:00
Isaac Connor e01533af7f Add users to routes 2021-04-23 08:52:55 -04:00
Isaac Connor d07d85dd6c Clean User add to match behaviour of Monitors. For some reason posting to index doesn't call add unlike Monitors. Clean out duplicated Views 2021-04-22 12:25:13 -04:00
Isaac Connor 007dce45fb Add disable alarms as an alarm command 2021-04-12 15:59:31 -04:00
Isaac Connor 1ccc416224 Merge branch 'release-1.34' 2021-04-09 20:00:47 -04:00
Isaac Connor 99c28d1f9f Change log level to debug when warning about ZM_OPT_AUTH being turned off. Fixes #3207 2021-04-07 09:47:48 -04:00
Isaac Connor c3ce9913cf Upgrade cakephp to 2.10.24 2021-03-31 12:11:12 -04:00
Isaac Connor 1b876f24f9 Must have Id as well in order to know which monitor to control 2021-03-17 17:15:04 -04:00
Isaac Connor 849d71efff Add filtering to groups 2021-03-02 15:10:15 -05:00
Isaac Connor 7d02c68938 silence warning when cookies not used 2021-03-02 15:10:02 -05:00
Isaac Connor bb747bfc6d Add RTSPStreamName fields 2021-03-01 16:46:48 -05:00
Isaac Connor 550d302316 Fix Crud version back to origin 2021-02-25 14:18:51 -05:00
Isaac Connor 2fa0fbe448 Upgrade cakephp to 2.10.24 2021-02-02 23:19:52 -05:00
Isaac Connor 105eff7a21 Remove references to zma 2021-02-01 17:29:16 -05:00
Isaac Connor 07fa507efe improve error message when trying to control a remote camera 2021-01-27 11:48:32 -05:00
Isaac Connor 28a004c324 Must load ServerId so that we can tell if it is local or remote 2021-01-27 11:48:32 -05:00
Isaac Connor 86fd86a723 Switch to FriendsOfCake branch 3.0 2021-01-24 12:29:16 -05:00
Isaac Connor fd21d47bbb Merge pull request #3113 from pliablepixels/feature-api-daemon-control 
new api to control daemon
 2021-01-23 17:28:30 -05:00
Pliable Pixels ed2a50f4ae add permission check 2021-01-23 16:18:40 -05:00
Pliable Pixels 68dac0e406 new api to control daemon 2021-01-23 14:22:52 -05:00
Isaac Connor 3132820a71 Move daemonControl logic into the model. daemonControl needs to be called on the previous monitor data so that it knows which daemons to stop. 2020-12-23 13:48:12 -05:00
Isaac Connor 05bd6e1c56 Fix editing groups causing a new Group to be added. You have to tell cakephp which Group you are saving. Also fix the resulting output to be the saved group, not a list of monitors. Fixes #3088 2020-12-03 13:14:19 -05:00
Isaac Connor 5bf5d58ac1 Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds. 2020-11-16 11:32:50 -05:00
Isaac Connor 6ed006bc60 rename StartTime and EndTime to StartDateTime and EndDateTime in the named query params 2020-11-06 12:25:04 -05:00
Isaac Connor 402b559b2c Add StartTime and EndTime virtual fields for backwards compatability 2020-11-06 11:15:12 -05:00
Isaac Connor d37bce4e0e Fix missed StartTime to StartDateTime 2020-11-04 18:20:59 -05:00
Isaac Connor 10c0a6617c Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php. 2020-10-14 10:39:25 -04:00
Isaac Connor bf29357455 Merge branch 'release-1.34' 2020-09-19 12:01:21 -04:00