ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,573 Commits
32 Branches
93 Tags
162 MiB
Commit Graph

21573 Commits (b1579d953dfd6b788f3d3ed21422923a30efd0a7)

Author SHA1 Message Date
Isaac Connor 2c9e6e92eb Merge ../ZoneMinder.connortechnology 2022-10-12 16:58:11 -04:00
Isaac Connor e116c9ee48 Fix unable to unset LockRows on Filter 2022-10-12 16:57:53 -04:00
Isaac Connor d77fb330a4 Merge ../ZoneMinder.connortechnology 2022-10-12 11:38:11 -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 ab9f55b6ab add js for files view 2022-10-11 16:12:00 -04:00
Isaac Connor 12a8edbdea Handle empty path, give form an id and path. 2022-10-11 16:11:44 -04:00
Isaac Connor 22d819c903 Fix hide() not defined on AutoMoveTo and AutoCopyTo. 2022-10-11 16:11:32 -04:00
Isaac Connor 8081ead631 update code in updateformCheckboxesByName 2022-10-11 16:11:18 -04:00
Isaac Connor 2476e04c45 Rough in a files view 2022-10-11 16:10:58 -04:00
Isaac Connor 603d047015 Add output_file to includes/functions.php 2022-10-11 16:10:45 -04:00
Isaac Connor 999591ee6f 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 16:10:18 -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 8794661a3a Bump version to 1.37.24 to differentiate versions for advisories. 2022-10-06 16:55:57 -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 73d9f2482c Add ZM_LOG_INJECT config parameter to disable unprivileged log injection through api. 2022-10-06 14:51:56 -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 619cf1975f Add getting the connection id from mysql and log it in zmDbDo. This is so that when mysql reports a dropped connection, we can figure out which process it was. 2022-10-06 10:28:49 -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