Isaac Connor
acd6b5f4a9
limit the # of log lines deleted to 100 to limit the time spent there.
2018-04-30 14:33:41 -04:00
Isaac Connor
3bb1a5b544
Whitespace
2018-04-30 13:02:53 -04:00
Isaac Connor
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
Isaac Connor
6c5e6e6184
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-30 07:10:38 -07:00
Isaac Connor
3f05d46012
Merge zmdc.pl fixes. We can now handle database disconnects gracefully.
2018-04-30 07:09:23 -07:00
Isaac Connor
e891c88a3e
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-28 12:38:57 -04:00
Isaac Connor
abd52ebfb1
Add DiskSpace column to storage listing
2018-04-28 12:38:10 -04:00
Isaac Connor
ecf8003aef
remove extra spaces
2018-04-28 12:32:21 -04:00
Isaac Connor
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
Isaac Connor
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -04:00
Isaac Connor
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
Isaac Connor
7e88d28857
bump version to .44
2018-04-26 21:58:19 -04:00
Andrew Bauer
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
Isaac Connor
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
Isaac Connor
dd6683f0be
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-25 10:31:47 -07:00
Isaac Connor
636d0caf30
handle no swap
2018-04-25 10:28:19 -07:00
Isaac Connor
117555a857
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-04-25 09:39:10 -04:00
Isaac Connor
161fc94496
remove useless ()
2018-04-25 09:33:12 -04:00
Isaac Connor
80f73854c7
Include the groupIds hidden when not on general tab
2018-04-25 09:33:02 -04:00
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
28921a653b
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-24 11:22:48 -07: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
ad376fc267
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-24 09:40:39 -07: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
de149c1328
spacing
2018-04-24 08:48:35 -07:00
Isaac Connor
9fd2c12765
DB Logging is a Debug level
2018-04-24 08:42:52 -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