75082064fd
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-09 16:40:17 -04:00
732bb5416f
Merge branch 'master' into onvif_updated
2020-05-09 16:26:29 -04:00
0699b21017
Remove libjson-any-perl as a dependency. Fixes #2630
2019-06-03 09:45:50 -04:00
94f2c76562
fix trailing whitespace
2019-05-27 12:31:53 -04:00
c4d76f03c9
Introduce ZM_PATH_SHUTDOWN to cmake config
2019-05-27 12:09:32 -04:00
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
17e0b4ac4b
test for error code from db creation and if there is an error, die with an error code.
2019-05-17 08:34:19 -04:00
0e72080c4a
Migrate from libdigest to crypt-eks-blowfish due to notice
2019-05-16 09:37:11 -04:00
4a2ac470ee
add back ssl_dev, got deleted
2019-05-13 14:32:48 -04:00
e9f843f297
bulk overlay hash mysql encoded passwords
2019-05-13 14:29:24 -04:00
87e407aa90
forgot to checkin update file
2019-05-13 10:31:09 -04:00
7603e94e90
added lib-ssl/dev for JWT signing
2019-05-03 16:57:43 -04:00
3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
af32d59aa1
add libhuman-bytes-perl and libfile-slurp-file
2018-09-05 10:18:09 -04:00
029c6401af
add libjson-maybexs-perl as a debian package dependency
2018-08-31 09:34:54 -05:00
18c3618e28
Arp tool ( #2155 )
...
* let cmake set path to arp
* declare cameras array
* fix probeV4L function
* typo
* fix another typo - my machine is possessed.
* update redhat, debian, ubuntu build dependencies
2018-07-11 15:43:59 -04:00
a888dac834
source files in /etc/zm/conf.d as well
2018-02-23 09:30:47 -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
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
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
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
242c8fc0ab
fix options, to remove indexes
2017-05-23 15:01:22 -04:00
51946da564
add a -f so that removing the directories actually removes the contents
2017-05-23 14:44:21 -04:00
c4d7703867
Merge a new apache.conf that supports fcgid
2017-05-23 14:42:31 -04:00
48ad0b77fc
merge updates for newer releases of packages
2017-05-23 14:39:31 -04:00
b3f2b13718
Merge branch 'apache_indexes' into storageareas
2016-11-22 13:29:30 -05:00
b059ca83da
Rremove Index from options to prevent directory listings
2016-11-22 13:25:52 -05:00
e8da04df56
Merge branch 'apache_indexes' into storageareas
2016-11-22 13:09:44 -05:00
6361f14387
Rremove Index from options to prevent directory listings
2016-11-08 09:30:24 -05:00
53d3e063e8
smal re-order
2016-09-30 09:35:52 -04:00
3dfe1185ff
add ffmpeg as option to libav-tols
2016-09-13 10:11:50 -04:00
bdcc53d309
add an echo to tell us that updating is done and we are trying to start.
2016-08-12 10:04:10 -04:00
6b70ff964b
fix path in cake api cleanup rules
2016-08-10 09:06:15 -04:00
8eee25795a
Remove deprecated register_globals from Apache/PHP configs
2016-05-30 14:02:46 +02:00
441020e8b8
fix_type
2016-09-29 10:49:40 -04:00
ce2c52c07d
allow libavdevice55 and 57
2016-09-27 16:15:24 -04:00
da5bad7ec2
Merge ../ZoneMinder.connortechnology into storageareas
2016-09-27 15:09:14 -04:00
24e33fec7f
allow libvlccore8
2016-09-27 15:08:00 -04:00
730d7a648d
add -f to rm
2016-09-27 14:15:38 -04:00
ee93424bf9
update jpeh deps to match official debian repo
2016-09-27 12:33:50 -04:00
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
b36694ad8b
Merge branch 'master' into storageareas
2016-08-12 10:04:52 -04:00
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
e62ea454ba
Merge branch 'master' into storageareas
2016-05-17 10:48:52 -04:00
09e4aca0be
add libdata-uuid-perl to debian/ubuntu dependencies
2016-05-17 09:26:36 -04:00
Isaac Connor
Pliable Pixels
Andrew Bauer
Isaac Connor
Isaac Connor
Disassembler