Isaac Connor
|
088fa0192b
|
Merge branch 'master' into storageareas
|
2017-04-25 10:00:14 -04: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
|
4b264251ac
|
Merge branch 'zones_on_montage' into storageareas
|
2017-04-24 14:47:38 -04:00 |
|
Isaac Connor
|
5a2ef571ef
|
fix scaling, zones now work. Add a Show/Hide Zones at the top
|
2017-04-24 14:47:30 -04:00 |
|
Isaac Connor
|
23f384407e
|
blah
|
2017-04-24 14:00:47 -04:00 |
|
Isaac Connor
|
0c236e9033
|
Merge pull request #1860 from josh4trunks/josh4trunks-patch-1
Update documentation
|
2017-04-24 12:35:35 -04:00 |
|
Isaac Connor
|
10dc6b98ca
|
fix if LIBAVRESAMPLE structure
|
2017-04-24 11:28:24 -04:00 |
|
Isaac Connor
|
12ffa60023
|
fix applying sorting to MOnitors.
|
2017-04-24 11:13:08 -04:00 |
|
Isaac Connor
|
83ba74ad66
|
work in progress, rough in adding the svg zones to montage
|
2017-04-24 11:11:54 -04:00 |
|
Isaac Connor
|
ef6c675c6a
|
work in progress, rough in adding the svg zones to montage
|
2017-04-24 11:11:44 -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 |
|
Isaac Connor
|
bafbdc28ed
|
update to whats in master
|
2017-04-21 14:46:40 -04:00 |
|
Isaac Connor
|
a29ec6af62
|
revert to master
|
2017-04-21 14:44:36 -04: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 |
|
Isaac Connor
|
10732f039d
|
update to 1.31.0
|
2017-04-21 12:45:44 -04: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 |
|
Isaac Connor
|
c8855c03fc
|
don't use a submodule for video.js
|
2017-04-20 10:50:42 -04:00 |
|
Isaac Connor
|
035b464b97
|
Revert "don't use external hosted video.js or moment.js"
This reverts commit fb2f8022a7.
|
2017-04-20 10:45:51 -04:00 |
|
Isaac Connor
|
dd4b93f130
|
add submodule video.js, using release tag v5.18.4
|
2017-04-20 10:35:32 -04:00 |
|
Isaac Connor
|
fb2f8022a7
|
don't use external hosted video.js or moment.js
|
2017-04-20 10:12:47 -04:00 |
|
Isaac Connor
|
3db38eb474
|
limit points to the limits of the monitor
|
2017-04-19 16:12:12 -04:00 |
|
Isaac Connor
|
c4ec01c0d2
|
fix compile when no libavresample
|
2017-04-19 14:28:37 -04:00 |
|
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 |