b2fc959a50
Merge branch 'master' into update_do_debian_release
2017-04-24 17:01:56 -04:00
3dff8a5da5
update doc references to do_debian_package.sh
2017-04-24 17:01:24 -04:00
998aa2199b
fix message for consistency
2017-04-24 16:55:08 -04:00
4d851dc00f
Add Distribution guessing
2017-04-24 16:54:01 -04:00
c5d2652d1b
add code to specifically handle a release, and package versions
2017-04-24 16:50:33 -04:00
0c236e9033
Merge pull request #1860 from josh4trunks/josh4trunks-patch-1
...
Update documentation
2017-04-24 12:35:35 -04:00
ba3e9a9151
Update rsync_xfer.sh
...
typo
2017-04-21 18:57:42 -05:00
c60c3bf67c
Update rsync_xfer.sh
...
rsync to different folders depending on distro type
2017-04-21 18:57:10 -05:00
7e3c0e42b7
Update zm.conf.in
...
Add possible formats for ZM_DB_HOST
2017-04-21 10:56:48 -07:00
6779bd74b0
Update multiserver.rst
...
No longer needed since https://github.com/ZoneMinder/ZoneMinder/pull/1470
2017-04-21 10:44:37 -07:00
0728b935c0
Update ubuntu.rst
...
I'm not a linux/ubuntu guy, but I am 90% sure this is correct =P
2017-04-21 10:43:16 -07:00
6e28955b9a
Update rsync_xfer.sh
...
packpack deploy - change rsync parameters
2017-04-20 18:40:31 -05:00
fac47694ed
Update rsync_xfer.sh
...
travis deploy - modify rsync parameters
2017-04-20 12:10:48 -05:00
e90e6b13e9
Update rsync_xfer.sh
...
spelling
2017-04-19 07:22:03 -05:00
6b43deb1e5
Update rsync_xfer.sh
...
remove set -ev, add a message when the remote filesystem mounted successfully
2017-04-19 07:11:20 -05:00
cf4861e08a
Update rsync_xfer.sh
...
Turn on rsync verbose so we can see what files get transferred
2017-04-18 20:02:39 -05:00
f3e22689ac
Merge pull request #1858 from connortechnology/fix_1849
...
fixes escaping
2017-04-18 19:54:28 -05:00
f2920c37e0
escapeshellarg adds quotes, which is bad. Use escapeshellcmd on the whole string instead.
2017-04-18 12:31:20 -04:00
c4164cda07
packpack, return of the packed.
2017-04-17 19:54:40 -06:00
acf12fb0f2
packpack, return of the packpack.
2017-04-17 19:47:34 -06:00
4ad7baf8f9
packpack - fix encrypted key
2017-04-17 13:05:16 -06:00
5904e9b703
packacpk - update encrypted rsa file
2017-04-17 12:55:04 -06:00
008624451f
Merge pull request #1856 from connortechnology/remove_BOM
...
use dos2unix to remove BOM
2017-04-17 08:32:17 -05:00
24c50ea7bd
Merge pull request #1832 from mastertheknife/cmake_pod2man_outofsource
...
Fix out-of-source building failing because pod2man
2017-04-17 07:45:42 -05:00
cea31f205a
Update zoneminder.tmpfiles.in
...
remove cake cache folders from tmpfiles.d since we changed the cake cache engine to apc
2017-04-16 20:44:41 -05:00
5e0012569f
use dos2unix to remove BOM
2017-04-16 09:22:37 -04:00
71e6735b60
Neon32 functions now work on 64 bytes at a time. This results in 4-6x performance increase over standard functions
...
Memory allocations and image size requirements changed to be as needed for 64 byte alignment.
Self-test code for Blend modified accordingly and added Self-test for the delta functions.
2017-04-16 10:57:37 +03:00
f10d3f10a0
packpack - add full path to deply_rsa.enc
2017-04-15 09:36:53 -05:00
3b1ef579d5
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2017-04-15 09:24:45 -05:00
4240f03f4e
rpm readmefile changes
2017-04-15 09:23:28 -05:00
0efca38d68
Merge pull request #1854 from knnniggett/caketmp
...
make cake tmp = zoneminder tmp
2017-04-15 10:23:03 -04:00
432a38720a
Merge pull request #1788 from knnniggett/travis_test1
...
packpack nightly builds
2017-04-15 10:21:42 -04:00
7e9b9944ae
rpmspecfile changes to reflect recent commits
2017-04-15 08:51:59 -05:00
65f96df477
Merge pull request #1791 from dwalkes/FI8908ControlAdd
...
Additional controls for FI8908W cameras
2017-04-15 07:23:29 -05:00
8c298b96d0
Merge pull request #1820 from SteveGilvarry/Remove_arg_r
...
Remove zmc -r argument as it does not seem to be implemented.
2017-04-15 07:17:56 -05:00
ab4b5e6b69
Merge pull request #1853 from knnniggett/cakecache
...
change cake cache engine from File -> Apc
2017-04-14 21:10:23 -04:00
5dd4359b80
Merge pull request #1852 from knnniggett/cakelog
...
move cake log to zoneminder log folder
2017-04-14 21:09:50 -04:00
0b729cf295
modify cmakelists.txt
2017-04-14 15:15:29 -05:00
d2490cf7e3
make cake tmp = zoneminder tmp
2017-04-14 15:11:41 -05:00
48a73f7e78
change cache engine from File -> Apc
2017-04-14 14:31:42 -05:00
3cbd32cd41
move cake log to zoneminder log folder
2017-04-14 14:24:29 -05:00
48e2c5f6ec
Update redhat.rst
2017-04-14 12:40:32 -05:00
09d8d7e40f
Merge pull request #1851 from knnniggett/timestamponcapture
...
invert timestamp_on_capture condition
2017-04-14 11:05:04 -04:00
a6799a8aaa
remove unneeded files
2017-04-14 06:40:09 -05:00
6b0f587725
invert timestamp_on_capture condition
2017-04-13 15:51:50 -05:00
e28be26978
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-04-12 13:41:16 -04:00
6e7bd9311d
add the api tmp cache folders to the tmpfiles
2017-04-12 13:41:02 -04:00
a0b0f0aa79
Merge pull request #1847 from ekwoodrich/patch-1
...
Suppress debug messages on ZM service start/restart
2017-04-07 13:26:04 -04:00
68ab2cb756
Merge pull request #1837 from DarkDeepBlue/fix-format-string-local-cam
...
zm_local_camera.cpp: Improve format strings
2017-04-06 08:54:20 -04:00
b4ac277ecb
Merge pull request #1846 from mnoorenberghe/docker_vhost
...
Use misc/apache.conf instead of utils/docker/apache-vhost in docker
2017-04-06 08:41:21 -04:00
Isaac Connor
Isaac Connor
Andrew Bauer
Joshua Ruehlig
Kyle Johnson
Kfir Itzhak
Andy Bauer
Andrew Bauer