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 |
|
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 |