Isaac Connor
|
d3cc4d589f
|
Remove the parseFilter etc calls from getNavBarHTML code which was used to populate the filter link with the currently viewed events list. I think we can do this better with saving it to the sesssion or similar.
|
2020-08-16 13:04:42 -04:00 |
|
Isaac Connor
|
344f586f19
|
Add language entry for ExistsInFileSystem
|
2020-08-16 13:03:18 -04:00 |
|
Isaac Connor
|
d1126b3007
|
Move term logic from parseFilter to FilterTerm class
|
2020-08-16 13:02:34 -04:00 |
|
Isaac Connor
|
82a1670d80
|
Rough in FilterTerm class, stealing code from functions.php and adapting it.
|
2020-08-15 17:49:59 -04:00 |
|
Isaac Connor
|
8a170f2841
|
Remove Debug
|
2020-08-15 17:49:26 -04:00 |
|
Isaac Connor
|
b8433373b5
|
Rough in Pre and Post SQL Conditions in execute. Rough in ExistsInFileSystem support. Needs more work.
|
2020-08-15 17:49:11 -04:00 |
|
Isaac Connor
|
49316244a8
|
Merge branch 'master' into filter_pre_post
|
2020-08-13 13:46:35 -04: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
|
ecc87948d0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-13 12:14:29 -04:00 |
|
Isaac Connor
|
4fee59208d
|
Use str_replace and ltrim instead of preg_replace for efficiency
|
2020-08-13 12:14:18 -04:00 |
|
Andrew Bauer
|
09b12a7dac
|
Remove extra space in event name
|
2020-08-13 10:51:10 -05: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
|
ac9432edf4
|
Older cameras don't have that file. It's ok for it to return a 404.
|
2020-08-11 15:17:27 -04:00 |
|
Isaac Connor
|
bf1c27e20a
|
Add db update to drop default value for LabelFormat. Fixes #2896
|
2020-08-11 14:14:31 -04: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
|
6918461c3e
|
Bump version to 1.34.19 for release
|
2020-08-11 11:03:20 -04:00 |
|
Isaac Connor
|
afae319c94
|
Fix MOCORD not going into ALARM state.
|
2020-08-11 11:02:26 -04:00 |
|
Isaac Connor
|
12dbd267bf
|
Add devuan beowulf support
|
2020-08-11 09:21:48 -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 |
|
Isaac Connor
|
c2dfaa1b65
|
create a distro build dir for devuan beowulf
|
2020-08-10 17:30:59 -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
|
1ea36e3ee6
|
populate ZM_PATH_SHUTDOWN
|
2020-08-10 12:26:26 -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
|
06a521e30e
|
populate ZM_PATH_SHUTDOWN
|
2020-08-10 12:02:42 -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 |
|
Andrew Bauer
|
d0e7443a3c
|
rough in update reminder dropdown
|
2020-08-09 14:18:44 -05:00 |
|
Andrew Bauer
|
b22f12dadb
|
rough in new zmversion widget
|
2020-08-09 12:20:11 -05:00 |