Isaac Connor
|
386f991364
|
Merge branch 'master' into location
|
2020-09-24 19:28:57 -04:00 |
|
Isaac Connor
|
bcb430d393
|
copy log.css to newlog and add a style for bg-danger
|
2020-09-24 16:03:26 -04:00 |
|
Isaac Connor
|
32e0c92747
|
After adding SaveJPEGs to Events, need to populate them with SaveJPegs from MOnitors
|
2020-09-24 13:43:05 -04:00 |
Andrew Bauer
|
310e52840d
|
remove under construction banner
|
2020-09-24 12:29:28 -05:00 |
|
Andrew Bauer
|
89fddf3555
|
decrease refresh timing
|
2020-09-24 12:27:03 -05:00 |
|
Isaac Connor
|
d58f776d9d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-24 12:13:01 -04:00 |
|
Isaac Connor
|
e6d7a528d8
|
Use newer Filter object methods
|
2020-09-24 12:12:49 -04:00 |
|
Isaac Connor
|
cdc07715b7
|
remove parseFilterToTre and fix filter['query'] to filter['querystring']
|
2020-09-24 12:12:37 -04:00 |
|
Isaac Connor
|
8bd958e91c
|
pass querySep to querystring
|
2020-09-24 12:12:06 -04:00 |
|
Isaac Connor
|
e47fa48a8e
|
move parseFilterToTree from timeline_functions to Filter->tree(). Fix passing separator in querystring
|
2020-09-24 12:11:45 -04:00 |
|
Andrew Bauer
|
e4a1bacbbf
|
get adv search working in newlog view
|
2020-09-24 11:05:34 -05:00 |
|
Andrew Bauer
|
88f1dcca13
|
centralize bstable icon var, change table refresh icon
|
2020-09-24 08:25:39 -05:00 |
|
Isaac Connor
|
e4bbbce161
|
fix eslint
|
2020-09-24 09:13:44 -04:00 |
|
Isaac Connor
|
9c7bbd4aa7
|
introduce output_script_if_exists, use it to link leaflet.js if it exists
|
2020-09-24 09:13:25 -04:00 |
|
Isaac Connor
|
aa875b019d
|
remove auto-generated update file that slipped in
|
2020-09-24 09:02:20 -04:00 |
|
Isaac Connor
|
624bcdcde0
|
Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them
|
2020-09-24 09:01:30 -04:00 |
|
Isaac Connor
|
f7ec83323d
|
Fix conditional
|
2020-09-23 16:16:30 -04:00 |
|
Isaac Connor
|
208dcfe3db
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-23 16:12:24 -04:00 |
|
Isaac Connor
|
ab513689f4
|
Don't auto-start zoneminder. DEBHELPER appears to add lines that already do it and they conflict.
|
2020-09-23 16:12:21 -04:00 |
|
Isaac Connor
|
a68c95ba73
|
fix logic on systemd and mysql/mariadb existence
|
2020-09-23 16:07:46 -04:00 |
|
Andrew Bauer
|
b4450fecec
|
init bootstrap-table only once
|
2020-09-23 14:32:40 -05:00 |
|
Andrew Bauer
|
16a593e904
|
eslint
|
2020-09-23 13:56:41 -05:00 |
|
Isaac Connor
|
3c4078cd23
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-23 14:41:32 -04:00 |
|
Isaac Connor
|
5410fcf18c
|
Detect systemd and fall back to sysV. We do this for beowulf and WSL
|
2020-09-23 14:41:26 -04:00 |
|
Andrew Bauer
|
3f2f7359f0
|
rough in new log view - very rough
|
2020-09-23 13:09:19 -05:00 |
|
Isaac Connor
|
04aab54044
|
Detect systemd and use sysV style commands if it isn't
|
2020-09-23 11:31:16 -04:00 |
|
Isaac Connor
|
45cc4dd531
|
put back sysV init script for beowulf/wsl
|
2020-09-23 11:30:40 -04:00 |
Isaac Connor
|
795e98a09c
|
Merge pull request #2916 from connortechnology/zone_optimise
Improve code in zm_zone
|
2020-09-22 17:48:24 -04:00 |
|
Isaac Connor
|
f416ab96c5
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-22 16:22:07 -04:00 |
|
Isaac Connor
|
70be6bc84c
|
Add an estimated ram use to buffer tabs
|
2020-09-22 16:21:59 -04:00 |
|
Andrew Bauer
|
5771e74a6f
|
eslint
|
2020-09-22 15:16:42 -05:00 |
|
Isaac Connor
|
eb736df405
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-22 15:51:49 -04:00 |
|
Isaac Connor
|
fbc15c8109
|
Fix FPS Report Interval label
|
2020-09-22 15:51:44 -04:00 |
|
Andrew Bauer
|
d2ba9c5234
|
load bs-table toolbar & autorefresh
|
2020-09-22 14:23:25 -05:00 |
|
Isaac Connor
|
866123e873
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-22 15:09:49 -04:00 |
|
Isaac Connor
|
095ac1e83f
|
point feature requests to forums and slack. Fixes #3049
|
2020-09-22 15:09:44 -04:00 |
|
Andrew Bauer
|
2bdbb48692
|
update to bootstrap-table 1.18.0 and more extensions
|
2020-09-22 14:09:02 -05:00 |
|
Isaac Connor
|
ed6d5a55a5
|
put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button
|
2020-09-22 14:33:26 -04:00 |
|
Isaac Connor
|
0aa0452b7e
|
Use a redirect instead of just changing the view on monitor save. This fixes the reload issue
|
2020-09-22 14:05:37 -04:00 |
|
Isaac Connor
|
b1dd42dd8b
|
Use bootstrap nav pills to just hide/show the tab instead of doing form submits in monitor editing
|
2020-09-22 14:05:11 -04:00 |
|
Isaac Connor
|
7196eaf0d0
|
Minimum value for label position is 0, not 1.
|
2020-09-22 13:14:25 -04:00 |
|
Isaac Connor
|
2457dcb16f
|
Minimum value for label position is 0, not 1.
|
2020-09-22 13:12:39 -04:00 |
Isaac Connor
|
2f03ceeccf
|
log referer when unable to authenticate
|
2020-09-22 13:10:39 -04:00 |
|
Isaac Connor
|
98aad6abbc
|
Make status UNKNOWN be -1 so that zmu -s retains backwards compatibility. Fixes #3048
|
2020-09-21 14:25:41 -04:00 |
|
Isaac Connor
|
a43cbc05af
|
Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output
|
2020-09-21 13:03:03 -04:00 |
|
Isaac Connor
|
b6541aa1ff
|
Move log export to a generic modal
|
2020-09-21 13:01:58 -04:00 |
|
Isaac Connor
|
cbbdfdbd43
|
Introduce generic getModal and manageModalBtns
|
2020-09-21 13:00:55 -04:00 |
|
Isaac Connor
|
2ff2fbecd9
|
Remove fieldset styling. We were conflicting with bootstrap
|
2020-09-21 13:00:29 -04:00 |
|
Isaac Connor
|
96474a7d94
|
Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output
|
2020-09-21 13:00:03 -04:00 |
|
Isaac Connor
|
94fdddc1e8
|
Synchronize on space instead of = in zmcontrol.pl command line
|
2020-09-21 11:56:56 -04:00 |