Isaac Connor
|
3ac9eac31e
|
Merge branch 'master' into storageareas
|
2017-04-19 14:16:20 -04:00 |
|
Isaac Connor
|
fbbe748bc8
|
Restore old behaviour for events that don't have a video
|
2017-04-19 14:15:32 -04:00 |
|
Isaac Connor
|
5246844b10
|
turn down log level
|
2017-04-19 14:15:10 -04:00 |
|
Isaac Connor
|
dd4ea635e8
|
remove rotate, as the video file itself has the rotate set
|
2017-04-19 13:12:15 -04:00 |
|
Isaac Connor
|
8fbe765a7d
|
Set filename so that save as gives the correct filename
|
2017-04-19 13:11:15 -04:00 |
|
Isaac Connor
|
c80c02ea00
|
move the reconnect to db logic after the continuous sleep, so that we reconnect after long sleep
|
2017-04-19 12:46:44 -04:00 |
|
Isaac Connor
|
d2fb4a7874
|
braces, spacing cleanup. Remove unused variable wasRecording
|
2017-04-19 10:34:17 -04:00 |
|
Isaac Connor
|
b87839f785
|
turn off csrf on view=view_video
|
2017-04-19 10:12:51 -04:00 |
|
Isaac Connor
|
7697b8c7be
|
" to '
|
2017-04-19 10:09:27 -04:00 |
|
Isaac Connor
|
71a9763c32
|
add a comment
|
2017-04-19 10:02:31 -04:00 |
|
Isaac Connor
|
d1d4fa7b8f
|
fix the redirect location
|
2017-04-19 10:02:07 -04: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
|
c3e9b2b177
|
add some code comments
|
2017-04-18 14:17:57 -04:00 |
|
Isaac Connor
|
d53639c2bf
|
fix braces
|
2017-04-18 14:17:48 -04:00 |
|
Isaac Connor
|
b71d021ae1
|
Merge branch 'fix_1849' into storageareas
|
2017-04-18 12:43:04 -04: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 |
|
Isaac Connor
|
d4e0b456c0
|
Fix HAVE_LIBAVRESAMPLE tests so that the build works without it
|
2017-04-18 10:49:27 -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
|
a164118ad3
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-16 11:26:30 -04:00 |
|
Isaac Connor
|
273229858f
|
Merge branch 'master' into storageareas
|
2017-04-16 11:26:18 -04:00 |
|
Isaac Connor
|
3b2d708a16
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-04-16 11:24:51 -04:00 |
|
Isaac Connor
|
d5fd4b43a5
|
experiment with zmDbDisconnect before forking
|
2017-04-16 11:24:37 -04:00 |
Isaac Connor
|
f1f54205fb
|
Merge branch 'remove_BOM' into storageareas
|
2017-04-16 09:28:35 -04:00 |
|
Isaac Connor
|
5e0012569f
|
use dos2unix to remove BOM
|
2017-04-16 09:22:37 -04:00 |
Andy Bauer
|
f10d3f10a0
|
packpack - add full path to deply_rsa.enc
|
2017-04-15 09:36:53 -05:00 |
|
Andy Bauer
|
3b1ef579d5
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
|
2017-04-15 09:24:45 -05:00 |
|
Andy Bauer
|
4240f03f4e
|
rpm readmefile changes
|
2017-04-15 09:23:28 -05:00 |
|
Isaac Connor
|
0efca38d68
|
Merge pull request #1854 from knnniggett/caketmp
make cake tmp = zoneminder tmp
|
2017-04-15 10:23:03 -04:00 |
|
Isaac Connor
|
432a38720a
|
Merge pull request #1788 from knnniggett/travis_test1
packpack nightly builds
|
2017-04-15 10:21:42 -04:00 |
|
Andrew Bauer
|
7e9b9944ae
|
rpmspecfile changes to reflect recent commits
|
2017-04-15 08:51:59 -05:00 |
|
Andrew Bauer
|
65f96df477
|
Merge pull request #1791 from dwalkes/FI8908ControlAdd
Additional controls for FI8908W cameras
|
2017-04-15 07:23:29 -05:00 |
|
Andrew Bauer
|
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 |
|
Isaac Connor
|
ab4b5e6b69
|
Merge pull request #1853 from knnniggett/cakecache
change cake cache engine from File -> Apc
|
2017-04-14 21:10:23 -04:00 |
|
Isaac Connor
|
5dd4359b80
|
Merge pull request #1852 from knnniggett/cakelog
move cake log to zoneminder log folder
|
2017-04-14 21:09:50 -04:00 |
Andrew Bauer
|
0b729cf295
|
modify cmakelists.txt
|
2017-04-14 15:15:29 -05:00 |
|
Andrew Bauer
|
d2490cf7e3
|
make cake tmp = zoneminder tmp
|
2017-04-14 15:11:41 -05:00 |
|
Andrew Bauer
|
48a73f7e78
|
change cache engine from File -> Apc
|
2017-04-14 14:31:42 -05:00 |
|
Andrew Bauer
|
3cbd32cd41
|
move cake log to zoneminder log folder
|
2017-04-14 14:24:29 -05:00 |
|
Andrew Bauer
|
48e2c5f6ec
|
Update redhat.rst
|
2017-04-14 12:40:32 -05:00 |
|
Isaac Connor
|
09d8d7e40f
|
Merge pull request #1851 from knnniggett/timestamponcapture
invert timestamp_on_capture condition
|
2017-04-14 11:05:04 -04:00 |
|
Andrew Bauer
|
a6799a8aaa
|
remove unneeded files
|
2017-04-14 06:40:09 -05:00 |