Andrew Bauer
|
2e8022419b
|
Delete zmstreamer.cpp again
we previously deleted this file with commit 4837585601 but it came back like a zombie that would not die. Deleting zmstreamer.cpp again.
|
2017-05-05 08:17:22 -05:00 |
Isaac Connor
|
351fe1eb93
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-03 16:40:57 -04:00 |
|
Andrew Bauer
|
895f5cc7c4
|
Update CMakeLists.txt
install the other bootstrap.php file under lib/cake
|
2017-05-03 13:25:11 -05:00 |
|
Isaac Connor
|
f9d106c618
|
Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php
|
2017-05-03 14:06:41 -04:00 |
|
Andrew Bauer
|
752959f3fc
|
Update CMakeLists.txt
typo - remove extra "/"
|
2017-05-03 12:35:54 -05:00 |
|
Isaac Connor
|
465c38692f
|
remove extra /
|
2017-05-03 12:59:15 -04:00 |
|
Isaac Connor
|
6b4c808c29
|
fix typo
|
2017-05-03 09:19:36 -04:00 |
|
Isaac Connor
|
219402c3d9
|
require php5-acpu
|
2017-05-03 09:04:55 -04:00 |
|
Isaac Connor
|
7def7e7868
|
add php-acpu as a dependency
|
2017-05-03 08:58:27 -04:00 |
|
Andrew Bauer
|
ebe7c21984
|
Update rsync_xfer.sh
|
2017-05-02 13:44:34 -05:00 |
Andy Bauer
|
fd8aa62927
|
bump 1.30.3 release
|
2017-05-02 13:25:56 -05:00 |
Isaac Connor
|
58d47de699
|
Merge pull request #1869 from jedelbo/1868-spell-remSocketFile-correctly
Fix spelling of remSocketFile
|
2017-04-29 07:46:12 -04:00 |
Joergen Edelbo
|
fb5668c9ef
|
Fix spelling of remSocketFile
|
2017-04-29 09:02:35 +02:00 |
|
Isaac Connor
|
f866e92bd2
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-04-26 15:55:35 -04:00 |
|
Isaac Connor
|
17052d1d91
|
get rid of rules.rej and rules.orig from some old merge problem
|
2017-04-26 15:53:54 -04:00 |
|
Isaac Connor
|
dae4689b9c
|
remove .rej and .orig
|
2017-04-26 15:51:54 -04:00 |
|
Isaac Connor
|
da8a8f390e
|
remove .rej and .orig
|
2017-04-26 15:51:49 -04:00 |
|
Isaac Connor
|
f42004b4a1
|
don't overwrite zm.conf
|
2017-04-26 15:18:32 -04:00 |
|
Isaac Connor
|
d5ae0b8c3c
|
Merge pull request #1862 from knnniggett/ZM_SKIN_NAME
fix skin path in export_functions
|
2017-04-26 13:53:30 -04:00 |
Andrew Bauer
|
1a565a47f2
|
fix skin path in export_functions
|
2017-04-26 12:17:01 -05:00 |
|
Andrew Bauer
|
3870ca1ec0
|
Update redhat.rst
typo
|
2017-04-26 09:48:15 -05:00 |
|
Isaac Connor
|
ff71777ee6
|
Merge pull request #1861 from josh4trunks/ctype
Use ctype_digit
|
2017-04-25 09:58:01 -04:00 |
Joshua Ruehlig
|
05a141bf78
|
Update database.php
|
2017-04-24 23:40:52 -07:00 |
|
Joshua Ruehlig
|
ca1e8a13fe
|
Update database.php.default
|
2017-04-24 23:40:21 -07:00 |
|
Isaac Connor
|
b2fc959a50
|
Merge branch 'master' into update_do_debian_release
|
2017-04-24 17:01:56 -04:00 |
|
Isaac Connor
|
3dff8a5da5
|
update doc references to do_debian_package.sh
|
2017-04-24 17:01:24 -04:00 |
|
Isaac Connor
|
998aa2199b
|
fix message for consistency
|
2017-04-24 16:55:08 -04:00 |
|
Isaac Connor
|
4d851dc00f
|
Add Distribution guessing
|
2017-04-24 16:54:01 -04:00 |
|
Isaac Connor
|
c5d2652d1b
|
add code to specifically handle a release, and package versions
|
2017-04-24 16:50:33 -04:00 |
|
Isaac Connor
|
0c236e9033
|
Merge pull request #1860 from josh4trunks/josh4trunks-patch-1
Update documentation
|
2017-04-24 12:35:35 -04:00 |
|
Andrew Bauer
|
ba3e9a9151
|
Update rsync_xfer.sh
typo
|
2017-04-21 18:57:42 -05:00 |
|
Andrew Bauer
|
c60c3bf67c
|
Update rsync_xfer.sh
rsync to different folders depending on distro type
|
2017-04-21 18:57:10 -05:00 |
|
Joshua Ruehlig
|
7e3c0e42b7
|
Update zm.conf.in
Add possible formats for ZM_DB_HOST
|
2017-04-21 10:56:48 -07:00 |
|
Joshua Ruehlig
|
6779bd74b0
|
Update multiserver.rst
No longer needed since https://github.com/ZoneMinder/ZoneMinder/pull/1470
|
2017-04-21 10:44:37 -07:00 |
|
Joshua Ruehlig
|
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 |
|
Andrew Bauer
|
6e28955b9a
|
Update rsync_xfer.sh
packpack deploy - change rsync parameters
|
2017-04-20 18:40:31 -05:00 |
|
Andrew Bauer
|
fac47694ed
|
Update rsync_xfer.sh
travis deploy - modify rsync parameters
|
2017-04-20 12:10:48 -05:00 |
|
Andrew Bauer
|
e90e6b13e9
|
Update rsync_xfer.sh
spelling
|
2017-04-19 07:22:03 -05:00 |
|
Andrew Bauer
|
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 |
|
Andrew Bauer
|
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 |
|
Andrew Bauer
|
f3e22689ac
|
Merge pull request #1858 from connortechnology/fix_1849
fixes escaping
|
2017-04-18 19:54:28 -05:00 |
|
Isaac Connor
|
f2920c37e0
|
escapeshellarg adds quotes, which is bad. Use escapeshellcmd on the whole string instead.
|
2017-04-18 12:31:20 -04:00 |
Kyle Johnson
|
c4164cda07
|
packpack, return of the packed.
|
2017-04-17 19:54:40 -06:00 |
|
Kyle Johnson
|
acf12fb0f2
|
packpack, return of the packpack.
|
2017-04-17 19:47:34 -06:00 |
|
Kyle Johnson
|
4ad7baf8f9
|
packpack - fix encrypted key
|
2017-04-17 13:05:16 -06:00 |
|
Kyle Johnson
|
5904e9b703
|
packacpk - update encrypted rsa file
|
2017-04-17 12:55:04 -06:00 |
|
Andrew Bauer
|
008624451f
|
Merge pull request #1856 from connortechnology/remove_BOM
use dos2unix to remove BOM
|
2017-04-17 08:32:17 -05:00 |
|
Andrew Bauer
|
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 |
|
Andrew Bauer
|
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 |
|
Isaac Connor
|
5e0012569f
|
use dos2unix to remove BOM
|
2017-04-16 09:22:37 -04:00 |