32d103c216
fix submodule again
2018-07-01 08:23:00 -05:00
5d0719f18d
fixes #2137
2018-07-01 08:16:06 -05:00
e04eac57ae
Include values in /etc/zm files in viewByName
2018-06-25 15:43:01 -04:00
24ceb75936
Merge branch 'master' into include_fs_config_in_api_config
2018-06-21 21:41:54 -04:00
cd64619743
Fix controlling daemon when the monitor is Local
2018-06-06 12:56:33 -04:00
af3ce3660f
Only unlink if file exists, removing warning. Always return a Storage object in Monitor->Storage() fixes Monitor Delete.
2018-05-24 09:54:45 -04:00
be424f46f0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-18 12:07:22 -04:00
8276386a44
We always return an associative array now
2018-05-18 09:06:17 -04:00
93dd943fec
Fix some spacing
2018-05-16 20:17:57 +02:00
571b27a025
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-10 14:39:16 -04:00
c61deb422f
update to -zm versions
2018-05-10 14:38:49 -04:00
2a5f05499e
Munge the config in the global configvals into the configs array before returning it.
2018-05-10 13:44:46 -04:00
62edca6dcb
add fileSize to the api, and use it to add remote fileSize reporting in includes/Event
2018-05-08 13:33:56 -07:00
e7bd5900bc
rough in a Storage Model
2018-05-07 14:09:05 -07:00
1a012c62ff
Add fileExists to event view
2018-05-07 14:07:03 -07:00
9c44f56f37
Add Storage to belongsTo. Implement Relative_Path and fileExists functions
2018-05-07 14:06:48 -07:00
f2c099f1e4
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-05-04 16:01:25 -04:00
84c94efaa8
Move redunddant close methods into parent. Use Fatal instead of croak. Croak is not defined so it causes an infinite loop
2018-05-04 02:26:25 +02:00
e953a04f61
naming consistency of attribute ( #2096 )
2018-05-03 14:03:49 -04:00
a3158fcc97
auth_key api for different situations ( #2090 )
...
* auth_key api for different situations
* added new flag to indicate if password needs to be appended
* pure json view
2018-05-02 12:26:28 -04:00
c3b6cd4bab
include auth.php if auth is on, and return '' for auth_hash is auth is disabled
2018-04-30 11:24:53 -04:00
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
7e88d28857
bump version to .44
2018-04-26 21:58:19 -04:00
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
578df0c5cc
update submodules
2018-04-20 16:18:58 -04:00
c65255a067
Merge ../ZoneMinder.connortechnology
2018-04-20 15:56:42 -04:00
a868bb70ed
Better debug when fail to attach images
2018-04-20 15:56:14 -04:00
fac3cde1e7
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-20 15:23:23 -04:00
ed140426ab
rpm packaging changes and documentation
2018-04-19 15:36:43 -05:00
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
fb44619a66
output the initial table head
2018-04-19 14:33:05 -04:00
2aa689a14a
Use a class instead of an id for consoleTable
2018-04-19 14:20:02 -04:00
a5cbc8abd1
buildsystem - update git submodules
2018-04-18 19:21:14 -05:00
f6540aeba1
point git submodules to our own forks
2018-04-18 14:00:00 -05:00
0b0fbae1c5
Add output of paused image when paused
2018-04-12 18:43:57 -04:00
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
989ed65f52
spacing and braces, remove a dead unused function
2018-04-11 10:50:28 -04:00
ae3ccf6ffe
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-06 12:32:07 -07:00
fdd8be5daf
brackets and spaces
2018-04-06 14:52:56 -04:00
7f850890cb
whitespace
2018-04-06 14:42:20 -04:00
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
a789fc88aa
implement getAuthHash
2018-04-06 14:41:39 -04:00
2c02a479d6
remove duplicated config code from bootstrap and just include config.php
2018-04-06 14:38:32 -04:00
7a12589a83
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-05 13:41:47 -07:00
f1a8d5f1ff
start of work on .41. Adding foreign keysy
2018-04-05 13:41:24 -07:00
632ab143fe
error when can't set session in cake
2018-04-05 14:21:56 -04:00
87f5204c46
rename process_configfile to remove namesspace colision
2018-04-05 11:44:21 -04:00
fb392b2765
put back process_configfile
2018-04-05 11:33:24 -04:00
8fee795fb4
don't duplicate declaration of process_configfile, because we include our version from ZM
2018-04-05 11:24:17 -04:00
489f11bd07
empty contents of zone.css because it is no different from base.
2018-04-03 21:18:29 -04:00
Andrew Bauer
Isaac Connor
Isaac Connor
Isaac
Isaac Connor
Isaac
Pliable Pixels
Andrew Bauer
Andy Bauer
Isaac Connor
Isaac Connor