Andrew Bauer
|
eedf18073f
|
add navbar to controlcap views
|
2020-09-25 16:05:16 -05:00 |
|
Andrew Bauer
|
6a5610e404
|
add back and refresh buttons to user view
|
2020-09-25 15:49:18 -05:00 |
Isaac Connor
|
cf3f57e925
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-25 16:03:00 -04:00 |
|
Andrew Bauer
|
ea99bc173e
|
add navbar to monitor probe views
|
2020-09-25 14:49:14 -05:00 |
|
Isaac Connor
|
3b6cd9da22
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-25 15:29:36 -04:00 |
|
Isaac Connor
|
8223d6ed15
|
When closing event, on first update, only update if Name has not been changed. If so, do the update without setting the Name.
|
2020-09-25 15:29:31 -04:00 |
|
Andrew Bauer
|
2b0badfebe
|
add back and refresh buttons to zones
|
2020-09-25 13:44:55 -05:00 |
|
Andrew Bauer
|
8018bd4ed9
|
add back & refresh buttons to zone view
|
2020-09-25 13:37:06 -05:00 |
|
Andrew Bauer
|
d66b0be1bb
|
fix scalecontrol on frame view
|
2020-09-25 13:08:55 -05:00 |
|
Andrew Bauer
|
c73dbc480f
|
unpopup the svg ploygon in zones
|
2020-09-25 12:34:04 -05:00 |
|
Andrew Bauer
|
ae9139b00c
|
unpopup zone view
|
2020-09-25 10:52:13 -05:00 |
|
Isaac Connor
|
5a6e793b76
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-25 11:01:42 -04:00 |
|
Isaac Connor
|
c14e141295
|
Merge branch 'release-1.34'
|
2020-09-25 11:01:25 -04:00 |
|
Isaac Connor
|
3db8490d9c
|
Escape another case of Function for mysql8
|
2020-09-25 10:59:31 -04:00 |
Isaac Connor
|
f4f02e24bd
|
Use /run/zm instead of /var/run/zm
|
2020-09-25 09:48:56 -04:00 |
Joseph Yasi
|
52ca2abf69
|
Quote some more MySQL8 Reserved keywords
See:
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295/comments/1
https://github.com/ZoneMinder/zoneminder/issues/2659
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295
|
2020-09-25 09:37:21 -04:00 |
|
Andrew Bauer
|
1ac5572d59
|
unpopup the zones view
|
2020-09-25 07:56:09 -05:00 |
|
Andrew Bauer
|
493b9d0ef7
|
revert newlog row colors back to former
|
2020-09-25 07:21:14 -05:00 |
|
Isaac Connor
|
f9d28ddabe
|
stick a map on the location tab
|
2020-09-24 20:31:22 -04:00 |
|
Isaac Connor
|
a3f4837186
|
Use config options for tile datam access tokens and turning geolocation on/off
|
2020-09-24 20:30:57 -04:00 |
|
Isaac Connor
|
a109d7bba0
|
leaflet can't be cache busted so update output_link_if_exists and output_script_if_exists to take a cache_bust flag
|
2020-09-24 20:21:38 -04:00 |
|
Isaac Connor
|
e9d8279d8a
|
Add geolocation config options
|
2020-09-24 20:20:01 -04:00 |
|
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 |