abishai
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
Isaac Connor
be8be3b0fd
Put back Lost Storageareas code
2017-06-19 13:40:32 -04:00
Isaac Connor
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
Andrew Bauer
df304b417a
Update zmupdate.pl.in
2017-06-13 11:08:58 -05:00
Andrew Bauer
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
Isaac Connor
c75215ad29
fix merge problems
2017-06-09 09:13:30 -04:00
Isaac Connor
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
Isaac Connor
c55814647c
fix spacing, braces, quotes
2017-06-07 15:28:31 -04:00
Isaac Connor
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -04:00
Andrew Bauer
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
Isaac Connor
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
Isaac Connor
90c3c40f55
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-04 17:33:30 -04:00
Isaac Connor
07704dd5d6
coments
2017-06-04 17:30:39 -04:00
Isaac Connor
7d6f85f9ea
Merge ../ZoneMinder.connortechnology
2017-06-02 20:18:16 -04:00
Isaac Connor
d910bcf121
fix quoting on config
2017-06-02 20:18:05 -04:00
Isaac Connor
7b8222f73b
fix type for WEB_EVENT_DISK_SPACE to boolean.
2017-06-02 20:17:08 -04:00
Isaac Connor
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
Isaac Connor
8b91403c25
remove references to Storage object
2017-06-02 12:32:02 -04:00
Isaac Connor
b6b4738b9f
fix quotes
2017-06-02 12:31:54 -04:00
Isaac Connor
71b9ca97c6
no need to store filters as an array ref
2017-06-02 12:25:26 -04:00
Isaac Connor
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
Isaac Connor
be5b93a64e
whitespace, braces, quotes
2017-06-02 11:39:35 -04:00
Isaac Connor
98b49fb64d
quotes, spacing
2017-05-31 21:28:40 -04:00
Isaac Connor
53a7b2e72c
more double quotes to single quotes and fix some spacing
2017-05-31 09:57:55 -04:00
Isaac Connor
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
Isaac Connor
82a13fac76
new class for Monitors
2017-05-30 21:21:51 -04:00
Isaac Connor
32d1e62f73
braces, spacing, quotes
2017-05-30 21:18:13 -04:00
Isaac Connor
885823aeb6
remove unnecessary quotes and convert double quotes to single quotes
2017-05-30 21:11:51 -04:00
Isaac Connor
1d5248c0b8
merge from SA, but remove Storageareas bits
2017-05-30 20:06:29 -04:00
Isaac Connor
dcf7c7f015
put back requires
2017-05-30 19:52:19 -04:00
Isaac Connor
ab85239d82
fix braces, invert control directions when camera is flipped
2017-05-30 19:49:30 -04:00
Isaac Connor
0bb2bed32c
remove blank lines, do some better escaping
2017-05-30 19:47:35 -04:00
Isaac Connor
cca2c624f9
fix spelling mistake
2017-05-30 19:42:38 -04:00
Isaac Connor
845ef6c05a
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-30 10:22:17 -04:00
Isaac Connor
b948bc5403
fix a few extra )
2017-05-30 10:21:34 -04:00
Isaac Connor
32daa4faed
Merge branch 'master' into storageareas
2017-05-30 10:21:01 -04:00
Isaac Connor
b979712892
fix inconsistent whitespace
2017-05-30 10:01:02 -04:00
Isaac Connor
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
Isaac Connor
86361b59c7
convert double quotes to single quotes
2017-05-26 14:17:28 -04:00
Isaac Connor
0c25cecb93
Fix some spacing
2017-05-26 13:36:20 -04:00
Isaac Connor
368567335b
remove some quotes
2017-05-26 13:33:34 -04:00
Isaac Connor
a2bf5df2d4
remove some quotes
2017-05-26 13:27:55 -04:00
Isaac Connor
2a2d667afb
remove some quotes
2017-05-26 13:27:06 -04:00
Isaac Connor
34f4abb549
Merge branch 'master' into storageareas
2017-05-26 13:17:51 -04:00
Isaac Connor
ed12dab648
fixup docs, cleanup
2017-05-26 13:13:34 -04:00
Isaac Connor
cc83582a90
put back AutoMessage and AutoVideo logic
2017-05-26 13:04:08 -04:00
Isaac Connor
8fde33ee1b
remove StorageAreas stuff
2017-05-26 12:30:20 -04:00
Isaac Connor
5f1b084cc5
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 14:27:07 -04:00
Isaac Connor
dbf83831ff
merge from SA. Adds the ability to pass in additional options when connecting
2017-05-20 10:32:41 -04:00
Isaac Connor
d76d65f475
merge from SA, includes StorageAreas support
2017-05-20 10:32:04 -04:00
