Isaac Connor
|
b8cfff2b6d
|
Merge branch 'storageareas' into tesla
|
2018-01-02 09:18:29 -08:00 |
|
Isaac Connor
|
a33cba9989
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-02 09:17:16 -08:00 |
|
Isaac Connor
|
642c3f053a
|
We are not using boost at this time.
|
2018-01-02 09:16:37 -08:00 |
|
Isaac Connor
|
867f2a9166
|
simplify deleting event files. The old way was too intensive.
|
2018-01-02 09:15:50 -08:00 |
|
Isaac Connor
|
16f01d5ecb
|
Fix when specifying by filter_id or filter_name. Probably a botched merge.
|
2018-01-02 07:10:38 -08:00 |
Isaac Connor
|
1b1b93f811
|
use CakePHP-Enum-Behavior to add support for ENUMs to the Monitor model. This should fix #48
|
2018-01-01 14:43:02 -05:00 |
|
Isaac Connor
|
5a7ca38a1f
|
Merge branch 'storageareas' into tesla
|
2018-01-01 10:37:51 -08:00 |
|
Isaac Connor
|
109a24ed4d
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-01 10:37:24 -08:00 |
|
Isaac Connor
|
b62343fb2c
|
bump to 1.31.18
|
2018-01-01 13:19:30 -05:00 |
|
Isaac Connor
|
6c07347721
|
Fix Update DiskSpace Filter adding
|
2018-01-01 13:19:16 -05:00 |
|
Isaac Connor
|
1cd69c69b9
|
add defining ZM_SERVER_ID after loading config
|
2018-01-01 13:10:39 -05:00 |
|
Isaac Connor
|
edd5bd8874
|
create the Update DIskSpace filter if it doesn't exist
|
2018-01-01 12:44:09 -05:00 |
|
Isaac Connor
|
a79017b168
|
add a KEY to Events for EndTime and DiskSpace, since we are constantly selecting on those. Insert the Update DiskSpace filter on db creation.
|
2018-01-01 12:43:47 -05:00 |
|
Isaac Connor
|
7fcbd86ba0
|
fix auditing Medium directory structures
|
2017-12-29 15:29:57 -05:00 |
|
Isaac Connor
|
1044915ea3
|
Merge branch 'storageareas' into tesla
|
2017-12-23 12:58:58 -08:00 |
|
Isaac Connor
|
b219f76588
|
add togglebuttons to select all checbox
|
2017-12-23 12:58:48 -08:00 |
|
Isaac Connor
|
cc3b65b5fd
|
add default value for ServerId in Storage
|
2017-12-23 12:07:13 -08:00 |
|
Isaac Connor
|
74269fea73
|
make montagereview load event images from the server that the storage is located on
|
2017-12-22 12:33:30 -08:00 |
|
Isaac Connor
|
0fa11d7c36
|
make montagereview load event images from the server that the storage is located on
|
2017-12-22 12:32:45 -08:00 |
|
Isaac Connor
|
2c361de9d3
|
add Server Storage Areas
|
2017-12-22 11:39:43 -08:00 |
|
Isaac Connor
|
c6bf502ee7
|
only show each Storage area if there are less than 4.
|
2017-12-22 11:39:27 -08:00 |
|
Isaac Connor
|
0c350b8f41
|
add ServerId to Storage
|
2017-12-22 11:38:59 -08:00 |
|
Isaac Connor
|
0d7fff761c
|
upgrade find_all to take parameters
|
2017-12-22 11:38:42 -08:00 |
|
Isaac Connor
|
bb8e326392
|
Fix not restarting a monitor if it has moved to a different server
|
2017-12-22 09:16:56 -08:00 |
|
Isaac Connor
|
cc8ed75eb9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-12-22 09:03:11 -08:00 |
|
Isaac Connor
|
f51259443c
|
fix disk_used_percentage to use db calculated used size
|
2017-12-22 09:02:49 -08:00 |
Isaac
|
9dfad4886d
|
fix saving Monitors
|
2017-12-22 16:13:00 +01:00 |
|
Isaac Connor
|
148e21d707
|
fugro
|
2017-12-21 21:46:21 -05:00 |
|
Isaac Connor
|
915ea93348
|
source remote server when streaming event
|
2017-12-21 16:53:46 -08:00 |
|
Isaac Connor
|
f036e95793
|
fix Moving when Medium Scheme
|
2017-12-21 16:53:22 -08:00 |
|
Isaac Connor
|
332cfb5af2
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-12-20 21:22:52 -05:00 |
|
Isaac Connor
|
2c1aa2a92f
|
missing ;
|
2017-12-20 21:22:37 -05:00 |
Isaac Connor
|
efc7b7d85a
|
Merge pull request #71 from digital-gnome/storageareas-datpickerfixes
Fix missing change to StartDateTime
|
2017-12-20 15:56:17 -05:00 |
digital-gnome
|
8bfdb73d24
|
Fix missing change to StartDateTime
Fixes filter loading from events if clicked from last hour link.
|
2017-12-20 15:46:03 -05:00 |
|
Isaac Connor
|
89d284b4ea
|
Merge pull request #70 from digital-gnome/storageareas-datpickerfixes
Allow nondate values
|
2017-12-20 15:25:52 -05:00 |
|
digital-gnome
|
b4c0f13adf
|
Allow nondate values
Supports -# days/hours/etc
|
2017-12-20 15:23:14 -05:00 |
|
Isaac Connor
|
e9141ca3e8
|
re-init logger after loading config to actually pick up the appropriate values. This stops the error logging of Info to weblog when weblog is actually set to None. Also update quotes
|
2017-12-20 10:19:24 -05:00 |
|
Isaac Connor
|
85b7baa131
|
Fix event Groups associations
|
2017-12-19 18:09:41 -05:00 |
|
Isaac Connor
|
e47c8fad88
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-12-19 11:01:42 -05:00 |
|
Isaac Connor
|
2922a86d23
|
fixes to new Storage Schemes code
|
2017-12-19 11:01:03 -05:00 |
|
Isaac Connor
|
1fe597c9cc
|
Merge pull request #69 from digital-gnome/filtersfix
Default value for new brackets
|
2017-12-19 09:55:33 -05:00 |
|
digital-gnome
|
d034ae9ab2
|
Default value for new brackets
|
2017-12-18 22:58:38 -05:00 |
|
Isaac Connor
|
5f4b2ca53f
|
don't close the session when logging in
|
2017-12-18 14:35:11 -05:00 |
|
Isaac Connor
|
46673bafdb
|
Merge pull request #68 from digital-gnome/montagereview-datepicker
Montagereview datepicker
|
2017-12-18 13:39:58 -05:00 |
|
Isaac Connor
|
8a8001f14a
|
fix missingc_str()
|
2017-12-18 13:25:24 -05:00 |
|
Isaac Connor
|
705a98276f
|
change StorageScheme to Scheme
|
2017-12-18 13:17:43 -05:00 |
|
Isaac Connor
|
dcfae11fc7
|
fix typos
|
2017-12-18 13:16:54 -05:00 |
|
Isaac Connor
|
0e2d2ce611
|
fix typos
|
2017-12-18 13:05:04 -05:00 |
|
Isaac Connor
|
c93de992c2
|
add Scheme to the list of fields
|
2017-12-18 13:04:57 -05:00 |
|
Isaac Connor
|
d312482a2b
|
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
|
2017-12-18 12:52:26 -05:00 |