Isaac Connor
|
ef2ad12846
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-05 20:00:45 -04:00 |
|
Isaac Connor
|
ddeef6f031
|
Fix globals and a Fatal without ZM\ prefix
|
2020-08-05 20:00:39 -04:00 |
|
Isaac Connor
|
cc9413b44b
|
replace python=sphinx with sphinx-doc in depends for ubuntu 2004
|
2020-08-05 20:00:25 -04:00 |
Isaac Connor
|
4d4fab46d6
|
Spacing, use FFMpegInit instead of deprecated ffmpeg calls
|
2020-08-05 19:17:00 -04:00 |
|
Isaac Connor
|
76e0d155d3
|
declare globals
|
2020-08-05 19:15:01 -04:00 |
|
Isaac Connor
|
b6463c6917
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-05 11:33:28 -04:00 |
|
Isaac Connor
|
b867d0c463
|
Fix image copy when line sizes are not the same.
|
2020-08-05 11:33:22 -04:00 |
Andrew Bauer
|
92cc03dbe8
|
fix pod2man out-of-source builds
|
2020-08-04 21:07:49 -05:00 |
|
Isaac Connor
|
90671cd4e5
|
Add missing globals
|
2020-08-04 18:07:01 -04:00 |
|
Isaac Connor
|
97096d87f9
|
Add mx-2 classes to be consistent
|
2020-08-04 18:06:49 -04:00 |
|
Isaac Connor
|
5b8ff10a34
|
style the storage dropdown better using css. rename it from dropdown01 to dropdown_storage. Put the text-warning class on the a content in the dropdown instead of the dropdown nav-item so that it takes effect. Rename Stor to Storage
|
2020-08-04 17:53:39 -04:00 |
|
Isaac Connor
|
1ab828c110
|
Add globals
|
2020-08-04 17:35:52 -04:00 |
|
Isaac Connor
|
dd627d9234
|
Update cycle monitorlist sidebar to bootstrap4
|
2020-08-04 17:35:41 -04:00 |
|
Isaac Connor
|
e5513bc7a4
|
Add setting Name and Path
|
2020-08-04 17:35:16 -04:00 |
|
Isaac Connor
|
ba4d6dff64
|
Add globals definitions
|
2020-08-04 17:05:58 -04:00 |
|
Isaac Connor
|
9a06d6cab6
|
Fix some spacing
|
2020-08-04 17:05:44 -04:00 |
|
Isaac Connor
|
79c9671ef2
|
Use & instead of & in urls
|
2020-08-04 17:05:33 -04:00 |
|
Isaac Connor
|
c0f21ab55d
|
Fix globals
|
2020-08-04 16:36:24 -04:00 |
|
Isaac Connor
|
d7de4768d7
|
Fix use of is_callable
|
2020-08-04 16:36:04 -04:00 |
|
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 |