Andrew Bauer
|
f32a7aaff5
|
deploy insertModalHtml
|
2020-10-14 15:58:39 -05:00 |
Isaac Connor
|
9c943fb079
|
Merge branch 'release-1.34'
|
2020-10-14 16:48:01 -04:00 |
|
Isaac Connor
|
ba3b19d89a
|
Clean up DiskSpace option. Doesn't need to be there and shouldn't set HashDiskPercent
|
2020-10-14 16:45:03 -04:00 |
|
Andrew Bauer
|
ec040b1bfd
|
don't set popup flag in event view
|
2020-10-14 13:59:15 -05:00 |
|
Andrew Bauer
|
e69b3800c7
|
set return status for cancel and restart commands
|
2020-10-14 12:22:21 -05:00 |
|
Andrew Bauer
|
a60815a700
|
eslint
|
2020-10-14 11:20:37 -05:00 |
|
Andrew Bauer
|
bea95bca68
|
use ZM\Debug
|
2020-10-14 10:33:40 -05:00 |
|
Isaac Connor
|
57a1a383ad
|
Merge branch 'release-1.34'
|
2020-10-14 11:32:50 -04:00 |
|
Isaac Connor
|
e9fb150880
|
Improve error message when a row doesn't exist in the Monitor_Status table
|
2020-10-14 11:32:33 -04:00 |
|
Andrew Bauer
|
c3a98c1f44
|
replace shutdown form submit with ajax
|
2020-10-14 10:03:33 -05:00 |
|
Isaac Connor
|
da948065bb
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-14 10:39:31 -04:00 |
|
Isaac Connor
|
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 |
|
Andrew Bauer
|
ba82088b99
|
make all the data-on-xxx js bindings functions
|
2020-10-14 08:51:44 -05:00 |
|
Isaac Connor
|
ff14d11fef
|
Don't output the filter, just log it!
|
2020-10-13 10:07:27 -04:00 |
|
Isaac Connor
|
e8c9845e08
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-13 09:02:47 -04:00 |
|
Isaac Connor
|
e4fec8c5ea
|
code style cleanups, most defaulting to 'Id' as the term attr so that we can use an empty filter as a quick jump to event feature
|
2020-10-13 09:02:38 -04:00 |
|
Andrew Bauer
|
031b41f78a
|
remove the english word popup from lang files
|
2020-10-13 07:59:34 -05:00 |
|
Isaac Connor
|
cd2e96eaec
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-13 08:42:28 -04:00 |
|
Isaac Connor
|
908c20e959
|
add ZM prefix to Warning
|
2020-10-13 08:42:22 -04:00 |
|
Andrew Bauer
|
89c76ec140
|
no need to clare $view as global
|
2020-10-12 14:52:57 -05:00 |
|
Andrew Bauer
|
c4ea27db8d
|
fix buttons in shutdown modal
|
2020-10-12 14:51:33 -05:00 |
|
Andrew Bauer
|
49fec5142c
|
remove popup code form skin.js
|
2020-10-12 13:34:40 -05:00 |
|
Andrew Bauer
|
e5e1455f7a
|
replace embedded popuplinks in watch view
|
2020-10-12 13:26:20 -05:00 |
|
Andrew Bauer
|
332ec2032a
|
replace createPopup with location.assign
|
2020-10-12 12:37:23 -05:00 |
|
Andrew Bauer
|
1db31ba574
|
remove makePopupLink function. Use makeLink instead
|
2020-10-12 12:20:21 -05:00 |
|
Andrew Bauer
|
ed5f6b2625
|
convert shutdown popup to modal
|
2020-10-12 12:16:52 -05:00 |
|
Andrew Bauer
|
0f263407a5
|
make redirect conditional on previous view
|
2020-10-12 10:32:25 -05:00 |
|
Isaac Connor
|
66a8d3876d
|
add caching of users by username to improve performance
|
2020-10-12 11:25:20 -04:00 |
|
Isaac Connor
|
3646a66168
|
translate unquoted literal Filter
|
2020-10-12 11:20:22 -04:00 |
|
Isaac Connor
|
8227de8642
|
bump version to 1.35.10 to pick up Filter AutoUnarchive column
|
2020-10-12 11:04:16 -04:00 |
|
Isaac Connor
|
1ffa1cc33b
|
Add button update checks for AutoUnarchive
|
2020-10-12 10:56:01 -04:00 |
|
Isaac Connor
|
1854e02ab3
|
Accept both Id and filter[Id] when loading filters.
|
2020-10-12 10:55:42 -04:00 |
|
Isaac Connor
|
3fa0ef25f6
|
Add a link to the filter representing the events list
|
2020-10-12 10:55:03 -04:00 |
|
Isaac Connor
|
637551b7e7
|
Add english for FilterUnarchiveEvents
|
2020-10-12 10:54:38 -04:00 |
|
Isaac Connor
|
046124fe0e
|
Add AutoUnarchive column, also add Id to querystring if this is a saved Filter
|
2020-10-12 10:54:22 -04:00 |
|
Isaac Connor
|
4f5948cba0
|
Implement Unarchive action
|
2020-10-12 10:53:53 -04:00 |
|
Isaac Connor
|
1b2ab6cce9
|
Add AutoUnarchive column to Filters
|
2020-10-12 10:53:19 -04:00 |
|
Isaac Connor
|
bf83cf9346
|
Add AutoUnarchive column to Filters
|
2020-10-12 10:53:00 -04:00 |
|
Isaac Connor
|
03c8e86908
|
update some quotes
|
2020-10-10 11:09:51 -04:00 |
|
Isaac Connor
|
9e6db17e68
|
Fix getting next event due to case of asc
|
2020-10-10 11:09:39 -04:00 |
|
Isaac Connor
|
630d9011f3
|
Fix redirect when saving users
|
2020-10-10 09:48:09 -04:00 |
|
Isaac Connor
|
9768f081e4
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-09 10:21:33 -04:00 |
|
Isaac Connor
|
268e364cfd
|
handle the paused case
|
2020-10-09 10:21:00 -04:00 |
Isaac Connor
|
9bfe8c28e4
|
Merge branch 'gcc_cpuid'
|
2020-10-09 08:48:01 -04:00 |
|
Isaac Connor
|
7d1598ae50
|
Merge branch 'master' into gcc_cpuid
|
2020-10-09 08:47:30 -04:00 |
|
Isaac Connor
|
cb38242917
|
use nullptr when appropriate
|
2020-10-08 16:46:47 -04:00 |
|
Isaac Connor
|
2f2562a876
|
init shared_data in the purpose=QUERY case to prevent crash. Also don't load zones if we don't need them
|
2020-10-08 16:46:30 -04:00 |
|
Isaac Connor
|
1aadeb2206
|
free the context as well.
|
2020-10-08 16:46:03 -04:00 |
|
Isaac Connor
|
871c556ac0
|
rename a variable to be more readable
|
2020-10-08 16:45:45 -04:00 |
Isaac Connor
|
1173f618ec
|
turn off negative pts detection... I have cameras that generate them all the time, they might actually be valid
|
2020-10-08 15:50:52 -04:00 |