ee65d3e3dc
add cmaeramodels route
2021-09-27 10:57:06 -04:00
fe734d4e1e
Add Manufacturer and CameraModel hasOne relationships
2021-09-27 10:56:50 -04:00
c66489fb30
rough in api support for Models and Manufacturers
2021-09-25 20:49:30 -04:00
34d9f87d6d
remove cruft from ServersController.php
2021-09-25 20:44:16 -04:00
12783f6edf
Add manufacturers, models and servers routes
2021-09-25 20:43:53 -04:00
009b3ceffc
Fix version of Crud
2021-09-09 13:28:25 -04:00
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
6c3f18a347
allow option to not load the frames DB table
2021-06-27 15:55:10 -04:00
b59e911c43
Allow cakephp cache engine to be set during build
2021-06-18 12:12:01 -05:00
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
8511d814df
Restore api behaviour. Add zmu output to response
2021-05-28 12:28:35 -04:00
cf03bb9548
Merge branch 'release-1.36'
2021-05-25 11:34:11 -04:00
cb0a421d25
use latest rtspserver commit
2021-05-21 15:10:42 -05:00
eb387b5453
use latest rtspserver commit
2021-05-21 15:08:40 -05:00
0b4c35c58e
Merge pull request #3241 from connortechnology/fix_3239
...
Fix 3239
2021-05-19 20:39:42 -04:00
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
b1ac0e61a9
put back upstream version 3.2.0 of Crud
2021-05-09 18:18:03 -04:00
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
4385076e66
Fix encrypting password when saving User
2021-04-26 09:40:08 -04:00
02a1ecee6f
Remove dbeug
2021-04-26 09:40:08 -04:00
15a769bcd1
add hashing of passwords on user save
2021-04-23 09:07:50 -04:00
e01533af7f
Add users to routes
2021-04-23 08:52:55 -04:00
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
007dce45fb
Add disable alarms as an alarm command
2021-04-12 15:59:31 -04:00
1ccc416224
Merge branch 'release-1.34'
2021-04-09 20:00:47 -04:00
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
c3ce9913cf
Upgrade cakephp to 2.10.24
2021-03-31 12:11:12 -04:00
1b876f24f9
Must have Id as well in order to know which monitor to control
2021-03-17 17:15:04 -04:00
849d71efff
Add filtering to groups
2021-03-02 15:10:15 -05:00
7d02c68938
silence warning when cookies not used
2021-03-02 15:10:02 -05:00
bb747bfc6d
Add RTSPStreamName fields
2021-03-01 16:46:48 -05:00
550d302316
Fix Crud version back to origin
2021-02-25 14:18:51 -05:00
2fa0fbe448
Upgrade cakephp to 2.10.24
2021-02-02 23:19:52 -05:00
105eff7a21
Remove references to zma
2021-02-01 17:29:16 -05:00
07fa507efe
improve error message when trying to control a remote camera
2021-01-27 11:48:32 -05:00
28a004c324
Must load ServerId so that we can tell if it is local or remote
2021-01-27 11:48:32 -05:00
86fd86a723
Switch to FriendsOfCake branch 3.0
2021-01-24 12:29:16 -05:00
fd21d47bbb
Merge pull request #3113 from pliablepixels/feature-api-daemon-control
...
new api to control daemon
2021-01-23 17:28:30 -05:00
ed2a50f4ae
add permission check
2021-01-23 16:18:40 -05:00
68dac0e406
new api to control daemon
2021-01-23 14:22:52 -05:00
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
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
5bf5d58ac1
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
2020-11-16 11:32:50 -05:00
6ed006bc60
rename StartTime and EndTime to StartDateTime and EndDateTime in the named query params
2020-11-06 12:25:04 -05:00
402b559b2c
Add StartTime and EndTime virtual fields for backwards compatability
2020-11-06 11:15:12 -05:00
d37bce4e0e
Fix missed StartTime to StartDateTime
2020-11-04 18:20:59 -05:00
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
bf29357455
Merge branch 'release-1.34'
2020-09-19 12:01:21 -04:00
147238027c
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-09-16 09:59:28 -04:00
8ad62b8905
another try at fixing Eventcontroller
2020-09-13 16:43:49 -04:00
2cd9c8e232
Update api Zone Saving. Fixes #3037
2020-09-10 13:32:15 -04:00
7dbbb24db4
Update api Zone Saving. Fixes #3037
2020-09-10 13:31:39 -04:00
a92a16f13e
Merge branch 'update_users_controller' into release-1.34
2020-08-17 19:33:31 -04:00
7e679809f2
Merge branch 'update_users_controller'
2020-08-17 19:31:30 -04:00
2cfa5fde98
Add missing view tempplates for zone add/edit. Fixes #2986
2020-07-30 16:54:00 -04:00
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
5ac4677c02
Add missing view tempplates for zone add/edit. Fixes #2986
2020-07-29 18:59:44 -04:00
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
e839919b5e
Add foreign key MonitorId validation
2020-07-20 16:25:08 -04:00
955fc00b87
Fix Zone add api. Restart zmc when adding a zone. Use validation. Fixes #2983
2020-07-20 16:24:49 -04:00
bbee6b4f58
Whitespace, delete dead code
2020-07-20 16:23:55 -04:00
135bbb4190
remove unneeded config loading, just use defines. Spacing, remove commented out dead code
2020-07-19 17:51:28 -04:00
c4c4c5bcbf
fix Crud submodule version
2020-05-15 11:34:34 -04:00
94b29c6c7a
replace inline javascript in timeline zoom
2020-05-15 10:44:48 -04:00
dadcea4884
remove recursive from index
2020-05-05 16:35:14 -04:00
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
daff14df9b
Allow users without System::View to read servers.json
2020-04-23 11:10:30 -04:00
9b77f77ac3
better logs
2020-04-23 11:09:39 -04:00
ae80b3b859
Start implementing VNC
2020-03-27 14:32:50 -04:00
4ce944da23
Merge branch 'release-1.34'
2020-03-26 15:38:35 -04:00
3e55795cad
Handle different command line syntax for zmcontrol.pl
2020-03-26 13:57:43 -04:00
561479dd93
Merge branch 'release-1.34'
2020-03-09 14:45:00 -04:00
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
3611d147e6
fix score frameID to return ID not Score
2020-03-09 11:25:07 -04:00
c5e838fa33
return global frame IDs of snapshot and alarm frames for a specific event
2020-03-09 11:09:20 -04:00
d29b93216d
Allow users without System::View to read servers.json
2020-03-02 16:39:12 -05:00
54c14db863
better logs
2020-03-01 14:02:44 -05:00
8b375de455
Avoid duplicate Monitors in API
2020-01-15 20:31:05 +01:00
399508b211
fix JWT access token always being 1 hr
2020-01-02 10:25:48 -05:00
76b54a468f
use left join instead of inner join when listing monitors
2019-12-22 18:43:53 -05:00
d25a91ad13
Make Group containable
2019-12-20 14:56:14 -05:00
bcda92058e
proper way to make cakephp filter by group. Make Group containable, always add the join
2019-12-20 14:56:01 -05:00
0142c71c85
Merge branch 'master' into fix_2772
2019-12-20 11:02:27 -05:00
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
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
c19632e114
Merge pull request #2769 from connortechnology/fix_api_alarm_auth
...
Fix api alarm auth
2019-12-02 07:53:50 -05:00
76d795f413
add rendering of enums for Events Controller
2019-12-01 12:32:14 -05:00
0b2853095e
cleanup auth in monitors alarm method
2019-12-01 12:30:27 -05:00
393c25b4f2
fix array keys
2019-11-29 14:26:03 -05:00
4817efe17c
Add enum support for Orientation and Scheme to Events
2019-11-29 13:48:20 -05:00
d02e30ceca
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
2019-11-29 13:48:02 -05:00
9d4c802b48
netEmpty is deprecated. Use notBlank instead
2019-11-20 09:32:19 -05:00
16a6938710
add model validation so that we don't create empty monitors
2019-11-02 08:30:25 -04:00
9889311b03
Handle username=&password= as well in HostController::login
2019-09-18 11:40:55 -04:00
be99f6a4d6
In production mode, debug should be 0
2019-09-04 08:47:09 -04:00
50aa0108e5
Add authhash to session
2019-09-03 11:33:02 -04:00
a384e978c8
don't load user from session if we have already gotten it from elsewhere
2019-09-03 11:19:42 -04:00
b84d005d8f
Load use from session when it exists
2019-09-03 10:54:34 -04:00
84492f29b1
Fix token auth sessions ( #2676 )
...
* If token is present do token based auth and do not do anything with session
* update HostController. Use config constants, don't use sessions
* Remove Session from the components list
* spacing
* Remove Session from App Components list.
* Move APIEnabled check to the api from auth.php
* Rework auth. login using username and password only occurs on login action now. Including auth.php should not touch the session. auth_hash logins no longer touch the session. replace userLogin with a function called validateUser which matches the semantics of validateToken.
* remove debugging
* Add session storage if stateful query param is on, but only for LEGACY_API_AUTH
* fix mUser to username, etc.
* shuffle lines
* use instead of session when generating auth hash.
* Add docs regarding the use of cookies and stateful query param
* Only open/close session if we are clearing a session var
* Use zm_session_start instead of session_start
* Should use zm_session_start instead of session_start
* document that zm_session_start should be called previously to session_regenerate_id
* Don't actually write out the session when generating auth hashes. Means they should never actually persist.
* More backticking of SQL
* add .. to fix #2686
* Use material icons for sort because they look nicer
* fix typo
* have to add authhash to session on login
* restore username&password login for all urls
* fix
* fixes
2019-08-20 09:46:53 -04:00
cfeedd39a4
Use zm_session_start instead of session_start
2019-08-16 15:07:20 -04:00
Isaac Connor
Isaac Connor
Pliable Pixels
Andrew Bauer
hax0kartik
Javier Gonzalez
Isaac Connor
Pliable Pixels