mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-10 01:46:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
21,965 Commits 80 Branches 104 Tags
dedff86511d85b643e0b02bfdb7d524fdcdd4084
Commit Graph

257 Commits

Author SHA1 Message Date
Isaac Connor
662aa9f39d Add getting frames by event id or other named filters to api 2023-01-09 16:53:27 -05:00
Isaac Connor
57d208efa9 Make view and listing of snapshots be recursive so they load the Events as well 2022-12-07 15:00:48 -05:00
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
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
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
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
5312d11e78 Don't both running zmu if monitor Function is set to None 2021-12-10 16:08:43 -05: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
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
Isaac Connor
8511d814df Restore api behaviour. Add zmu output to response 2021-05-28 12:28:35 -04:00
Isaac Connor
0b4c35c58e Merge pull request #3241 from connortechnology/fix_3239 
Fix 3239
 2021-05-19 20:39:42 -04:00
Isaac Connor
02a1ecee6f Remove dbeug 2021-04-26 09:40:08 -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
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
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
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
28a004c324 Must load ServerId so that we can tell if it is local or remote 2021-01-27 11:48:32 -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
6ed006bc60 rename StartTime and EndTime to StartDateTime and EndDateTime in the named query params 2020-11-06 12:25:04 -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
Isaac Connor
147238027c Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-16 09:59:28 -04:00
Pliable Pixels
8ad62b8905 another try at fixing Eventcontroller 2020-09-13 16:43:49 -04:00
Isaac Connor
2cd9c8e232 Update api Zone Saving. Fixes #3037 2020-09-10 13:32:15 -04:00
Isaac Connor
7dbbb24db4 Update api Zone Saving. Fixes #3037 2020-09-10 13:31:39 -04:00
Isaac Connor
7e679809f2 Merge branch 'update_users_controller' 2020-08-17 19:31:30 -04:00
Isaac Connor
bf163beedb Update permissions checking when viewing/editing users. Fixes #2982. Also add a beforeFind that will remove the Password field from the query so that we don't return passwords 2020-07-30 11:03:24 -04:00
Isaac Connor
d716d1d686 Merge branch 'release-1.34' 2020-07-20 16:25:41 -04:00
Isaac Connor
955fc00b87 Fix Zone add api. Restart zmc when adding a zone. Use validation. Fixes #2983 2020-07-20 16:24:49 -04:00
Isaac Connor
135bbb4190 remove unneeded config loading, just use defines. Spacing, remove commented out dead code 2020-07-19 17:51:28 -04:00