Andrew Bauer
|
a5cbc8abd1
|
buildsystem - update git submodules
|
2018-04-18 19:21:14 -05:00 |
Andrew Bauer
|
f6540aeba1
|
point git submodules to our own forks
|
2018-04-18 14:00:00 -05:00 |
Isaac Connor
|
0b0fbae1c5
|
Add output of paused image when paused
|
2018-04-12 18:43:57 -04:00 |
Isaac Connor
|
f9f78e9aa3
|
Convert event_id to a 64bit unsigned int
|
2018-04-12 13:40:11 -07:00 |
|
Isaac Connor
|
989ed65f52
|
spacing and braces, remove a dead unused function
|
2018-04-11 10:50:28 -04:00 |
|
Isaac Connor
|
ae3ccf6ffe
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-06 12:32:07 -07:00 |
|
Isaac Connor
|
fdd8be5daf
|
brackets and spaces
|
2018-04-06 14:52:56 -04:00 |
|
Isaac Connor
|
7f850890cb
|
whitespace
|
2018-04-06 14:42:20 -04:00 |
|
Isaac Connor
|
513708b11c
|
don't need to define the config, it will have already been done. Include auth.php instead of functions.php as the code has been moved
|
2018-04-06 14:42:10 -04:00 |
|
Isaac Connor
|
a789fc88aa
|
implement getAuthHash
|
2018-04-06 14:41:39 -04:00 |
|
Isaac Connor
|
2c02a479d6
|
remove duplicated config code from bootstrap and just include config.php
|
2018-04-06 14:38:32 -04:00 |
|
Isaac Connor
|
7a12589a83
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-05 13:41:47 -07:00 |
|
Isaac Connor
|
f1a8d5f1ff
|
start of work on .41. Adding foreign keysy
|
2018-04-05 13:41:24 -07:00 |
Isaac Connor
|
632ab143fe
|
error when can't set session in cake
|
2018-04-05 14:21:56 -04:00 |
|
Isaac Connor
|
87f5204c46
|
rename process_configfile to remove namesspace colision
|
2018-04-05 11:44:21 -04:00 |
|
Isaac Connor
|
fb392b2765
|
put back process_configfile
|
2018-04-05 11:33:24 -04:00 |
|
Isaac Connor
|
8fee795fb4
|
don't duplicate declaration of process_configfile, because we include our version from ZM
|
2018-04-05 11:24:17 -04:00 |
|
Isaac Connor
|
489f11bd07
|
empty contents of zone.css because it is no different from base.
|
2018-04-03 21:18:29 -04:00 |
|
Isaac Connor
|
793f630ee0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-02 10:43:07 -07:00 |
Pliable Pixels
|
d3350919de
|
Reintroduced empty check rule, closed paranthesis
|
2018-03-27 10:55:36 -04:00 |
|
Pliable Pixels
|
5b7011c61b
|
commented out incomplete definition - please complete it if you need it
|
2018-03-27 03:58:28 -04:00 |
|
Isaac Connor
|
c83e259160
|
revert to v3.1.0 of CRud
|
2018-03-22 12:01:38 -04:00 |
|
Isaac Connor
|
a4fee5c91c
|
further merges from cakephp 2.10.8
|
2018-03-21 13:09:55 -04:00 |
Isaac Connor
|
27736fb5d9
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-15 11:04:41 -04:00 |
mcdamo
|
aa0a831223
|
Update Host.php (#2062)
Remove whitespace causing problems with session authentication
|
2018-03-13 22:28:38 -04:00 |
|
Isaac Connor
|
b4c13d56d6
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-06 12:29:59 -05:00 |
tim
|
0654c7e3b2
|
Adding group handling in API
|
2018-03-04 23:01:52 -08:00 |
|
Isaac Connor
|
7ec71868a6
|
Switch CakePHP-Enum-Behavior to my fixed version
|
2018-01-29 21:25:40 -05:00 |
|
Isaac Connor
|
456f29fcba
|
Rename column Id OF Monitor_Statuses to simplify JOINS.
|
2018-01-26 13:39:37 -05:00 |
|
Isaac Connor
|
348fdafa4e
|
Update submofule
|
2018-01-26 11:34:45 -05:00 |
|
Isaac Connor
|
475c465b0d
|
define
|
2018-01-26 10:39:12 -05:00 |
|
Isaac Connor
|
a0892b1ffc
|
Whitespace
|
2018-01-26 10:30:59 -05:00 |
|
Isaac Connor
|
1503c586d2
|
When there is an error saving, add the invalidFields() info to the error message. Only restart the daemon on success.
|
2018-01-26 10:30:29 -05:00 |
|
Isaac Connor
|
933259f9a5
|
fix bracket
|
2018-01-23 13:16:21 -08:00 |
|
Isaac Connor
|
bd2da456f4
|
handle non-multi-server case when restarting monitors via API
|
2018-01-19 21:09:33 -05:00 |
|
Isaac Connor
|
d586faf7fb
|
Fix restarting Monitor
|
2018-01-19 08:16:28 -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
|
1cd69c69b9
|
add defining ZM_SERVER_ID after loading config
|
2018-01-01 13:10:39 -05: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
|
85b7baa131
|
Fix event Groups associations
|
2017-12-19 18:09:41 -05:00 |
|
Isaac Connor
|
d312482a2b
|
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
|
2017-12-18 12:52:26 -05:00 |
|
Isaac Connor
|
dd69bc3d7b
|
Merge branch 'master' into storageareas
|
2017-12-11 11:39:42 -05:00 |
|
Isaac Connor
|
ef1af9cc15
|
disable FilterComponent as it doesn't actually do anything. Add Groups join when needed
|
2017-12-09 14:03:42 -05:00 |
Pliable Pixels
|
08b5c26a15
|
2019 maxscoreframeid (#2020)
* added MaxScoreFrameId to address #2019
* consistent quotes
|
2017-12-07 14:11:06 -05:00 |
|
Isaac Connor
|
f7a2db4e49
|
remove MaxScore from the sorting because it really doesn't make sense to sort by time then maxscore... time is going to be pretty much unique
|
2017-12-04 21:50:29 -05:00 |
|
Isaac Connor
|
97c9ae02c2
|
cleanup
|
2017-12-04 17:02:38 -05:00 |
|
Isaac Connor
|
6270408c8f
|
rework group MonitorIds and add GroupId filters to api
|
2017-12-04 15:52:16 -05:00 |
|
Isaac Connor
|
03c9f88d55
|
fix build on trusty
|
2017-11-27 08:24:14 -05:00 |
|
Isaac Connor
|
489d3ba6ed
|
Merge ../ZoneMinder.master into storageareas
|
2017-11-21 12:23:17 -05:00 |
APHW2 MFGENG
|
f093cfbcef
|
add Filtering to monitors index
|
2017-11-13 10:27:24 -08:00 |