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
1d0ee227d7
fix mUser to username, etc.
2019-08-16 14:12:37 -04:00
4108495a7d
Add session storage if stateful query param is on, but only for LEGACY_API_AUTH
2019-08-16 14:12:14 -04:00
618e6816ef
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.
2019-08-15 14:59:15 -04:00
9da10abca9
Move APIEnabled check to the api from auth.php
2019-08-13 11:29:32 -04:00
a63b6486b9
Remove Session from App Components list.
2019-08-12 15:36:40 -04:00
c2e1293472
spacing
2019-08-12 15:10:58 -04:00
Isaac Connor
Isaac Connor
Pliable Pixels
hax0kartik
Javier Gonzalez
Isaac Connor
Pliable Pixels