5eec7e00c5
Merge branch 'master' into storageareas
2018-09-09 14:09:52 -04:00
882e47c9ab
Fix deleting empty directories
2018-09-09 13:28:24 -04:00
9e8a876101
Fix finding Storage by ServerId
2018-09-09 13:28:11 -04:00
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
fa690826a3
clean up zmstats, add db reconnect
2018-09-07 16:30:47 -04:00
b7aa11f109
Fix infinite loop reconnecting to db in Logging
2018-09-07 16:30:24 -04:00
def72b8e66
tidy up license
2018-09-07 16:29:59 -04:00
426aeea95b
add db reconnects to zmwatch.
2018-09-07 16:29:23 -04:00
4b69f520d5
Merge branch 'master' into storageareas
2018-09-05 12:08:23 -04:00
730e1fda37
We only use File::Slurp when moving files to s3fs so only require it if doing that
2018-09-05 10:14:45 -04:00
c34f899d31
eliminate warning when no Storage area is set.
2018-09-04 13:57:35 -04:00
8245d193e2
Merge branch 'master' into storageareas
2018-09-04 09:48:47 -04:00
13558b2c12
convert existing http urls in help text to markdown
2018-09-04 07:39:46 -05:00
ce48343d1a
embed link to privacy statment in telemetry help text
2018-09-03 13:55:11 -05:00
df3da6dd93
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-08-30 14:53:39 -04:00
8f0fb0843a
Add Privacy Statement ( #2194 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* create and load default.php
* fix typos
* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
f2d4739838
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-24 17:11:39 -04:00
627d47980a
prevent killall zombies by ignoring SIGCHLD at startup
2018-08-22 16:33:11 -04:00
1fa78c5aa8
Fix up licensing and copyright
2018-08-17 08:14:13 -04:00
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
2018-08-13 15:33:43 -04:00
56f4d768c2
Add Privacy Statement ( #2176 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* push privacy text to all language files
2018-08-13 15:23:44 -04:00
e6d1a9447e
rename TVIP862 to Trendnet and delete TVIP672WI
2018-08-13 11:12:15 -04:00
67a3ff392b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-13 11:07:13 -04:00
70ba0ad342
Merge https://github.com/michaelbarkdoll/ZoneMinder into trendnet
2018-08-13 11:05:50 -04:00
3dc424282b
Support quoting config variables ( #2175 )
...
* allow handling of quotes in config files
* copy paste error
* surround zm_arptool in quotes
2018-08-11 12:56:16 -04:00
3962c52288
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-09 11:23:37 -04:00
dbdb9680c0
exit on HUP to free up memory.
2018-08-07 11:32:17 -04:00
683789eb41
Merge branch 'master' into storageareas
2018-08-03 10:27:48 -04:00
82833a152e
exit on HUP to free up memory.
2018-08-02 06:53:18 -04:00
50c7eec0ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-02 05:25:53 -04:00
6ad732e419
retrieve greip data rather than the ip ( #2173 )
2018-07-31 14:01:01 -04:00
48b91c5544
Bugfix in Control and added new Camera ( #2171 )
...
* fixed control typos
missing word "s" for "Controls" Table for database queries
* added Dericam P2 camera Control
* fixed missing CanReset column
* Update DericamP2.pm
* added some more missing controls
CanSleep, CanWake
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
26d6b99018
Added new control script for iPhone ip camera software ( #2161 )
...
https://itunes.apple.com/ca/app/ipcamera-high-end-network-camera/id570912928?mt=8
See https://forums.zoneminder.com/viewtopic.php?f=9&t=27386 for details.
2018-07-17 08:09:15 -04:00
455204135d
fail if zm_path_ffmpeg not set
2018-07-17 06:57:38 -05:00
d3034670a0
Merge branch 'master' into storageareas
2018-07-10 11:03:33 -04:00
756369f2d8
JSON::Any --> JSON::MaybeXS ( Closes : #770 ). ( #2151 )
2018-07-10 10:27:03 -04:00
add3682128
fix spelling
2018-07-05 08:00:24 -05:00
e98a4b1562
Merge branch 'master' into storageareas
2018-06-25 14:31:00 -04:00
c285d5ebb1
spacing. Add code to delete events that huse the deep storage scheme and have lost their symlinks.
2018-06-25 13:41:19 -04:00
422d2d6dba
set telemetry default to NO
...
This is the first step for GDPR compliance. A future pr will add a prompt which explains what the telemetry pr is for and whether they want to turn it on.
2018-06-22 08:10:48 -05:00
fd72689182
Spacing, quotes. Main thing is to delete Object cache on HUP
2018-06-21 10:49:51 -04:00
3cb5ef6a94
Spacing
2018-06-21 10:00:54 -04:00
3ffd30ffbd
Allow selection of different source column filtering on the console ( #2132 )
2018-06-20 11:12:43 -04:00
a594a1b6f1
Merge branch 'master' into storageareas
2018-06-15 09:45:11 -04:00
fef88107e1
Close the db before forking in start()
2018-06-14 14:54:00 -04:00
65a5af6f92
remove extra space
2018-06-11 15:49:39 -04:00
a4ade03e6f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-06-11 14:08:19 -04:00
d1f658bf30
minor spacing changes, remove unused Server lookup
2018-06-11 14:07:49 -04:00
48f8118e5a
put back logReInit
2018-06-10 15:01:20 -04:00
578efb3a76
Need to do reaper in shutdownALl
2018-06-10 14:21:09 -04:00
Isaac Connor
Andrew Bauer
Andy Bauer
Isaac Connor
Roman Dissertori
Daedilus
Dmitry Smirnov
Andrew Bauer