95eb1d3045
merged master storage areas, resolved conflicts
2018-03-29 08:51:35 -04:00
990d60926e
#92 new key
2018-03-29 08:47:55 -04:00
31963dcd16
say how big the file was
2018-03-28 13:41:16 -07:00
9d5dcd7b0c
return to indicate success of load
2018-03-28 08:56:03 -07:00
3e7bc46bf9
Add Amazon S3 file deletion. Add bandwidth use in file move.
2018-03-28 08:21:57 -07:00
124d2b20eb
remove version control marker
2018-03-21 10:51:47 -04:00
f682e1da9e
Merge branch 'zmtelemetry_improvements' into storageareas
2018-03-21 10:40:32 -04:00
c34ab7c172
fix merge and sleep for interval instead of 1 hour
2018-03-21 09:28:39 -04:00
0d3957611a
Merge branch 'zmtelemetry_improvements' of github.com:ConnorTechnology/ZoneMinder into zmtelemetry_improvements
2018-03-21 09:26:54 -04:00
b50fd690dc
exit if not enabled, hence reducing code nesting. Must update lastCheck
2018-03-21 09:22:29 -04:00
ba7b2447a2
Merge branch 'master' into zmtelemetry_improvements
2018-03-21 09:07:43 -04:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
79b10b0166
Use Event.Width and Event.Height instead of Monitor.Width and Monitor.Height when generating video of an event.
2018-03-14 10:09:31 -04:00
704ccaee73
2059 alarm cause ( #2060 )
...
* added alarm_cause as a test
* initial attempt to integrate with notes
* testing sizeof
* add zone labels
* fixed typo
* fixed typo
* comments and formatting
* Downgraded invalid attribute to error
* Removed Error downgrade. Instead do a undefined check on field params
* Added help text
2018-03-12 19:38:12 -04:00
fa01dbf6af
use parent's new and AUTOLOAD methods
2018-03-09 09:19:26 -05:00
b41363fd60
Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3
2018-03-06 11:37:49 -06:00
50a63c7899
Create DCS3415.pm
...
D-Link DCS-3415 IP Control Protocol
2018-03-06 11:31:39 +03:30
3aa31fd524
Merge branch 'master' into storageareas
2018-02-23 10:23:35 -05:00
3eaf95c607
handle Storage reload request
2018-02-21 14:09:51 -05:00
449ac87af1
force reload on Storage in Event object when moving
2018-02-21 14:09:12 -05:00
af560b8291
SIG{TERM} can be empty
2018-02-19 15:14:36 -05:00
ddeb2e61ef
add error logging
2018-02-18 11:29:15 -05:00
e634e0addc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-02-17 12:25:42 -05:00
6883350e47
spacing/quotes/google code style. Always close and reopen logfile, as the filename may have changed
2018-02-15 10:00:13 -05:00
af003227c3
Don't do day/hour/week/month totals from main events table anymore
2018-02-13 11:41:35 -05:00
6cfce1d5f2
Improve logging
2018-02-13 11:27:20 -05:00
0f2cf65039
adjust kill timeouts. Give each process up to 10 seconds to exit
2018-02-13 06:21:39 -05:00
62b0a1ecdc
Add some debugging to tell what we are doing
2018-02-12 13:25:11 -05:00
c0eb0011f0
Make some errors just errors instead of fatal. Add a check for plural days in log cleaning
2018-02-11 14:18:10 -05:00
956f9ee193
if there is a custom term handler in place, call it when Fatal
2018-02-11 14:17:44 -05:00
208d563e11
fix Event => __git_main[0]
2018-02-09 02:09:00 +01:00
069d53a9a0
Add the object debug when path to event does not exist in DiskSpace
2018-02-07 08:02:37 -05:00
630dde26d1
Add files via upload
2018-02-05 18:52:05 -05:00
8e547134d5
Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl
2018-02-03 14:50:19 -05:00
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
f702b37445
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-02-02 12:09:03 -05:00
8e8b6bdc36
Select Events by StorageArea
2018-02-02 12:08:54 -05:00
0287868f5e
include the status when error runCommand
2018-02-02 11:06:47 -05:00
87ef17dddc
errors running a command should NOT exit!
2018-02-02 11:05:56 -05:00
2861779249
move zmonvif-probe.pl from the onvif library code and update it to use ZoneMinder::ONVIF
2018-01-31 16:57:17 -05:00
c96f47886c
Fix discover not picking up a 1.2 response if we already have a 1.1
2018-01-31 16:56:46 -05:00
4933b37b69
fix log levels
2018-01-30 10:45:32 -05:00
aea1816e8e
Add in signal handlers to as to complete an action before exiting.
2018-01-30 09:19:08 -05:00
9f5c8078fc
handle when reading the link returns nothing
2018-01-29 21:16:41 -05:00
3c635d2f6a
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-26 13:07:59 -08:00
7fc29fe681
List starttime of orphaned event
2018-01-26 16:07:26 -05:00
e824f0abfe
use a big Y to indicate that hitting enter will result in Y. Also list q as an option to quit
2018-01-26 16:05:43 -05:00
30404203ea
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-26 12:54:56 -08:00
a12030fda7
Handle no storageareas found
2018-01-26 12:54:54 -08:00
2f39e44f91
Finish implementing single monitor mod
2018-01-26 15:53:47 -05:00
209093a4c6
Improve debug output
2018-01-26 10:32:37 -05:00
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
c930a7cce6
fix crash
2018-01-24 15:29:49 -05:00
e4c900a868
Use a LEFT JOIN on Storage WHEN Running Filters
2018-01-24 12:34:06 -05:00
1800c6fcf0
Add locking around Event deletion
2018-01-24 12:16:34 -05:00
cf4ac74d02
If failed to delete from Frames or Stats, return instead of deleting the event.
2018-01-24 10:45:42 -05:00
83371d0f21
Fix Error => Debug
2018-01-23 17:42:57 +01:00
ce19c65cc9
Ipcc ( #2040 )
...
* fix(ipcc): Invert up/down to work properly
* fix(ipcc): Change the initial values for ipcc camera
2018-01-22 15:33:11 -05:00
e60a86a061
improve debug output
2018-01-22 15:26:18 -05:00
37ff7c3779
Add finding by Id to Event
2018-01-22 15:26:01 -05:00
2068a5c684
Add object caching
2018-01-22 15:25:51 -05:00
d63594b5fa
don't do updates in a transaction so we don't hold locks
2018-01-22 14:06:52 -05:00
94fc8013c6
use a smarter glob to pick up events that were Deep, when the storage area is now Medium.
2018-01-22 11:10:31 -05:00
b317748796
Add Server loading
2018-01-22 11:09:49 -05:00
493a2386c4
Only load Time from StartTime if it has a value. Parse Path to get LInkPath if no Time.
2018-01-22 11:09:35 -05:00
63351b5494
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-21 23:18:45 +01:00
a67c34fcad
Allow specifiying storagearea to audit
2018-01-21 17:14:32 -05:00
c5332a255b
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-21 21:11:28 +01:00
fedd67a7f6
add to_string
2018-01-21 21:11:05 +01:00
6d46a02a9a
DbReconnect if the db connection goes down
2018-01-19 18:25:24 -05:00
43d72decac
Turn off extra debugging
2018-01-19 18:24:59 -05:00
2682686063
Must disconnect and reconnect before calling update script
2018-01-19 16:32:26 -05:00
dfce773341
We should return the value of DiskSpace
2018-01-19 13:32:28 -05:00
62704601ca
We should return the value of DIskSpace
2018-01-19 19:22:43 +01:00
e8603b6065
Use coalesce to handle NULLs
2018-01-19 13:08:13 -05:00
8935b77a12
Add a CTRL-C INT handler as well. Log more info about deleting events
2018-01-19 12:14:36 -05:00
17a29f7e83
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-19 11:40:14 -05:00
4d9f90488f
Add a TERM and HUP handler, clean up pid file on term. Add --force command line option to tell zmaudit.pl to continue even if a pid file exists.
2018-01-19 11:40:07 -05:00
9fb1074875
add auto-scheme detection from path. Fix de-tainting in delete_files
2018-01-19 11:39:31 -05:00
3749eb3e6f
Only send kill once. No point in repeating it
2018-01-19 08:19:10 -08:00
5472a1a012
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-18 11:40:37 -05:00
715adb5acb
add locking to Event moving and diskspace updating.
2018-01-18 11:38:08 -05:00
655d7be3c9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-17 12:59:59 -08:00
eb92a1ed8b
merge updates that fix Event moving
2018-01-17 12:59:34 -08:00
b71581922f
Only update db record if there is a change in diskspace
2018-01-17 12:56:37 -08:00
306e9a75ee
Fix issues with a period in the column name
2018-01-16 21:45:01 -05:00
426976ddb7
cleanup return code
2018-01-16 14:04:44 -05:00
aaa6c5cccb
Only delete files if no error
2018-01-16 14:01:26 -05:00
dfb7079f83
FIX update interval.
2018-01-16 09:32:18 -05:00
abec2ce4cd
Add code to optionally run zmstats.pl and zmaudit.pl
2018-01-16 09:31:58 -05:00
f808d187c1
Fix logic update Server stats update line
2018-01-15 19:23:59 -05:00
1d6c9d6edd
Empty Storage Name should not be Fatal
2018-01-13 10:14:11 -05:00
12d310a9cb
Cleanup
2018-01-11 22:53:34 +01:00
e7274a8f91
cleanup. Restart zma when restarting zmc because it may hold the mmap open
2018-01-11 22:53:26 +01:00
b86d32c005
When we need to restart zmc, we may need to restart zma due to not enough space in /dev/shm.
2018-01-11 15:00:05 -05:00
89ddb8cf5d
Fix re for identifying event when using Medium storage scheme
2018-01-10 15:36:36 -05:00
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
a410706455
add a new daemon to do stat updates
2018-01-10 13:35:10 -05:00
f14859d7d0
Add ZM_STATS_UPDATE_INTERVAL
2018-01-10 13:20:24 -05:00
8186a17a86
reduce frequency of Server updating
2018-01-10 13:20:09 -05:00
4442c571fb
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-10 13:15:20 -05:00
4f6ab05e9e
Remove stats updating from zmwatch.pl.in, where it shouldn't be
2018-01-10 12:58:04 -05:00
cdbe1b9216
Only load SYs::MemInfo and Sys::CpuLoad if we are going to use them. Only start various services if they are turned on
2018-01-10 12:57:37 -05:00
146d56a6a0
fix missing }
2018-01-10 12:56:36 -05:00
e7d56d6bbf
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-09 13:36:04 -08:00
1db4d7df83
start work on Events_(Hour|Day|Month|etc) tables for the event count data
2018-01-09 16:35:28 -05:00
b420fde706
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-09 07:29:56 -08:00
e28b6c8b7c
When server is NULL, don't escape the NULL
2018-01-09 07:29:32 -08:00
b2fbd976cb
double the amount of time we wait for a process to end
2018-01-08 16:21:51 -05:00
e877fa1d61
make zmupdate_1.31.19 re-runable.
2018-01-08 14:49:57 -05:00
baa360cd3d
update event stat counts for all monitors at once
2018-01-07 14:20:17 -05:00
796ba0d899
revert to using the mysql client to do updates. We need it for delemiter changes when adding triggers
2018-01-04 17:16:43 -05:00
224e261ade
Don't run audit on default storage area. Add a test for an event having no endtime
2018-01-04 17:16:15 -05:00
68166719ca
Update the SQL that updates the monitor counts to be more efficient.
2018-01-04 17:15:46 -05:00
db0e35bf55
Move eventcounts update from zmwatch.pl to triggers and zmaudit.pl
2018-01-04 15:04:13 -05:00
2cc185fd45
Move Updating Storage stats to a trigger. Remove the code from zmwatch that did it before
2018-01-04 13:06:28 -05:00
4e24e3647e
Also join the Storage table, and use it for ServerId instead of Monitors table.
2018-01-03 07:20:20 -08:00
485741b6f7
treat File exists as a non-error
2018-01-02 12:44:47 -08:00
867f2a9166
simplify deleting event files. The old way was too intensive.
2018-01-02 09:15:50 -08:00
16f01d5ecb
Fix when specifying by filter_id or filter_name. Probably a botched merge.
2018-01-02 07:10:38 -08:00
7fcbd86ba0
fix auditing Medium directory structures
2017-12-29 15:29:57 -05:00
148e21d707
fugro
2017-12-21 21:46:21 -05:00
f036e95793
fix Moving when Medium Scheme
2017-12-21 16:53:22 -08:00
2922a86d23
fixes to new Storage Schemes code
2017-12-19 11:01:03 -05:00
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
eebc7ce856
code doc
2017-12-12 11:16:17 -05:00
f64d65e6d7
Make db errors not fatal when deleting an event
2017-12-12 10:55:09 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
e7a43b2618
fix, don't set the storage path to NULL
2017-12-06 10:11:59 -08:00
073b055b4c
fix Event Moving
2017-12-05 10:21:43 -08:00
b1a887dbd8
fixes to move Event
2017-12-05 10:02:21 -08:00
82bed8f3fa
actually delete the old files when we move an event
2017-12-05 08:43:13 -08:00
203fe79391
cleanup debug
2017-12-04 11:14:55 -05:00
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
c2ff010d27
Support NULL in date/time values
2017-11-27 10:04:08 -08:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
485567349d
Don't calc DiskSpace if it is already defined
2017-11-23 07:29:05 -08:00
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
bf6312a8ec
put back zma
2017-11-21 23:56:05 -05:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
95c19fa674
Make zmaudit check for a pid file and not running if it exists
2017-11-20 11:55:42 -05:00
ded6b1864a
2006 support floureon 1080p 18x 30x ( #2007 )
...
* perl control script for Fluoreon 1080p
* DB update for Floureon cameras support
2017-11-18 19:02:23 -05:00
09a715a99f
prevent a warning
2017-11-18 09:41:37 -05:00
2ffa79172a
Only load Name,Value when loading config because that's all we use
2017-11-06 08:36:53 -08:00
31b756bd53
add missing tests for StartDateTime etc
2017-11-03 07:18:30 -04:00
cb01b96dc0
fixes
2017-11-01 12:01:11 -07:00
ae8bfadcf7
use static logging method
2017-10-27 21:13:14 -07:00
b3d65729da
apache style logging function take a logging object
2017-10-27 21:13:01 -07:00
2003798e64
copy in start and end transaction
2017-10-27 21:06:11 -07:00
2d6998ad25
fix debug_all
2017-10-27 20:54:54 -07:00
2d8a4794de
add save, set, transform, and some globals pointing to dbh and log
2017-10-27 20:54:29 -07:00
8b4468caed
add apache log style aliases
2017-10-27 20:54:19 -07:00
663cc6df87
improve logging of zmfilter
2017-10-27 09:09:12 -07:00
82fbec697f
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
2017-10-27 08:37:53 -07:00
e27b95c820
make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace
2017-10-27 08:05:35 -07:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
3c0be45eb8
have zmdc.pl update the Servers table with system status information
2017-10-24 15:13:48 -07:00
6c03ae32c2
add code to update the statuses in the Server record every second. This code also reduces the timeout from .1 seconds to 1 second. Should reduce load by zmdc on low power devices. I see no reason to poll that heavily...
2017-10-24 12:31:23 -07:00
7f565e318f
use the untaint version otherwise we die with error 9
2017-10-13 08:59:32 -04:00
5c7203f2bb
Fix File=> File::Find
2017-10-12 11:42:49 -07:00
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
707444c39e
Add files via upload
2017-10-09 09:44:45 -05:00
09242d72b3
implement alternate ports for streaming
2017-10-05 16:05:41 -04:00
ad1808d43b
warn when path doesn't exist in event::age
2017-10-03 13:25:05 -04:00
9ad29f4baf
fix and move pod to bottom
2017-09-11 22:19:49 -04:00
5516a62a0e
google code style, switch quotes
2017-09-11 22:12:10 -04:00
104bf07c5a
fix pod docs
2017-09-11 21:52:22 -04:00
11b29bf1ec
Fixup ONVIF module, making it actually usable
2017-08-25 11:16:37 -04:00
0c24556611
fix missing !
2017-08-24 10:59:56 -04:00
d11a2947bb
use Id instead of id
2017-08-24 10:44:14 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
40cc13a903
fix whitespace
2017-08-22 09:34:02 -04:00
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -04:00
6e24eb6462
use find_one ins tead of New when loading event to determine if event still exists in db
2017-08-18 09:28:14 -04:00
85202a0bfd
add test for when an event is deleted during audit
2017-08-15 13:06:59 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
ecb7df0e8b
Support SSL for mysql connections ( #1965 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
1f8871639a
only complain about losing the dbh connection, if we can't reconnect
2017-07-27 09:56:07 -04:00
342aacd94f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-26 10:19:44 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
ee7d714d59
refuse and log attempt to delete an event without full info
2017-07-21 10:54:09 -04:00
1264f0601f
update to storageareas version, which changes the sql to use subqueries instead of JOINs
2017-07-14 15:55:08 -04:00
89bcfc4e28
fix incorrect gpl license text mailing address
2017-07-14 10:39:50 -05:00
b3984ea2da
Merge branch 'master' into storageareas
2017-07-14 10:38:20 -04:00
801d978898
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-14 10:30:25 -04:00
a07f8961d1
add another zmDbConnect at the bottom of the while(1) loop which will ping and reconnect to db if neccessary.
2017-07-14 10:30:12 -04:00
d5a4aaca5d
fix braces, spacing, move pod docs to bottom
2017-07-14 10:28:31 -04:00
3789dcb5de
Introducing Maginon Supra IPC camera Controls and script ( #1947 )
...
* Added Maginon Supra IPC to Controls
* Adding support for Maginon Supra IPC camera
2017-07-13 11:10:20 -04:00
a9e72288f6
add -safe 0 to ffmpeg command line option so that it will generate the concat file
2017-07-11 16:11:52 -04:00
771d385257
Merge branch 'logger_fix' into storageareas
2017-07-05 15:28:44 -04:00
2cab6baf2c
add some comments and one change that may fix effectiveLevel use
2017-07-05 15:25:01 -04:00
f183a74b0a
increase the wait time for waiting for zmdc to startup
2017-07-04 10:11:57 -04:00
d7950bd732
Merge branch 'master' into knnniggett-configfiles
2017-07-03 21:53:47 -04:00
7a85e22bfc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-06-28 16:22:16 -04:00
1ef25ae1f3
switch to single quotes where possible
2017-06-28 11:03:35 -04:00
52d5099677
fix quotes
2017-06-28 11:01:57 -04:00
e7de8e6d7b
use variable instead of recalculating
2017-06-28 10:59:50 -04:00
e831740dc5
Merge branch 'master' into zmtelemetry_improvements
2017-06-28 10:58:46 -04:00
9ba9495ae0
whitespace, braces, move pod doc to bottom. No functional changes
2017-06-28 10:53:35 -04:00
abdb567e4e
Merge branch 'master' into zmtelemetry_improvements
2017-06-28 10:45:13 -04:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
92c25dc58c
Merge branch 'master' into storageareas
2017-06-23 10:43:46 -04:00
5d63bc47cc
I believe level should be effectiveLevel here
2017-06-23 10:22:37 -04:00
12c3bde8b0
remove debug
2017-06-23 10:04:50 -04:00
25b66e9629
whitespace mostly.
2017-06-23 09:58:54 -04:00
3a00656c3f
WHen can't open file log, turn on terminal logging so that the message goes somewhere useful.
2017-06-23 09:58:19 -04:00
2460e1acd9
fix whitspace
2017-06-23 09:58:01 -04:00
950c8f19d3
Upstream FreeBSD patches ( #1926 )
...
* apply FreeBSD patches
* timeval struct needs time.h
* typo
* added forgotten destination for systemd startup script install
2017-06-22 10:14:24 -04:00
be8be3b0fd
Put back Lost Storageareas code
2017-06-19 13:40:32 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
df304b417a
Update zmupdate.pl.in
2017-06-13 11:08:58 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
c75215ad29
fix merge problems
2017-06-09 09:13:30 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
c55814647c
fix spacing, braces, quotes
2017-06-07 15:28:31 -04:00
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -04:00
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
90c3c40f55
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-04 17:33:30 -04:00
07704dd5d6
coments
2017-06-04 17:30:39 -04:00
7d6f85f9ea
Merge ../ZoneMinder.connortechnology
2017-06-02 20:18:16 -04:00
d910bcf121
fix quoting on config
2017-06-02 20:18:05 -04:00
7b8222f73b
fix type for WEB_EVENT_DISK_SPACE to boolean.
2017-06-02 20:17:08 -04:00
9c9eaa6851
move test for MIN_AGE up. Don't need to constantly check for it because it won't change.
2017-06-02 12:35:01 -04:00
8b91403c25
remove references to Storage object
2017-06-02 12:32:02 -04:00
b6b4738b9f
fix quotes
2017-06-02 12:31:54 -04:00
71b9ca97c6
no need to store filters as an array ref
2017-06-02 12:25:26 -04:00
5228b9d008
move command line option parsing up, so if we are just getting the version we exit quick before doing a bunch of other things.
2017-06-02 11:54:40 -04:00
be5b93a64e
whitespace, braces, quotes
2017-06-02 11:39:35 -04:00
98b49fb64d
quotes, spacing
2017-05-31 21:28:40 -04:00
53a7b2e72c
more double quotes to single quotes and fix some spacing
2017-05-31 09:57:55 -04:00
36ccc5b7b6
Merge bits from SA. Mostly double to single quotes plus some debug lines when errors happen
2017-05-31 09:33:51 -04:00
82a13fac76
new class for Monitors
2017-05-30 21:21:51 -04:00
32d1e62f73
braces, spacing, quotes
2017-05-30 21:18:13 -04:00
885823aeb6
remove unnecessary quotes and convert double quotes to single quotes
2017-05-30 21:11:51 -04:00
1d5248c0b8
merge from SA, but remove Storageareas bits
2017-05-30 20:06:29 -04:00
dcf7c7f015
put back requires
2017-05-30 19:52:19 -04:00
ab85239d82
fix braces, invert control directions when camera is flipped
2017-05-30 19:49:30 -04:00
0bb2bed32c
remove blank lines, do some better escaping
2017-05-30 19:47:35 -04:00
cca2c624f9
fix spelling mistake
2017-05-30 19:42:38 -04:00
845ef6c05a
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-30 10:22:17 -04:00
b948bc5403
fix a few extra )
2017-05-30 10:21:34 -04:00
32daa4faed
Merge branch 'master' into storageareas
2017-05-30 10:21:01 -04:00
b979712892
fix inconsistent whitespace
2017-05-30 10:01:02 -04:00
3c9d8f4ec6
Don't do the qqq thing to remove whitespace from the config descriptions. HTML doesn't care about it. That kind of parsing should be done at display time.
2017-05-30 09:44:43 -04:00
86361b59c7
convert double quotes to single quotes
2017-05-26 14:17:28 -04:00
Pliable Pixels
Isaac Connor
Isaac Connor
Isaac Connor
Pliable Pixels
Andy Bauer
habibapp1365
Isaac
flashoftheblades
Isaac Connor
Simpler1
digital-gnome
Ognyan Bankov
APHW2 MFGENG
Isaac Connor
Michael Barkdoll
Andrew Bauer
ralimi
Martin Goodwell
abishai