mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-09 01:19:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
21,656 Commits 76 Branches 104 Tags
c35b28a3d13dbf08a27c19fa8fb21b111b35bc53
Commit Graph

415 Commits

Author SHA1 Message Date
Isaac Connor
c35b28a3d1 Rough in api support for snapshots 2022-11-30 15:11:04 -05:00
Isaac Connor
e11b7d3406 Add CORS headers to API 2022-11-30 13:18:13 -05:00
Isaac Connor
e949a5554f Must convert strings into integers before doing math as of php 8.2 Fixes Unsupported operand types: string - int 2022-11-17 14:54:05 -05:00
Isaac Connor
0515a1ba74 implode the output from zmu to fix php complaint abou array to string conversion 2022-11-17 14:53:56 -05:00
Isaac Connor
c20a327eef Fixups to EventData model 2022-10-27 17:00:24 -04:00
Isaac Connor
8a5e9d944d Add authentication to FramesController 2022-10-27 16:59:34 -04:00
Isaac Connor
46fcd79881 Add authentication and fixups to EventDataController.php 2022-10-27 16:59:18 -04:00
Isaac Connor
70b0e53780 Add routing for EventData 2022-10-27 16:58:57 -04:00
Isaac Connor
6d073119cb Rough in views for EventData 2022-10-27 16:57:05 -04:00
Isaac Connor
586d43798f Rough in model and controller for Event_Data 2022-10-27 14:47:21 -04:00
Isaac Connor
09b2b372ff Test for matches[operator]. Fixes #3607 2022-10-11 15:52:46 -04:00
Isaac Connor
34ffd92bf1 Add permissions checking to API/Logs. Fixes unprivileged user being to add/edit/delete/view logs. 2022-10-06 16:22:56 -04:00
Isaac Connor
460695202f Add Janus_Pin to monitor API 2022-09-28 18:35:30 -04:00
Pliable Pixels
23ae004724 whoops fixed errant enum values I forgot to delete 2022-09-25 17:46:53 -04:00
Pliable Pixels
6218d065a5 make OutputCodec work in API 2022-09-25 12:41:07 -04:00
Isaac Connor
363c589975 More properly fix the alarm status api changing. The previous hack broken doing alarm on/off. 2022-09-21 14:35:27 -04:00
Isaac Connor
834dc3c986 Restore status value to pre 1.36.16 value by substracting 1. So Unknown == -1, 0 = IDLE etc. Fixes #3584 2022-09-08 13:01:45 -04:00
Isaac Connor
74aab0a76e Prevent editing of system config entries through the api 2022-05-30 10:02:49 -04:00
Isaac Connor
2a5a94b995 Fix monitors.json and monitor/.json use incorrect Id (mathing Monitor.Id instead of Monitor.ManufacturerId) to return Manufacturer and CameraModel: Fixes #3475 2022-05-01 13:25:42 -04: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