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
|
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 |
|
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
|
a92a16f13e
|
Merge branch 'update_users_controller' into release-1.34
|
2020-08-17 19:33:31 -04:00 |
|
Isaac Connor
|
7e679809f2
|
Merge branch 'update_users_controller'
|
2020-08-17 19:31:30 -04:00 |
|
Isaac Connor
|
2cfa5fde98
|
Add missing view tempplates for zone add/edit. Fixes #2986
|
2020-07-30 16:54:00 -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
|
5ac4677c02
|
Add missing view tempplates for zone add/edit. Fixes #2986
|
2020-07-29 18:59:44 -04:00 |
|
Isaac Connor
|
d716d1d686
|
Merge branch 'release-1.34'
|
2020-07-20 16:25:41 -04:00 |
|
Isaac Connor
|
e839919b5e
|
Add foreign key MonitorId validation
|
2020-07-20 16:25:08 -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
|
bbee6b4f58
|
Whitespace, delete dead code
|
2020-07-20 16:23:55 -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 |
|
Isaac Connor
|
c4c4c5bcbf
|
fix Crud submodule version
|
2020-05-15 11:34:34 -04:00 |
Isaac Connor
|
94b29c6c7a
|
replace inline javascript in timeline zoom
|
2020-05-15 10:44:48 -04:00 |
|
Pliable Pixels
|
dadcea4884
|
remove recursive from index
|
2020-05-05 16:35:14 -04:00 |
|
Pliable Pixels
|
0817ea3bfb
|
added association method to GroupsController to get Monitor Id/Name of monitors that belong to the group
|
2020-05-05 16:32:54 -04:00 |
|
Isaac Connor
|
daff14df9b
|
Allow users without System::View to read servers.json
|
2020-04-23 11:10:30 -04:00 |
|
Pliable Pixels
|
9b77f77ac3
|
better logs
|
2020-04-23 11:09:39 -04:00 |
hax0kartik
|
ae80b3b859
|
Start implementing VNC
|
2020-03-27 14:32:50 -04:00 |
|
Isaac Connor
|
4ce944da23
|
Merge branch 'release-1.34'
|
2020-03-26 15:38:35 -04:00 |
|
Isaac Connor
|
3e55795cad
|
Handle different command line syntax for zmcontrol.pl
|
2020-03-26 13:57:43 -04:00 |
|
Isaac Connor
|
561479dd93
|
Merge branch 'release-1.34'
|
2020-03-09 14:45:00 -04:00 |
|
Pliable Pixels
|
a261efe0a7
|
return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0
|
2020-03-09 12:04:40 -04:00 |
|
Pliable Pixels
|
3611d147e6
|
fix score frameID to return ID not Score
|
2020-03-09 11:25:07 -04:00 |
|
Pliable Pixels
|
c5e838fa33
|
return global frame IDs of snapshot and alarm frames for a specific event
|
2020-03-09 11:09:20 -04:00 |
|
Isaac Connor
|
d29b93216d
|
Allow users without System::View to read servers.json
|
2020-03-02 16:39:12 -05:00 |
|
Pliable Pixels
|
54c14db863
|
better logs
|
2020-03-01 14:02:44 -05:00 |
Javier Gonzalez
|
8b375de455
|
Avoid duplicate Monitors in API
|
2020-01-15 20:31:05 +01:00 |
|
Pliable Pixels
|
399508b211
|
fix JWT access token always being 1 hr
|
2020-01-02 10:25:48 -05:00 |
|
Isaac Connor
|
76b54a468f
|
use left join instead of inner join when listing monitors
|
2019-12-22 18:43:53 -05:00 |
|
Isaac Connor
|
d25a91ad13
|
Make Group containable
|
2019-12-20 14:56:14 -05:00 |
|
Isaac Connor
|
bcda92058e
|
proper way to make cakephp filter by group. Make Group containable, always add the join
|
2019-12-20 14:56:01 -05:00 |
|
Isaac Connor
|
0142c71c85
|
Merge branch 'master' into fix_2772
|
2019-12-20 11:02:27 -05:00 |
|
Isaac Connor
|
5f006421cc
|
fix #2771. Correct relationship from hasMany to hasAndBelongsToMany for Monitors in Group Modelel. Use save Assiociated in Controller, and add code to handle backwards compatibility by turning MonitorIds into the appropriate Monitor array
|
2019-12-15 15:31:40 -05:00 |
|
Isaac Connor
|
eee3729b85
|
dirty fix filtering Monitors by GroupId. Change occurrences of GroupId to ' ' as that is what the key is in conditions. Please note that other operators like != won't work.
|
2019-12-04 22:23:55 -05:00 |
|
Isaac Connor
|
c19632e114
|
Merge pull request #2769 from connortechnology/fix_api_alarm_auth
Fix api alarm auth
|
2019-12-02 07:53:50 -05:00 |
|
Isaac Connor
|
76d795f413
|
add rendering of enums for Events Controller
|
2019-12-01 12:32:14 -05:00 |
|
Isaac Connor
|
0b2853095e
|
cleanup auth in monitors alarm method
|
2019-12-01 12:30:27 -05:00 |
Isaac Connor
|
393c25b4f2
|
fix array keys
|
2019-11-29 14:26:03 -05:00 |