Andrew Bauer
|
1361f0936c
|
clean up download view
|
2020-09-28 15:38:56 -05:00 |
Isaac Connor
|
58902c70d6
|
use output_script_if_exists to cache_bust most of the js
|
2020-09-28 09:49:07 -04:00 |
|
Isaac Connor
|
0c7cb58c38
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2020-09-28 09:36:34 -04:00 |
|
Isaac Connor
|
08273221a3
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2020-09-28 09:36:15 -04:00 |
|
Isaac Connor
|
ecac5e051a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-28 09:34:14 -04:00 |
|
Isaac Connor
|
37b0fc4bbd
|
bump version to pickup geolocation updates
|
2020-09-28 09:34:08 -04:00 |
|
Isaac Connor
|
0a4a144bbc
|
Merge branch 'location'
|
2020-09-28 09:33:28 -04:00 |
|
Andrew Bauer
|
699cbed6af
|
add back and refresh buttons to export view
|
2020-09-27 12:43:12 -05:00 |
|
Andrew Bauer
|
3b46ebacae
|
remove warning used for testing
|
2020-09-27 12:20:09 -05:00 |
|
Andrew Bauer
|
9ea58dc4a1
|
eslint
|
2020-09-27 12:16:04 -05:00 |
|
Andrew Bauer
|
c1a0afef95
|
make group view into a modal
|
2020-09-27 12:12:01 -05:00 |
|
Andrew Bauer
|
784533ac07
|
clean up group view
|
2020-09-27 08:11:45 -05:00 |
|
Andrew Bauer
|
47e5a26da4
|
eslint
|
2020-09-27 07:41:05 -05:00 |
|
Andrew Bauer
|
a6413ccd7f
|
call modal when edit btn is clicked on event view
|
2020-09-27 07:12:32 -05:00 |
Andrew Bauer
|
2655118cbd
|
change call to popup -> view in event.js
|
2020-09-26 21:21:29 -05:00 |
|
Andrew Bauer
|
9d2450d55d
|
load export view, rather than popup
|
2020-09-26 21:15:50 -05:00 |
|
Andrew Bauer
|
b2cf48a645
|
remove unused call to filter popup
|
2020-09-26 21:06:57 -05:00 |
|
Andrew Bauer
|
1260d7bbb2
|
convert controlcap tabs to pills
|
2020-09-26 17:05:13 -05:00 |
|
Andrew Bauer
|
935f73ad33
|
reconfig controlcap cancel button
|
2020-09-26 16:39:31 -05:00 |
|
Andrew Bauer
|
2d8349073d
|
redirect to controlcaps after saving a control
|
2020-09-26 14:31:59 -05:00 |
|
Andrew Bauer
|
dc08319037
|
add navbar to error view
|
2020-09-26 14:29:02 -05:00 |
|
Andrew Bauer
|
112003f9de
|
eslint
|
2020-09-26 13:55:56 -05:00 |
|
Andrew Bauer
|
0c4fcbbe97
|
convert controlcaps view to bstable
|
2020-09-26 12:09:41 -05:00 |
|
Andrew Bauer
|
e2fb5ae9ea
|
use br html tag to break the text
|
2020-09-26 09:24:17 -05:00 |
|
Andrew Bauer
|
9d1c24234b
|
add ConfirmDeleteControl to lang
|
2020-09-26 08:58:26 -05:00 |
|
Andrew Bauer
|
c831f16d92
|
add EditControl to lang
|
2020-09-26 08:05:00 -05:00 |
|
Andrew Bauer
|
5b1d6331e4
|
make the delconfirm modal generic
|
2020-09-26 07:53:22 -05:00 |
|
Andrew Bauer
|
48a649a132
|
extend pill list bkgnd vertically in options
|
2020-09-26 07:30:15 -05:00 |
|
Andrew Bauer
|
df5192a6b4
|
link to controlcaps from options view
|
2020-09-25 21:46:54 -05:00 |
|
Andrew Bauer
|
b7efdebf9a
|
dynamically find the Level col index
|
2020-09-25 21:26:22 -05:00 |
|
Andrew Bauer
|
f4e7e264f0
|
fix makelink
|
2020-09-25 16:18:44 -05:00 |
|
Andrew Bauer
|
582d85f083
|
unpopup the controlcaps views
|
2020-09-25 16:12:05 -05:00 |
|
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 |