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
|
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
|
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
|
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
|
6ee083a145
|
Update functions.php
|
2022-10-31 11:53:11 -06:00 |
|
Isaac Connor
|
25100cd592
|
Fix missed references to oldW and oldH
|
2022-10-31 09:27:53 -04:00 |
|
Isaac Connor
|
2fb631fa6e
|
Clean up debug. Clone the entire monitor object into oldMonitor instead of cherry-picking properties. Fixes use of new name when deleting old symlink. Always check for existence of monitor dir and symlink after done saving.
|
2022-10-31 09:27:53 -04:00 |
|
Isaac Connor
|
33455cbad2
|
Remove left over references to REQUEST['newMonitor']. Add error reporting to creating monitor directory and symlinking when adding a new monitor
|
2022-10-31 09:27:53 -04:00 |
|
Isaac Connor
|
6b3768fdf6
|
When saving monitor, only turn off error reporting for symlink. Don't delete old symlink unless the name has changed.
|
2022-10-31 09:27:53 -04:00 |
Isaac Connor
|
df421cbd4c
|
remove iiot which shouldn't be there
|
2022-10-28 08:45:08 -04:00 |
|
Isaac Connor
|
b0deed5376
|
Add EventData section to event view
|
2022-10-27 17:33:19 -04:00 |
|
Isaac Connor
|
f0a1a1b0ee
|
Merge branch 'master' into add_event_data
|
2022-10-27 17:08:12 -04:00 |
|
Isaac Connor
|
1ef87ab0b8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-10-27 17:05:24 -04:00 |
|
Isaac Connor
|
1540c3b41b
|
fetchImage now takes a documentElement not a jquery object
|
2022-10-27 17:01:56 -04:00 |
|
Isaac Connor
|
32951523b8
|
We no longer have outputHelper, so just output a warning if we don't have streaming support
|
2022-10-27 17:01:25 -04:00 |
|
Isaac Connor
|
b8a97b0fb9
|
Don't report errors from mkdir, it normally exists
|
2022-10-27 17:01:00 -04:00 |
|
Isaac Connor
|
c20a327eef
|
Fixups to EventData model
|
2022-10-27 17:00:24 -04:00 |
|
Isaac Connor
|
8a5e9d944d
|
Add authentication to FramesController
|
2022-10-27 16:59:34 -04:00 |
|
Isaac Connor
|
46fcd79881
|
Add authentication and fixups to EventDataController.php
|
2022-10-27 16:59:18 -04:00 |
|
Isaac Connor
|
70b0e53780
|
Add routing for EventData
|
2022-10-27 16:58:57 -04:00 |
|
Isaac Connor
|
6d073119cb
|
Rough in views for EventData
|
2022-10-27 16:57:05 -04:00 |
|
Isaac Connor
|
586d43798f
|
Rough in model and controller for Event_Data
|
2022-10-27 14:47:21 -04:00 |
|
Isaac Connor
|
7cec2d1dc3
|
Fix eslint, remove debug
|
2022-10-26 10:33:16 -04:00 |
|
Isaac Connor
|
2965ea2826
|
Fix eslint, remove debug
|
2022-10-26 10:33:02 -04:00 |
|
Isaac Connor
|
779d41f583
|
Add bootstrap-table-1.21.1 to eslint igore. Delete old versions
|
2022-10-26 10:23:16 -04:00 |
|
Isaac Connor
|
f96c90ffa7
|
Fix saving Server modal. Form was incomplete, action and view were duplicated. Don't need javascript just use the submit button Save.
|
2022-10-26 09:00:25 -04:00 |
|
Isaac Connor
|
ff08b0f871
|
Make search input the same size as other toolbar elements
|
2022-10-25 15:17:41 -04:00 |
|
Isaac Connor
|
bfc4b5aa67
|
Implement filtering by ServerId
|
2022-10-25 13:36:02 -04:00 |
|
Isaac Connor
|
8d8337135b
|
Give ServerId filter an id
|
2022-10-25 13:32:53 -04:00 |
|
Isaac Connor
|
0e88b5c7a3
|
Fix function name hash_frame_array_by_key => array_to_hash_by_key
|
2022-10-25 13:32:06 -04:00 |
|
Isaac Connor
|
91e728c0d3
|
Sort servers in global array
|
2022-10-25 13:31:40 -04:00 |
|
Isaac Connor
|
d1a7749ff4
|
fix eslint
|
2022-10-25 13:27:55 -04:00 |
|
Isaac Connor
|
f357327b9c
|
Merge branch 'master' into log_filters
|
2022-10-25 13:05:43 -04:00 |
|
Isaac Connor
|
418eeb9260
|
Add Server, Level, StartDateTime, EndDateTime filters to logs view
|
2022-10-25 13:05:25 -04:00 |
|
Isaac Connor
|
d11bb88f94
|
rough in array_to_hash_by_key function to generate hashes of Id => Object
|
2022-10-25 12:56:38 -04:00 |
|
Isaac Connor
|
0bc1f2792d
|
add specific filters for level, StartDateTime and EndDateTime.
|
2022-10-25 12:50:29 -04:00 |
|
Isaac Connor
|
189bf2f687
|
Update bootstrap-table to 1.21.1
|
2022-10-25 12:50:01 -04:00 |
|
Isaac Connor
|
4f0f2224b2
|
Restructure code around build where part of sql, add specific filters for level, StartDateTime and EndDateTime.
|
2022-10-25 12:49:08 -04:00 |
|
Isaac Connor
|
ee56f013d4
|
Add some filters to log view
|
2022-10-25 06:12:08 -04:00 |
|
Isaac Connor
|
a7277e357e
|
fix eslint
|
2022-10-21 18:16:53 -04:00 |
|
Isaac Connor
|
f0cd36989b
|
Spacing, use const and let instead of var
|
2022-10-21 18:11:46 -04:00 |
|
Isaac Connor
|
2e03d91ef7
|
Fix selecting 0 values in htmlSelect. Fixes not showing ZM_LOG_DATABASE_LEVEL==Info
|
2022-10-21 16:29:26 -04:00 |
|
Isaac Connor
|
3d68896625
|
Escape <> in log messages to prevent html shenanigans. Fixes #3596
|
2022-10-21 16:21:25 -04:00 |
|
Isaac Connor
|
42e8698318
|
Load logger.js before view js so that remote logging routines are available.
|
2022-10-21 16:20:51 -04:00 |
|
Isaac Connor
|
cbd763b455
|
Update code. Break early when figuring out if any events are checked. Use ajax instead of getJSON.
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
32dfbe60df
|
Include export.js because we need it for Download function in events list
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
4bb214f124
|
cleanup, use const instead of var
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
35f7e54bed
|
Remove exportStrings as they are in skin.js.php.
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
77b9c47296
|
Add export.js includes at bottom of montagereview since they are no longer in skin.js
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
89d112cfe8
|
Add video.js includes at bottom of video view since they are no longer handled in includes/function.php
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
23b0b9876d
|
Add leaflet.js includes at bottom of monitor view since they are no longer handled in includes/function.php
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
2cbae814c3
|
Add video.js includes at bottom of event view since they are no longer handled in includes/function.php
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
0fc91ec8cb
|
Remove export-related functions out of skin.js into export.js
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
beec8bb03a
|
Move view-specific includes out of includes/functions. It is far easier to just put those at the bottom of the actual view file.
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
262a2f0cb0
|
Don't add class=alarmCue to noneCue spans. Move calls to get frames data to after applying scale
|
2022-10-20 16:48:07 -04:00 |
|
Isaac Connor
|
8681b6d1b2
|
Add back setting width and height when scaling to image stream
|
2022-10-20 16:46:38 -04:00 |
|
Isaac Connor
|
bce8c6195a
|
Don't display errors in Server.php
|
2022-10-20 16:45:52 -04:00 |
|
Isaac Connor
|
f1843528d0
|
Put back width and height setting on img tag. Needed for event viewing
|
2022-10-20 16:45:37 -04:00 |
|
Isaac Connor
|
5cf47622d7
|
Clean up alarm cue styles a bit. Fix background color on noneCue
|
2022-10-20 16:41:21 -04:00 |
|
Isaac Connor
|
082ffdf76e
|
Fix SQL for when passing an empty array to find. Return false instead of trying weird sql.
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
76cd1b6b90
|
remove debug of monitors and Fix Warning when monitor is not visible
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
49b7f1e557
|
Make inputs on action table 100%
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
84fd4b42d5
|
Fix test for null in Object::find
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
ff01d4d394
|
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-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
837d0ece7f
|
return empty array when passing empty as SQLvalue
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
73c2415f83
|
Remove swp file
|
2022-10-20 10:20:58 -04:00 |
|
Isaac Connor
|
59bc1c3fc3
|
add IIOT styles
|
2022-10-20 10:20:26 -04:00 |
|
Isaac Connor
|
85a1b15e92
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-10-20 08:59:23 -04:00 |
|
Isaac Connor
|
23863c1853
|
Make inputs on action table 100%
|
2022-10-18 13:56:16 -04:00 |
|
Isaac Connor
|
c698027ac9
|
Fix test for null in Object::find
|
2022-10-18 13:29:12 -04:00 |
|
Isaac Connor
|
1be399026e
|
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-10-18 13:28:54 -04:00 |
|
Isaac Connor
|
27757c1e59
|
return empty array when passing empty as SQLvalue
|
2022-10-18 13:28:43 -04:00 |
|
Isaac Connor
|
c40d251009
|
Add setting remoteAddr in session after regenerating
|
2022-10-17 19:09:24 -04:00 |
|
Isaac Connor
|
9adf5f662f
|
Use REQUEST instead of SESSION to store the post login redirect because we clear the session on login. Fixes #3517
|
2022-10-17 17:25:56 -04:00 |
|
Isaac Connor
|
22a059d3bc
|
Remove debug
|
2022-10-17 17:25:46 -04:00 |
|
Isaac Connor
|
ce62bb1297
|
Minor cleanup, remove dead code
|
2022-10-17 17:25:36 -04:00 |
|
Isaac Connor
|
155328b0d6
|
Put view in the form get part for visibility
|
2022-10-17 17:25:27 -04:00 |
|
Isaac Connor
|
9e257def8a
|
Add debug, add validateId function to session handler. Change it to be a a subclass of SessionHandlerInterface so that we don't have to provide createId. Fixes session breakage in php8.2
|
2022-10-17 17:24:52 -04:00 |
|
Isaac Connor
|
5c8343f737
|
remoteAddr is set when session is opened. So no need to do it in auth. session_clear closes the session so no need to close it first
|
2022-10-17 17:23:45 -04:00 |
|
Isaac Connor
|
520baefeae
|
Make font file location full width
|
2022-10-17 16:50:39 -04:00 |
|
Isaac Connor
|
9f4c9919e2
|
when a config value is overridden via *.conf files, put up a warning/explanation.
|
2022-10-17 16:50:23 -04:00 |
|
Isaac Connor
|
2b54f732a6
|
improve alarm cue and progress indicator styles
|
2022-10-14 17:39:23 -04:00 |
|
Isaac Connor
|
ae70b1255c
|
Fix styles after removal of dark styles from header
|
2022-10-14 17:32:58 -04:00 |
|
Isaac Connor
|
20ebbc3c58
|
Fix saving from the function modal. Put action in the post variables and change the action to save instead of function.
|
2022-10-14 14:10:46 -04:00 |
|
Isaac Connor
|
5ae47c8671
|
Fix form structure, use of get instead of post and duplicated action input
|
2022-10-14 14:09:43 -04:00 |
|
Isaac Connor
|
feecd5439d
|
left align option value column
|
2022-10-14 14:09:34 -04:00 |
|
Isaac Connor
|
2329dda323
|
Merge pull request #3609 from connortechnology/fix_non_post_auth
Move relevant code out of includes/actions/auth.php into includs/auth…
|
2022-10-14 14:09:09 -04:00 |
|
Isaac Connor
|
5a5a665cdf
|
Test for definition of ZM_LOG_INJECT. We don't include the config when not logged in. So it won't be defined
|
2022-10-12 19:34:05 -04:00 |
|
Isaac Connor
|
86e4d7f4d4
|
Don't show CaptureBandwidth as null/s if there is no value
|
2022-10-12 19:16:17 -04:00 |
|
Isaac Connor
|
e116c9ee48
|
Fix unable to unset LockRows on Filter
|
2022-10-12 16:57:53 -04:00 |
|
Isaac Connor
|
66a555250c
|
Handle the case where the specified monitor is not in display_monitors, which results in javascript breakage due to a lack of monitorData.
|
2022-10-12 11:18:13 -04:00 |
|
Isaac Connor
|
0c80425b71
|
Make Path link to the files view
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
d64868a44b
|
Fix downloads due to chunkSize not being defined
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
87627cac8e
|
add js for files view
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
673dff62c9
|
Handle empty path, give form an id and path.
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
c4a2d2fb51
|
Fix hide() not defined on AutoMoveTo and AutoCopyTo.
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
d35f8170e6
|
update code in updateformCheckboxesByName
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
31edfc26df
|
Rough in a files view
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
f8eef392d3
|
Add output_file to includes/functions.php
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
58657cc685
|
Remove swp file
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
7cf58df832
|
Add an id=content div for styling purposese
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
aadfb2e6f8
|
Add an id=content div for styling purposese
|
2022-10-11 16:45:02 -04:00 |
|
Isaac Connor
|
2a1d417511
|
Remove dark styles from navbar
|
2022-10-11 16:44:23 -04:00 |
|
Isaac Connor
|
16e8af0fe3
|
add IIOT styles
|
2022-10-11 16:44:23 -04:00 |
|
Isaac Connor
|
09b2b372ff
|
Test for matches[operator]. Fixes #3607
|
2022-10-11 15:52:46 -04:00 |
|
Isaac Connor
|
25a739c90e
|
Make the Save/Delete buttons always present, but disabled when not authorized. Allow anyone to create a filter, but only System:Edit or the owner of the filter can change or delete it.
|
2022-10-11 10:03:57 -04:00 |
|
Isaac Connor
|
371f1adbe7
|
update storage modal to fix buttons not being in form. Also remove duplicate view field and make button action be save instead of Save. Fixes #3605
|
2022-10-07 15:56:15 -04:00 |
|
Isaac Connor
|
eed60e7acb
|
Don't attach onclick to save button on stoage modal as it is a submit button
|
2022-10-07 15:55:43 -04:00 |
|
Isaac Connor
|
34ffd92bf1
|
Add permissions checking to API/Logs. Fixes unprivileged user being to add/edit/delete/view logs.
|
2022-10-06 16:22:56 -04:00 |
|
Isaac Connor
|
cb3fc5907d
|
Use canEdit['System'] and value of new ZM_LOG_INJECT to disable attempting to inject javascript errors into zm logs
|
2022-10-06 14:52:39 -04:00 |
|
Isaac Connor
|
de2866f957
|
Check value of System:Edit permission and ZM_LOG_INJECT to disable ajax log injection.
|
2022-10-06 14:51:29 -04:00 |
|
Isaac Connor
|
072e94385b
|
Make the ajaxError logging be debug level. If the error was actually critical, we will have to log that separately. Most of the errors reported by ajaxError are transient.
|
2022-10-05 09:31:39 -04:00 |
|
Isaac Connor
|
c7e40769cf
|
remove jquery-3.5.1
|
2022-10-04 10:55:55 -04:00 |
|
Isaac Connor
|
f3aabfd67c
|
Update jquery-ui to 1.13.2
|
2022-10-04 10:15:10 -04:00 |
|
Isaac Connor
|
4028c08831
|
Update jquery-ui to 1.13.2
|
2022-10-04 10:14:27 -04:00 |
|
Isaac Connor
|
54f821ac88
|
Upgrade jquery to 3.6.1
|
2022-10-04 10:06:40 -04:00 |
|
Isaac Connor
|
2139a0cf24
|
Make form on console use post
|
2022-10-03 16:15:17 -04:00 |
|
Isaac Connor
|
6d786e0690
|
save buttion is a submit button now, so doesn't need an onclick. Fix code setting action on delete.
|
2022-10-03 15:51:09 -04:00 |
|
Isaac Connor
|
9b8e48e480
|
Switch to post instead of get in the groups form because we only do actions on post now.
|
2022-10-03 15:50:16 -04:00 |
|
Isaac Connor
|
c0a4c05e84
|
Only perform actions on post. Doing them on GET allows doing actions from things like img tags which is not good.
|
2022-10-03 15:49:48 -04:00 |
|
Isaac Connor
|
96b428edb5
|
Fix group modal. Use post instead of get, properly populate the save submit button
|
2022-10-03 15:48:05 -04:00 |
|
Isaac Connor
|
0ab074eb88
|
Change colour of indicator to yellow to be more prominent. Add last 24hour events button.
|
2022-09-30 09:58:24 -04:00 |
|
Isaac Connor
|
d289eb4860
|
File must be escaped as well to prevent XSS
|
2022-09-30 09:57:35 -04:00 |
|
Isaac Connor
|
2f295a2f55
|
Make Monitor::Server always return a Server object so we don't have to test for null
|
2022-09-30 09:57:21 -04:00 |
|
Isaac Connor
|
caedd94f69
|
add 24hour button
put archive status filter on same line as buttons
|
2022-09-29 17:16:57 -04:00 |
|
Isaac Connor
|
3b47f2fc9c
|
Fix export not working for filter due to limit set to 0.
|
2022-09-29 14:36:36 -04:00 |
|
Isaac Connor
|
340ed19c71
|
Handle filter[query] not being defined
|
2022-09-29 14:29:36 -04:00 |
|
Isaac Connor
|
e4fad02b43
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-09-28 18:37:20 -04:00 |
|
Isaac Connor
|
8d56949800
|
Deal with structure of json response from API when getting Janus_Pin
|
2022-09-28 18:36:47 -04:00 |
|
Isaac Connor
|
9fc0d26d32
|
If we don't have session, we can still generate an auth hash. We kinda need this for zmu calls from API
|
2022-09-28 18:35:59 -04:00 |
|
Isaac Connor
|
460695202f
|
Add Janus_Pin to monitor API
|
2022-09-28 18:35:30 -04:00 |
|
Isaac Connor
|
59db9c2d90
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-09-28 17:42:16 -04:00 |
|
Isaac Connor
|
f5bdbcf0bd
|
Use new Server::SendToApi to reduce duplicated code. If Janus Not enabled, then don't both with Janus_Pin. If Server is remote, use API to get Janus_Pin. Implementing the API side is left as an exercise.
|
2022-09-28 17:41:46 -04:00 |
|
Isaac Connor
|
2a9576371b
|
Introduce Server::SendToApi to reduce duplicated code.
|
2022-09-28 17:40:08 -04:00 |
|
Isaac Connor
|
fe0e4fcb8f
|
handle lack of sysvsem support in php better. Turn errors back on, just don't display them. Proceed regardless of semaphore success but log an error.
|
2022-09-28 14:48:13 -04:00 |
|
Isaac Connor
|
c7ded07794
|
Only look for action if there is a view
|
2022-09-27 10:49:50 -04:00 |
Pliable Pixels
|
23ae004724
|
whoops fixed errant enum values I forgot to delete
|
2022-09-25 17:46:53 -04:00 |
|
Pliable Pixels
|
6218d065a5
|
make OutputCodec work in API
|
2022-09-25 12:41:07 -04:00 |
|
Isaac Connor
|
0b37df3782
|
Fix scroll to top on option help modals by not having an href=#. Fix css so that the ? still is blue.
|
2022-09-23 09:34:29 -04:00 |
|
Isaac Connor
|
63e4c81d9c
|
Try out just using connkey as the semaphore key instead of ftok
|
2022-09-22 16:22:36 -04:00 |
|
Isaac Connor
|
8a6db4a5e7
|
convert event->Id() explicitly to a string for strpos.
|
2022-09-22 16:21:25 -04:00 |
|
Isaac Connor
|
faa6b8c9e7
|
Add connkey and semaphore key to logging about failure to get semaphore. Add sem_release before every ajaxError call because ajaxError exits and so we never release the semaphore.
|
2022-09-22 11:30:59 -04:00 |
|
Isaac Connor
|
cb6dd816d8
|
streamSrc is no longer used and is making php complain
|
2022-09-21 15:46:42 -04:00 |
|
Isaac Connor
|
5fef98ce6f
|
Add types to buttons. Make save a submit button, and remove the javascript onclick event.
|
2022-09-21 15:37:47 -04:00 |
|
Isaac Connor
|
9338732bd3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-09-21 14:36:05 -04:00 |
|
Isaac Connor
|
363c589975
|
More properly fix the alarm status api changing. The previous hack broken doing alarm on/off.
|
2022-09-21 14:35:27 -04:00 |
|
Isaac Connor
|
f68c64ea30
|
Last and next buttons don't get disabled if the event record thinks it has more frames than are actually in the db.
|
2022-09-21 13:24:18 -04:00 |
|
Isaac Connor
|
6d1b341141
|
Add a.btn-primary.disabled to disabled buttons style so that frame view buttons look right
|
2022-09-21 13:23:49 -04:00 |
|
Isaac Connor
|
1072a8aa69
|
When scaling frame images, apparently a float value for height is no good. So use intval to fix.
|
2022-09-21 13:23:16 -04:00 |
|
Isaac Connor
|
9d6d5a242f
|
fix monitorIds => MonitorIds
|
2022-09-21 12:32:15 -04:00 |
|
Isaac Connor
|
78ab6583e7
|
Fix typo causing broken link to monitor in event stats
|
2022-09-21 12:32:15 -04:00 |
|
Isaac Connor
|
c3c897cd76
|
In failure state populate imageData array to reduce output php errors
|
2022-09-21 12:32:14 -04:00 |
|
Isaac Connor
|
86f27d2ac5
|
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-09-21 12:32:14 -04:00 |
|
Isaac Connor
|
291c43ec0f
|
Add spans and titles over the title h2 parts so that on mouseover it tells you what they are
|
2022-09-21 12:32:14 -04:00 |
megasaturnv
|
8fb6477820
|
Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516
|
2022-09-21 16:47:16 +01:00 |
|
Isaac Connor
|
abc5ea26d8
|
Merge branch 'master' into add_janus_rtsp_user
|
2022-09-18 12:44:25 -04:00 |
|
Isaac Connor
|
a36a28d4b5
|
Merge pull request #3591 from VikingGer/patch-4
Update MonitorLinkExpression.js
|
2022-09-17 14:53:31 -04:00 |
|
Isaac Connor
|
ec16937939
|
Merge pull request #3592 from VikingGer/patch-5
Update event.js
|
2022-09-17 10:23:24 -04:00 |
|
Isaac Connor
|
3843b9e14f
|
Merge pull request #3593 from VikingGer/patch-6
Update report.php
|
2022-09-17 10:22:33 -04:00 |
VikingGer
|
ac55a9e0f2
|
Update reports.js
Function name missing? Assumed to be correct according to the rest.
|
2022-09-17 10:28:10 +02:00 |
|
VikingGer
|
a099a4e3ae
|
Update report.php
Again Eslint errors
|
2022-09-17 10:19:42 +02:00 |
|
VikingGer
|
851ddb7f06
|
Update event.js
Again Eslint errors
|
2022-09-17 10:14:00 +02:00 |
|
VikingGer
|
11a4735082
|
Update MonitorLinkExpression.js
Trailing spaces lead to eslint error. Removed them
|
2022-09-17 10:08:07 +02:00 |
|
Isaac Connor
|
7d9771e41c
|
Merge branch 'master' into add_janus_rtsp_user
|
2022-09-16 18:33:52 -04:00 |
|
VikingGer
|
c43b3d1aef
|
Update control_functions.php
The Reboot button was not shown without activating another one. Probably not intended so I did this micro adjustment
|
2022-09-16 14:21:15 +02:00 |
|
Isaac Connor
|
c197644b96
|
Fix contents of values on LOCALE_DEFAULT.
|
2022-09-15 14:05:33 -04:00 |
|
Isaac Connor
|
62b6171934
|
Only try to set TIMEZONE when loading dateTimeFormatter if it is set. Handle the exception when any of TIMEZONE or LOCALE are invalid.
|
2022-09-15 14:04:31 -04:00 |
|
Isaac Connor
|
bf2b6ca145
|
Specify that only main page content tables should have the first colunm be min-width: 300px. This was affecting the logout dialog table content.
|
2022-09-15 14:03:22 -04:00 |
|
Isaac Connor
|
d1cd7d3f91
|
Merge branch 'master' into add_janus_rtsp_user
|
2022-09-14 18:34:07 -04:00 |
|
Isaac Connor
|
a944a1fac7
|
Fix no video due to height:auto on videojs
|
2022-09-14 13:31:25 -04:00 |
|
Isaac Connor
|
bc566ccfdf
|
Remove debugging
|
2022-09-14 13:15:02 -04:00 |
|
Isaac Connor
|
46de7afb0f
|
Add fade to the logout modal which for some reason fixes it not showing after a hide
|
2022-09-14 13:09:51 -04:00 |
|
Isaac Connor
|
715122e93a
|
Spacing, ignore auth_relay, clean up clickLogout a bit
|
2022-09-14 13:09:38 -04:00 |
|
Isaac Connor
|
419a44f8ed
|
Merge branch 'iiot'
|
2022-09-13 18:23:44 -04:00 |
|
Isaac Connor
|
b4fc5abe95
|
Failure to auth by hash is common, the end result is a redirect to login page. Change the log level to INF
|
2022-09-13 17:59:53 -04:00 |
|
Isaac Connor
|
4624a53a90
|
Show time segments in progress bar. Fix alarm cues.
|
2022-09-13 17:58:30 -04:00 |
|
Isaac Connor
|
ea1970418e
|
don't let position go negative in onclick progressbar
|
2022-09-12 16:05:53 -04:00 |
|
Isaac Connor
|
f3e04ca212
|
shorten and move up the indicator
|
2022-09-12 16:05:30 -04:00 |
|
Isaac Connor
|
fd52e73268
|
Add time ticks to progressbar with a mouseover highlight
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
e2bd72b6a0
|
Fix eslint
|
2022-09-12 13:44:18 -04:00 |
|
megasaturnv
|
8fc60fef12
|
Moved case-insensitive username checks to SQL
|
2022-09-12 13:44:18 -04:00 |
|
megasaturnv
|
143a00cccc
|
Fix typo
|
2022-09-12 13:44:18 -04:00 |
|
megasaturnv
|
c90e2f7898
|
Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516
|
2022-09-12 13:44:18 -04:00 |
|
megasaturnv
|
e9ab7f2f26
|
Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
c22007e8ee
|
Allow viewing a specific video file instead of DefaultVideo
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
60d01376c5
|
clean up, give generation options even if viewing. Fix viewing. Add transform option.
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
d3e3807263
|
setup video.js on the video tag if it exists
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
fdbe950640
|
include video.js for video view as well as event
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
8676609425
|
Center video obj
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
dbcf320808
|
For mp4, use video tag, with videojs instead of embed
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
37dac7d3a6
|
Add transform support and use Event::createVideo
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
4d2f956827
|
Move createVideo from functions to Event
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
f9fddcb6ee
|
format filesize into human_readable in generate video view
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
6452f8127a
|
Convert password fields to hidden fields on submit so that browser doesn't offer to remember passwords
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
eb9ac11d21
|
fix updating donation reminder. I would always be a month or more
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
1fe3d52c96
|
remove extra spacing, move dropdown option own to where they are used
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
813434e0f4
|
Fix saving monitor due to MQTT being empty
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
e088e88e13
|
Make monitor rows in event stats a link if user can view monitors. Include path to event.
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
ce4dd065ff
|
Use y instead of Y for path generation when using Deep scheme. Fixes #3583
|
2022-09-12 13:44:18 -04:00 |
|
Isaac Connor
|
d079439005
|
Merge branch 'reports' of http://github.com/ConnorTechnology/zoneminder into reports
|
2022-09-12 19:40:27 +02:00 |
|
Isaac Connor
|
363c424117
|
fix every monitor getting the same Janus_Pin
|
2022-09-12 12:56:46 -04:00 |
|
Isaac Connor
|
d32fe1cf55
|
Add Janus_RTSP_User and related UI code
|
2022-09-12 10:34:26 -04:00 |
|
Isaac Connor
|
d9c0e1dd8f
|
Move RTSPServer options to under Viewing
|
2022-09-09 11:37:19 -04:00 |
|
Isaac Connor
|
c306722a4e
|
Adjust styles on ONVIF tab so that Username and Password are shorter and there is room for the reveal password icon
|
2022-09-09 11:35:50 -04:00 |
|
Isaac Connor
|
8ba1bbc63c
|
Set new defaults: Only analysis jpegs, and passthrough on. Label Size => Default. Fix warnings when creating a new MOnitor because Path, User, Pass are unset.
|
2022-09-09 11:29:32 -04:00 |
|
Isaac Connor
|
11c2cc1829
|
Change first entry of Storage Areas to say Unspecified instead of Default.
|
2022-09-09 09:35:12 -04:00 |
|
Isaac Connor
|
9276ae7d67
|
calling trim on null is deprecated
|
2022-09-08 15:11:53 -04:00 |
|
Isaac Connor
|
0e2e1903c1
|
Only init the boostrap events table if we can view Events.
|
2022-09-08 15:11:39 -04:00 |
|
Isaac Connor
|
834dc3c986
|
Restore status value to pre 1.36.16 value by substracting 1. So Unknown == -1, 0 = IDLE etc. Fixes #3584
|
2022-09-08 13:01:45 -04:00 |
Jonathan Bennett
|
c35bbc8c30
|
Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it
|
2022-09-07 15:49:47 -05:00 |
|
Isaac Connor
|
7398fd97d7
|
Fix eslint
|
2022-09-07 09:35:03 -04:00 |
|
Isaac Connor
|
8aaa5e52b3
|
Merge pull request #3582 from megasaturnv/3516-CaseInsensitiveLogin
Issue #3516 case insensitive login
|
2022-09-06 16:39:53 -04:00 |
|
Isaac Connor
|
bb8b11a2a1
|
Allow viewing a specific video file instead of DefaultVideo
|
2022-09-06 15:44:41 -04:00 |
|
Isaac Connor
|
11bfdebc72
|
clean up, give generation options even if viewing. Fix viewing. Add transform option.
|
2022-09-06 15:44:09 -04:00 |
|
Isaac Connor
|
dbf92147d7
|
setup video.js on the video tag if it exists
|
2022-09-06 15:42:49 -04:00 |
|
Isaac Connor
|
82fb209e7f
|
include video.js for video view as well as event
|
2022-09-06 15:42:11 -04:00 |
|
Isaac Connor
|
f98f5648d9
|
Center video obj
|
2022-09-06 15:41:55 -04:00 |
|
Isaac Connor
|
7059e5a1ea
|
For mp4, use video tag, with videojs instead of embed
|
2022-09-06 15:41:42 -04:00 |
|
Isaac Connor
|
4c40ef8cfb
|
Add transform support and use Event::createVideo
|
2022-09-06 13:46:54 -04:00 |
|
Isaac Connor
|
3079438038
|
Move createVideo from functions to Event
|
2022-09-06 13:46:41 -04:00 |
|
Isaac Connor
|
c4b895045b
|
format filesize into human_readable in generate video view
|
2022-09-06 11:41:53 -04:00 |
|
Isaac Connor
|
e6c8081fb6
|
Convert password fields to hidden fields on submit so that browser doesn't offer to remember passwords
|
2022-09-06 11:22:47 -04:00 |
|
Isaac Connor
|
70073719e4
|
use ajax() instead of getJSON so that we can specify no timeout. This prevents log queries from stacking up overloading the db
|
2022-09-06 11:22:47 -04:00 |
|
Isaac Connor
|
ce2aea9615
|
fix updating donation reminder. I would always be a month or more
|
2022-09-06 11:22:47 -04:00 |
|
Isaac Connor
|
d9babda8ad
|
remove extra spacing, move dropdown option own to where they are used
|
2022-09-06 11:22:47 -04:00 |
|
Isaac Connor
|
1f20b18100
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-09-06 11:22:28 -04:00 |
|
Isaac Connor
|
d76c425057
|
Fix saving monitor due to MQTT being empty
|
2022-09-06 11:22:04 -04:00 |
|
megasaturnv
|
6c4fb3e2cd
|
Moved case-insensitive username checks to SQL
|
2022-09-05 15:43:53 +01:00 |
|
megasaturnv
|
d80026cab1
|
Fix typo
|
2022-09-05 15:29:23 +01:00 |
|
Isaac Connor
|
85278293c2
|
Make monitor rows in event stats a link if user can view monitors. Include path to event.
|
2022-09-04 13:54:18 -04:00 |
|
Isaac Connor
|
b611a4fc08
|
Use y instead of Y for path generation when using Deep scheme. Fixes #3583
|
2022-09-04 13:53:19 -04:00 |
|
megasaturnv
|
6c0f40f570
|
Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516
|
2022-09-02 12:03:47 +01:00 |
|
megasaturnv
|
63e5b63eec
|
Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516
|
2022-09-02 11:58:02 +01:00 |
|
Isaac Connor
|
87e251561d
|
Hide fieldset borders on filter edit. They look weird because the top one is hidden
|
2022-09-01 07:09:36 -04:00 |
|
Isaac Connor
|
0378023a11
|
Fix colours on hr to match button blue.
|
2022-09-01 07:09:27 -04:00 |
|
Isaac Connor
|
4c90bd0ac6
|
Add a title to the zone polygon
|
2022-09-01 07:08:39 -04:00 |
|
Isaac Connor
|
6c8819977e
|
Cache Group Monitors Ids so we don't query the database multiple times for them.
|
2022-09-01 07:08:04 -04:00 |