Isaac Connor
|
dfae6661ab
|
use isset when determining if a column exists, otherwise we throw warnings
|
2018-04-25 09:32:40 -04:00 |
|
Isaac Connor
|
5f415873d4
|
Update GroupIds regardless of changes returned from getFormChanges on Monitor save
|
2018-04-25 09:32:15 -04:00 |
|
Isaac Connor
|
2a81877664
|
spacing
|
2018-04-25 09:31:40 -04:00 |
|
Isaac Connor
|
80803a164c
|
in set(), check to see if there is a method and if there is call it to set the value. Implement using GroupIds to set the GroupIds value. If the new value is a scalar, then turn it into an array.
|
2018-04-25 09:27:43 -04:00 |
Isaac Connor
|
5b4d160710
|
add total bandwidth at bottom and move buttons to top
|
2018-04-24 14:18:41 -04:00 |
|
Isaac Connor
|
20f6985dff
|
implement capturing bandwidth
|
2018-04-24 14:11:27 -04:00 |
|
Isaac Connor
|
bbb10fa4b4
|
Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34
|
2018-04-24 12:40:15 -04:00 |
|
Isaac Connor
|
662215d125
|
Merge ../ZoneMinder.connortechnology
|
2018-04-21 10:35:49 -04:00 |
|
Isaac Connor
|
3560c0d610
|
fix displayed tbale header twice
|
2018-04-21 10:35:36 -04:00 |
|
Isaac Connor
|
578df0c5cc
|
update submodules
|
2018-04-20 16:18:58 -04:00 |
|
Isaac Connor
|
c65255a067
|
Merge ../ZoneMinder.connortechnology
|
2018-04-20 15:56:42 -04:00 |
|
Isaac Connor
|
a868bb70ed
|
Better debug when fail to attach images
|
2018-04-20 15:56:14 -04:00 |
|
Isaac Connor
|
fac3cde1e7
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-04-20 15:23:23 -04:00 |
|
Isaac Connor
|
3ea39ad417
|
whitespace
|
2018-04-20 15:22:45 -04:00 |
|
Isaac Connor
|
8b165c34b0
|
Handle event and frame no found earlier
|
2018-04-20 14:25:54 -04:00 |
|
Isaac Connor
|
781438d4c5
|
specify E.* in query because otherwise it uses M.Id for Id
|
2018-04-20 14:25:38 -04:00 |
|
Isaac Connor
|
fedc4d4cb1
|
spacing
|
2018-04-20 14:24:56 -04:00 |
|
Isaac Connor
|
ac775f13f6
|
always return an array from find_all
|
2018-04-20 14:23:27 -04:00 |
|
Isaac Connor
|
9de3c44702
|
Add find_one and caching
|
2018-04-20 14:23:04 -04:00 |
|
Isaac Connor
|
07e7ab1547
|
fix spacing
|
2018-04-20 14:21:41 -04:00 |
Isaac Connor
|
970830aee3
|
tidy up
|
2018-04-20 13:10:38 -04:00 |
Andy Bauer
|
ed140426ab
|
rpm packaging changes and documentation
|
2018-04-19 15:36:43 -05:00 |
Andrew Bauer
|
3c225c9f1c
|
Migrate Webcache out of webroot (#2083)
* migrate webcache folder out of webroot, migrate htaccess files
* rpm specfile - add missing reference to cache folder
* fix submodule mixup
|
2018-04-19 15:01:46 -04:00 |
|
Isaac Connor
|
fb44619a66
|
output the initial table head
|
2018-04-19 14:33:05 -04:00 |
|
Isaac Connor
|
2aa689a14a
|
Use a class instead of an id for consoleTable
|
2018-04-19 14:20:02 -04:00 |
|
Isaac Connor
|
5b5cd3f330
|
fix broken table when no monitors to display
|
2018-04-19 14:16:30 -04:00 |
|
Isaac Connor
|
983cd83054
|
Add default for SignalCheckPoints and add it as a hidden field to the non-misc tabs
|
2018-04-19 10:01:04 -04:00 |
|
Isaac Connor
|
cd70ed3dec
|
always show SignalCheckColour and add a SignalCheckPoints option
|
2018-04-19 09:45:28 -04:00 |
|
Isaac Connor
|
8da9bc412b
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-04-18 21:12:33 -04:00 |
|
Isaac Connor
|
fcaac016b5
|
Merge ../ZoneMinder.connortechnology
|
2018-04-18 21:12:14 -04:00 |
Andrew Bauer
|
a5cbc8abd1
|
buildsystem - update git submodules
|
2018-04-18 19:21:14 -05:00 |
Isaac Connor
|
bbee7fd0f2
|
fix array_key_exists
|
2018-04-18 14:17:41 -07:00 |
|
Isaac Connor
|
28b85e1977
|
Add ZeroSize test to Event Audit Report
|
2018-04-18 13:48:20 -07:00 |
|
Andrew Bauer
|
f6540aeba1
|
point git submodules to our own forks
|
2018-04-18 14:00:00 -05:00 |
|
Isaac Connor
|
75248e7465
|
use array_key_exists instead of isset so that we can return nulls
|
2018-04-18 14:21:27 -04:00 |
|
Isaac Connor
|
d31207dd53
|
use find_one instead of new Group so that caching will happen
|
2018-04-18 12:30:47 -04:00 |
|
Isaac Connor
|
88a2c0d953
|
spacing
|
2018-04-18 12:30:32 -04:00 |
|
Isaac Connor
|
61249ccf2a
|
Show pause/play/stop when no stream buffer
|
2018-04-18 12:30:18 -04:00 |
|
Isaac Connor
|
36b8cfb115
|
test element so that processing will continue if buton doesn't exist
|
2018-04-18 12:29:59 -04:00 |
|
Isaac Connor
|
940c791d4f
|
GroupIds won't be set if no groups are selected
|
2018-04-18 12:14:49 -04:00 |
|
Isaac Connor
|
e3afa5e309
|
handle scale not being defined when using mpeg streaming
|
2018-04-18 11:28:19 -04:00 |
|
Isaac Connor
|
12d46e2377
|
change event_id in status_msg to 64bit when unpacking
|
2018-04-18 09:52:57 -04:00 |
|
Isaac Connor
|
ef86746991
|
Merge ../ZoneMinder.connortechnology
|
2018-04-17 21:07:48 -04:00 |
|
Isaac Connor
|
f620781f7e
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-17 21:07:00 -04:00 |
|
Isaac Connor
|
aaa7844350
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-17 14:18:01 -07:00 |
|
Isaac Connor
|
10a191ae5b
|
add event_disk_space to storage to differentiate between real used space versus event used disk space. Use this in the navbar to show actual disk use and also event disk use
|
2018-04-17 14:14:40 -07:00 |
|
Isaac Connor
|
fd1c69d48a
|
switch to uint64_t for event_id because long long can actually be 128 bit
|
2018-04-17 13:51:20 -04:00 |
|
Isaac Connor
|
c043a157ad
|
spacing and add Server function
|
2018-04-17 12:37:30 -04:00 |
|
Isaac Connor
|
92c8b9038c
|
fix to group caching and group deleting
|
2018-04-17 12:36:35 -04:00 |
|
Isaac Connor
|
196b8c52dc
|
Apply multiport to event viewing as well
|
2018-04-17 12:35:59 -04:00 |