Isaac Connor
82542c569c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-04 10:47:41 -04:00
Isaac Connor
6e9559df53
Put xhtmlHeaders in an ob_start ob_get_clean section so that calls to open session in view js php files don't cause a problem. Basically delay output. Fixes problems with logging in redirect. Also need to global cspNonce since we use it.
2020-08-04 10:47:37 -04:00
Andrew Bauer
9e03827fea
rpm specfile - use new cmake macros for f33 compat
2020-08-04 09:38:52 -05:00
Andrew Bauer
a575b16278
set a target to about menu items
2020-08-03 15:45:27 -05:00
Andrew Bauer
8d9410d510
spelling
2020-08-03 15:38:02 -05:00
Andrew Bauer
9d88f8ee73
implement zm about menu
2020-08-03 15:22:46 -05:00
Andrew Bauer
ab9a135759
fix inability to stop zm from the web console
2020-08-03 12:10:34 -05:00
Isaac Connor
283d8557e6
remove the extra(globals). There are a LOT of globals. WE don't seem to actually use any in this function.
2020-08-03 12:50:36 -04:00
Andrew Bauer
a3e6fe5522
make the eslint nanny happy
2020-08-03 11:47:31 -05:00
Andrew Bauer
ce810320a2
bump right margin on storage widget
2020-08-03 11:02:30 -05:00
Andrew Bauer
8a711245f6
fix previous corrupted commit
2020-08-03 10:49:45 -05:00
Andrew Bauer
c1f37192b9
implement storage widget as dropdown
2020-08-03 10:43:24 -05:00
Isaac Connor
ece625e376
Remove the code that cleans the log on each page request. it was moved to zm_stats.pl. Accessing the log is kinda heavy, so should be done in background tasks, not interactively
2020-08-03 11:16:01 -04:00
Isaac Connor
eb1d94345f
remove crud
2020-08-03 11:05:58 -04:00
Isaac Connor
9acbd9d1b2
fix typos prevent array based regexp from working. Fixes saving Storage
2020-08-03 11:05:16 -04:00
Isaac Connor
a2958fe288
Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin
2020-08-03 10:57:08 -04:00
Isaac Connor
56bf181dc4
set SameSite on session cookie.
2020-08-03 10:55:54 -04:00
Isaac Connor
325178a556
convert log filters to responsive bootstrap divs.
2020-08-02 20:25:24 -04:00
Isaac Connor
6f9947b583
Switch to jquery in login.js. We no longer include mootool for login view.
2020-08-02 19:12:07 -04:00
Andrew Bauer
3351a4de56
fix eslint
2020-08-02 15:33:10 -05:00
Andrew Bauer
d21f462bd3
enable EcmaScript 6 to allow for-of loops
2020-08-02 14:59:29 -05:00
Andrew Bauer
0ecb1621ce
add colorized log icon to widget bar
2020-08-02 14:49:19 -05:00
Andrew Bauer
a937e14899
put the optional banner in its own navbar
2020-08-02 13:48:15 -05:00
Andrew Bauer
d6999f5628
iterate through keys in data
2020-08-02 13:33:25 -05:00
Andrew Bauer
2b29a7983a
clean up navbar background refresh
2020-08-02 13:01:20 -05:00
Andrew Bauer
b746cf6a56
add id and output html string rather than echo
...
This sets up all the items on the navbar as reconfigurable, via javascript replaceWith
2020-08-02 11:31:36 -05:00
Isaac Connor
cfa2d13948
set samesite=Strict in session cookie
2020-08-02 12:06:13 -04:00
Isaac Connor
037b696be0
Fix duplicate class attributes on navbar links
2020-08-02 12:05:52 -04:00
Isaac Connor
68b7277784
Fix sizing of option name by removing the non-semantic elements and just specifying the styles
...
in css/base/views/option.css. Alsoo apply h-100 to columns to that nav bar fills the vertical space.
2020-08-02 11:20:18 -04:00
Andrew Bauer
e768beaef2
fix whitespace
2020-08-01 16:20:51 -05:00
Andrew Bauer
ad3b5a5aa3
call ob_start and ob_get_clean correctly
2020-08-01 16:16:23 -05:00
Andrew Bauer
81c4bfa7c2
stop Chrome complaining about bootstrap.min.css.map
2020-08-01 12:22:47 -05:00
Andrew Bauer
b746901ee7
close the dropmenu on any click
2020-08-01 10:57:13 -05:00
Andrew Bauer
4851f1f940
remove errant text
2020-08-01 09:50:25 -05:00
Andrew Bauer
889b08519a
Set a small breakpoint on table-responsive
...
This fixes (ugly) horizontal scroll bars appearing at the bottom of the monitor table on larger screens, without breaking functionality on mobile devices. @roddone please test this on your mobile device
2020-08-01 09:49:27 -05:00
Isaac Connor
b46d3b81d6
Update user view to use User class
2020-08-01 10:27:54 -04:00
Andrew Bauer
8b3917d707
reapply navbar reload logic
2020-08-01 09:07:21 -05:00
Andrew Bauer
b6c0274b2c
implement collapsed navbar
2020-07-31 16:03:37 -05:00
Andrew Bauer
cd96994a56
update getZMVersionHTML
2020-07-31 07:31:40 -05:00
Isaac Connor
be05040a47
fix rotated images
2020-07-30 19:50:25 -04:00
Isaac Connor
366ce5b3eb
Add 100% width to LabelFormat
2020-07-30 19:36:27 -04:00
Isaac Connor
3df58fc9db
handle array args in daemonStatus
2020-07-30 19:36:05 -04:00
Andrew Bauer
2699fa0313
force menubar to the top of the navbar
2020-07-30 16:56:38 -05:00
Andrew Bauer
8bb30bb6d4
add framework for new navbar selection
2020-07-30 16:44:58 -05:00
Isaac Connor
916d566390
bump version to 1.34.17 for release
2020-07-30 17:22:37 -04:00
Andrew Bauer
561c44ece2
add runtimeStatus function
2020-07-30 16:14:41 -05:00
Isaac Connor
0a782814a7
Don't start filter if the command was execute
2020-07-30 17:13:30 -04:00
Isaac Connor
204086a56d
spacing and quotes
2020-07-30 17:12:00 -04:00
Isaac Connor
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
Isaac Connor
2cfa5fde98
Add missing view tempplates for zone add/edit. Fixes #2986
2020-07-30 16:54:00 -04:00