Isaac Connor
|
1a6154752a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-16 20:08:49 -04:00 |
|
Isaac Connor
|
a8455d4ecf
|
Add necessary globals
|
2020-08-16 20:08:42 -04:00 |
|
Isaac Connor
|
2021f561fa
|
Import as a global
|
2020-08-16 20:08:26 -04:00 |
|
Isaac Connor
|
ea4edcbc94
|
Make a global so tht we can use it in export_functions
|
2020-08-16 20:08:14 -04:00 |
Andrew Bauer
|
de0a4a18ee
|
fix checkbox column
|
2020-08-16 18:00:11 -05:00 |
|
Andrew Bauer
|
5468c0322e
|
appease the eslint nanny
|
2020-08-16 16:30:35 -05:00 |
|
Andrew Bauer
|
0cbf559821
|
only hide cols if cookie not exist
|
2020-08-16 16:02:43 -05:00 |
|
Andrew Bauer
|
7c72e1fa08
|
fix cookie issue with bootstrap-table
|
2020-08-16 15:39:20 -05:00 |
|
Andrew Bauer
|
33ea9de8cf
|
better spacing archived & emailed tinytext
|
2020-08-16 15:19:08 -05:00 |
|
Andrew Bauer
|
f27f6e6394
|
fix archive buttons, remove asterisk from event name
|
2020-08-16 14:46:56 -05:00 |
|
Andrew Bauer
|
94d666b296
|
tiny text under event name, add emailed column
|
2020-08-16 14:41:50 -05:00 |
|
Andrew Bauer
|
ee31761627
|
cleanup & consolidate events view buttons
|
2020-08-16 13:44:18 -05:00 |
|
Andrew Bauer
|
9be63f1d99
|
reorganize and init eventTable
|
2020-08-16 11:34:37 -05:00 |
|
Andrew Bauer
|
93475bef7e
|
eslint nanny
|
2020-08-15 16:08:53 -05:00 |
|
Andrew Bauer
|
252bf7995a
|
eslint nannt
|
2020-08-15 15:54:58 -05:00 |
|
Andrew Bauer
|
1c558b66e7
|
add font-awesome stylesheet
|
2020-08-15 15:44:54 -05:00 |
|
Andrew Bauer
|
50a1ceb48a
|
add bootstrap-table.min.css
|
2020-08-15 15:37:02 -05:00 |
|
Andrew Bauer
|
45fde13535
|
rough in new events view
|
2020-08-15 15:27:58 -05:00 |
|
Andrew Bauer
|
7225281771
|
enlarge event thumbs on hover
|
2020-08-13 12:50:59 -05:00 |
|
Andrew Bauer
|
b45c4fac1f
|
tighten up event column spacing
|
2020-08-13 12:33:13 -05:00 |
|
Isaac Connor
|
6550876a92
|
fix css so that the background colour of the dropdown divs is set
|
2020-08-13 12:40:11 -04:00 |
|
Isaac Connor
|
c674cb7b55
|
Move the dropdown id's to the a element where they should be. Remove duplicated id on storage_dropdown.
|
2020-08-13 12:39:51 -04:00 |
|
Isaac Connor
|
4fee59208d
|
Use str_replace and ltrim instead of preg_replace for efficiency
|
2020-08-13 12:14:18 -04:00 |
|
Isaac Connor
|
047d69ace7
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-13 11:28:00 -04:00 |
|
Andrew Bauer
|
c4ee4fb307
|
split start & end times into sep cols & wrap
|
2020-08-13 09:24:42 -05:00 |
|
Andrew Bauer
|
27c80cedac
|
set small screen breakpoint on table-responsive
This gets rid of the ugly horizontal scroll bars on the table on larger screens
|
2020-08-12 10:10:55 -05:00 |
|
Isaac Connor
|
6cbc54ef87
|
When storage area has been deleted, say so
|
2020-08-11 14:11:48 -04:00 |
|
Isaac Connor
|
5f0da93c6e
|
turn off debug
|
2020-08-11 13:47:48 -04:00 |
|
Isaac Connor
|
303cec92f6
|
Add globals, fixing timeline view
|
2020-08-11 13:47:37 -04:00 |
|
Isaac Connor
|
0a7df075ae
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-11 11:41:15 -04:00 |
|
Isaac Connor
|
d42424d6d8
|
Merge branch 'release-1.34'
|
2020-08-11 11:41:11 -04:00 |
|
Isaac Connor
|
355428e93e
|
direct settings view to the monitor that is actually recording the stream
|
2020-08-10 21:32:23 -04:00 |
|
Isaac Connor
|
e8bf2aa386
|
Update settings view. Were assigning to a function. More work to be done.
|
2020-08-10 21:20:23 -04:00 |
|
Isaac Connor
|
81296bbe31
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-10 17:31:08 -04:00 |
|
Andrew Bauer
|
4a31ebe045
|
Update options.php
|
2020-08-10 15:48:20 -05:00 |
|
Andrew Bauer
|
b5553c968b
|
expand options to full width
|
2020-08-10 15:41:25 -05:00 |
|
Andrew Bauer
|
4097693b38
|
appease the eslint nanny
|
2020-08-10 13:38:53 -05:00 |
|
Andrew Bauer
|
3fa97f2bc1
|
reogranize state.php
|
2020-08-10 13:35:12 -05:00 |
|
Isaac Connor
|
63da7f0074
|
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
|
2020-08-10 14:02:25 -04:00 |
|
Isaac Connor
|
81b55589db
|
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
|
2020-08-10 13:59:47 -04:00 |
|
Isaac Connor
|
bafffdb486
|
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
|
2020-08-10 12:26:37 -04:00 |
|
Isaac Connor
|
5ee086bbfe
|
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
|
2020-08-10 12:25:44 -04:00 |
|
Isaac Connor
|
e64e786c5b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-09 22:20:08 -04:00 |
|
Isaac Connor
|
f04e1a0ba7
|
Apply min=0 to filterX and Y so that we don't get negative values
|
2020-08-09 22:20:06 -04:00 |
|
Isaac Connor
|
ec707acdd1
|
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
|
2020-08-09 22:19:43 -04:00 |
|
Isaac Connor
|
25426d5fdd
|
Don't add 442 for https and 80 for http. Just cleaner
|
2020-08-09 22:18:35 -04:00 |
|
Isaac Connor
|
b4a3ccdfed
|
only put the hostname in the CSP headers so that we accept as source either http or https or any port. Useful for multiport.
|
2020-08-09 22:18:07 -04:00 |
|
Andrew Bauer
|
42fe024681
|
Update skin.js
|
2020-08-09 17:43:39 -05:00 |
|
Andrew Bauer
|
9a03a2c7d4
|
Update skin.js
|
2020-08-09 17:43:07 -05:00 |
|
Andrew Bauer
|
15005a2f17
|
fix typo
|
2020-08-09 14:25:11 -05:00 |