Isaac Connor
|
b1579d953d
|
Clear br.clear as well as div
|
2022-11-02 13:26:37 -04:00 |
|
Isaac Connor
|
b066e936c7
|
Apply styles to Monitor Permissions table
|
2022-11-02 13:26:34 -04:00 |
|
Isaac Connor
|
63769a2082
|
Fix missing )
|
2022-11-02 13:26:34 -04:00 |
|
Isaac Connor
|
3c36233dd8
|
Put in all the new logic for visibleMonitor and editableMonitor referencing Monitor_Permissions and Group_Permissions
|
2022-11-02 13:25:53 -04:00 |
|
Isaac Connor
|
68bf964eec
|
Add saving of Monitor_Permissions
|
2022-11-02 13:25:53 -04:00 |
|
Isaac Connor
|
b7490c754b
|
Rough in Group_Permission and Monitor Permissions loading functions.
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
24a83efa79
|
Improve Monitor canView and canEdit. If the user is not specified, use the cached auth routines in includs/auth.php. Otherwise replicate the logic for the specfied user.
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
16b5551a4a
|
Always return a Group_Permission in Permission()
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
121e864dde
|
Continue roughing in Group_Permission logic
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
a891b528d1
|
Use Monitor::canView in Event::canView
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
6265a1ca41
|
Move from MonitorIds to Monitor_Permissions and Group_Permissions.
|
2022-11-02 13:25:43 -04:00 |
|
Isaac Connor
|
7ff928dcf8
|
Make the primary index on Groups_Permissions a unique index to ensure that the GroupId/UserId mapping is unique. Add Monitor_Permissions
|
2022-11-02 13:24:26 -04:00 |
|
Isaac Connor
|
893b86ee96
|
Make the primary index on Monitors_Permissions a unique index to ensure that the MOnitorId/UserId mapping is unique.
|
2022-11-02 13:24:26 -04:00 |
|
Isaac Connor
|
ef8d999218
|
IN () being false could still result in a true result of used in an OR, so instead of just returning, use an always false sql equivalent
|
2022-11-02 12:38:31 -04:00 |
|
Isaac Connor
|
7a39433db7
|
update code to use Group_Permission::Permission
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
2ee142813e
|
start to rough in an editable monitor function
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
d8175126fd
|
I renamed the fields to user from newUser, so reflect that in the js validation
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
c6edb8d46a
|
Make Permission column wider to support the Inherit value
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
79f5d77fab
|
Add Permission saving to user view
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
3157510f23
|
Add Permission property
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
9df7283358
|
Rough in the boilerplate for retrieving Permissions on Groups
|
2022-11-02 12:37:46 -04:00 |
|
Isaac Connor
|
76f804dadd
|
Add Permission enum to Groups_Permissions
|
2022-11-02 12:37:16 -04:00 |
|
Isaac Connor
|
dd4869fb47
|
Add object for Group_Permission
|
2022-11-02 12:36:42 -04:00 |
|
Isaac Connor
|
a67f89ff9e
|
We renamed newUser to user in form elements
|
2022-11-02 12:36:42 -04:00 |
|
Isaac Connor
|
85bb66a3ea
|
Change from newUser[] to user[] in form elements. Add Group permissions
|
2022-11-02 12:36:42 -04:00 |
|
Isaac Connor
|
a840d65ac4
|
Add styles for groups listing table on user view
|
2022-11-02 12:36:42 -04:00 |
|
Isaac Connor
|
5734e38f52
|
Add group permission checking to visibleMonitor
|
2022-11-02 12:36:42 -04:00 |
|
Isaac Connor
|
3775be599e
|
Add Groups_Permissions table
|
2022-11-02 12:36:42 -04:00 |
|
Isaac Connor
|
bb9152d3f2
|
Update frame view js to use const etc instead of var. Put back EventId and FrameId in stats being links and fix FrameId not being populated. If no stats available disable the stats button and use the title to explain why.
|
2022-11-02 12:36:41 -04:00 |
|
Isaac Connor
|
d00536915e
|
Move getting time into the scope where it is used
|
2022-11-02 10:07:01 -04:00 |
|
Isaac Connor
|
6d2b2ae525
|
Implement split out username/password for remote_camera and remote_camera_http
|
2022-11-02 10:06:39 -04:00 |
|
Isaac Connor
|
30bb5d47d7
|
Implement split out username/password for remote_camera and remote_camera_http
|
2022-11-02 10:06:26 -04:00 |
Isaac Connor
|
f965249ac6
|
Don't clear Diskspace a second time
|
2022-11-01 18:42:22 -04:00 |
|
Isaac Connor
|
6e5b4ff6e1
|
Fix _ instead of __git_main in file::Find::find, clean up use of __git_main
|
2022-11-01 18:42:10 -04:00 |
|
Isaac Connor
|
0c0269b2cc
|
Fix eslint
|
2022-11-01 12:41:27 -04:00 |
|
Isaac Connor
|
52c865cfeb
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-11-01 12:40:51 -04:00 |
|
Isaac Connor
|
2859634aaa
|
Set xhrFields: widthCredentials: true so that we send cookies with our streaming xhr requests so that we pick up new auth hashes
|
2022-11-01 08:22:53 -04:00 |
|
Isaac Connor
|
5bd50fe575
|
Add Access-Control-Allow-Credentials: true so that we can pass cookies along with xhr requests.
|
2022-11-01 08:21:59 -04:00 |
|
Isaac Connor
|
09ece9320e
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-10-31 21:20:07 -04:00 |
|
Isaac Connor
|
a6b16510d0
|
Add Cuase, Notes and EndDateTime to columns in events list on watch view
|
2022-10-31 21:19:41 -04:00 |
|
Isaac Connor
|
b5febb1886
|
Merge pull request #3621 from ovargasp/master
Adds icon to button for menu on collapsed UI
|
2022-10-31 18:21:58 -04:00 |
|
Isaac Connor
|
cd4a9fbb98
|
Merge ../ZoneMinder.connortechnology
|
2022-10-31 18:01:04 -04:00 |
|
Isaac Connor
|
6199613c40
|
Merge branch 'add_event_data'
|
2022-10-31 18:00:32 -04:00 |
|
Isaac Connor
|
85e1f21ca7
|
Make button on Filter Debug modal be Close instead of Cancel
|
2022-10-31 17:59:52 -04:00 |
|
Isaac Connor
|
6edbee7c70
|
Handle empty but defined REQUEST[action]
|
2022-10-31 17:59:34 -04:00 |
ovargasp
|
1bd77022a6
|
Merge pull request #3 from ovargasp/add-icon-to-hamburger-button-on-collapsed-web-view
Update functions.php
|
2022-10-31 12:10:43 -06:00 |
|
ovargasp
|
6ee083a145
|
Update functions.php
|
2022-10-31 11:53:11 -06:00 |
|
Isaac Connor
|
218aef1220
|
Add libswscale6 and libswresample4
|
2022-10-31 11:24:34 -04:00 |
|
Isaac Connor
|
1c38e79c1b
|
Add Reports table. Also set ENGINE for other tables that were hard coded to InnoDb. Fixes #3615
|
2022-10-31 09:29:50 -04:00 |
|
Isaac Connor
|
25100cd592
|
Fix missed references to oldW and oldH
|
2022-10-31 09:27:53 -04:00 |