dd69bc3d7b
Merge branch 'master' into storageareas
2017-12-11 11:39:42 -05:00
0d9f330356
call zmcamtool during postinst ( #2021 )
2017-12-10 14:14:39 -05:00
004a41b122
remove boost dependency.
2017-12-04 22:59:50 -05:00
00e963eba4
remove the dependency on boost
2017-11-28 07:17:26 -05:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
91ccba137f
Don't create symlinks in ZoneMinder webroot ( #1923 )
...
* don't create symlinks during rpm packaging
* don't use symlinks when pacakging debs
* change default values for zm_dir_events and zm_dir_images
* remove zm_contentdir cmake var from debian packaging
* change default for zm_config_subdir
* update INSTALL documentation
2017-07-21 08:18:13 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
323cd3540d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-28 11:58:23 -04:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
043b382bdd
include conf.d folder contents in debian packaging ( #1934 )
2017-06-26 14:44:33 -04:00
2e60864e99
always stop and start zm on upgrade, not just if doing a db update
2017-06-20 09:44:18 -04:00
f78e720db3
add /etc/zm and /etc/zm/conf.d to install dirs
2017-06-20 09:41:35 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04: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
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -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
44eba78e40
put back empty files
2017-06-02 20:42:55 -04:00
b5c0a0eae2
the contents of these are not being maintained and should be generated by scripts
2017-06-02 12:40:32 -04:00
c93e13868e
change to quilt frmo native. Remove patches. We are upstream.
2017-06-01 12:41:10 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
94151b0318
put back changelog
2017-05-26 14:30:21 -04:00
099e099352
We need boost for the packetqueue
2017-05-23 14:51:25 -04:00
392ade2e1a
change default logrotate policy to rotate daily and compress
2017-05-23 14:51:09 -04:00
7756d5067c
the changelog entries are irrelevant, so don't keep them. Package scripts will generate their contents
2017-05-23 14:46:54 -04:00
f6950ab6fe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-15 12:51:22 -04:00
fc52766606
Merge branch 'master' into storageareas
2017-05-08 22:17:37 -04:00
ff368f2b6f
add php-apc and apcu
2017-05-08 21:35:49 -04:00
25baac4e24
Merge branch 'release-1.30.3'
2017-05-08 21:32:59 -04:00
a7b377bf35
delete merge conflict files
2017-05-08 21:30:31 -04:00
c510092356
delete merge conflict files
2017-05-08 21:30:28 -04:00
7b81f0464b
Due to switch to apc for caching in api, don't need the tmp dirs
2017-05-05 09:45:36 -04:00
bccddcad88
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-05-05 09:42:24 -04:00
cccc3df700
Merge branch 'master' into storageareas
2017-05-03 16:43:44 -04:00
6b4c808c29
fix typo
2017-05-03 09:19:36 -04:00
219402c3d9
require php5-acpu
2017-05-03 09:04:55 -04:00
48d9167c5d
Don't apply patches.
2017-04-27 12:05:47 -04:00
2b0561b481
delete the old merge files
2017-04-27 12:05:13 -04:00
273229858f
Merge branch 'master' into storageareas
2017-04-16 11:26:18 -04:00
3b2d708a16
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-04-16 11:24:51 -04:00
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
6e7bd9311d
add the api tmp cache folders to the tmpfiles
2017-04-12 13:41:02 -04:00
adbb5f431d
fix version of x264
2017-03-11 11:00:46 -05:00
e04cc1be05
add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604.
2017-03-11 10:41:39 -05:00
fdcb93eacc
Merge branch 'master' into storageareas
2017-03-06 16:22:28 -05:00
5ea9f695de
Merge branch 'master' into travis_test1
2017-03-05 13:02:59 -06:00
ca71ee8e71
remove rules.new
2017-03-05 12:40:27 -06:00
4fe70f0e7d
recreate patch
2017-03-05 12:39:03 -06:00
c6fc6cb0ca
change patch method
2017-03-05 11:46:45 -06:00
f66408b998
update the path to zm.conf
2017-03-05 10:50:09 -06:00
Isaac Connor
Andrew Bauer
Isaac Connor
Andy Bauer