94f7194e4f
Update frmo SA. Use Monitor object, still hide Controls by default.
2017-05-18 21:48:21 -04:00
319712a4c1
Merge updates from sa branch
2017-05-18 15:16:59 -04:00
377cc94acb
Merge more changes to make video storage ui's work ( #1889 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
2017-05-18 15:11:26 -04:00
f851daca68
merge code to load video.js etc on Event view
2017-05-18 15:10:13 -04:00
5500d7bbc0
merge localized versions of js files
2017-05-18 15:05:57 -04:00
bf3db69cbe
merge localized versions of js files
2017-05-18 15:05:10 -04:00
bc1a2dcb21
whitespace & braces
2017-05-18 14:55:53 -04:00
3ccf7e102e
fix Debug to Logger::Debug
2017-05-18 14:50:17 -04:00
57d07aef22
merge whitespace and brace changes from sa branch
2017-05-18 14:44:06 -04:00
2da374bfb1
log the command as well as output and return values
2017-05-18 14:43:17 -04:00
44c07c4e7a
put back proper sql
2017-05-18 14:42:55 -04:00
84a224d712
put back the AS E
2017-05-18 14:39:58 -04:00
4763ace165
Merge branch 'master' into storageareas
2017-05-18 14:24:09 -04:00
da33cbe1f9
fix
2017-05-18 14:09:46 -04:00
158741a7d8
fix whitespace
2017-05-18 14:07:56 -04:00
319ad7fede
fix whitespace
2017-05-18 14:07:51 -04:00
8b0f319834
fix whitespace
2017-05-18 14:06:13 -04:00
64bb7bace8
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-18 14:04:48 -04:00
9fd9a75669
fix whitespace, braces, simplify sql
2017-05-18 14:04:24 -04:00
29bcab9204
fix Debug to Logger::Debug
2017-05-18 13:54:06 -04:00
d1c61a252f
fix whitspace/braces
2017-05-18 13:50:56 -04:00
96051a0071
we switched to .png instead of .gif
2017-05-18 13:50:46 -04:00
e15fdf9ac3
We switched to png's now
2017-05-18 13:18:07 -04:00
fd83a3fafc
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-18 12:59:16 -04:00
3ec4e1bfe7
fix merge
2017-05-18 12:59:09 -04:00
c125d22d4d
Fix Debug to Logger::Debug
2017-05-18 12:49:59 -04:00
798403d4fe
Update the NEWS file as well
2017-05-18 12:16:28 -04:00
1404785eeb
revert my attempt to make it rename zm.conf to zm.conf.new on install
2017-05-18 12:07:04 -04:00
6d58fe5d74
Revert back to just installing //etc/zm/zm.conf
2017-05-18 12:04:55 -04:00
67c2784522
try putting it into a script
2017-05-18 12:00:45 -04:00
fc704f5864
try putting it into a script
2017-05-18 11:52:58 -04:00
f84d363e1a
Don't rename zm.conf.new back to zm.conf
2017-05-18 10:28:11 -04:00
273a527356
fixup matching endif
2017-05-18 10:03:12 -04:00
cb3ee3484a
remove work in progress crap from zm_event
2017-05-18 09:08:31 -04:00
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
234a9ce236
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-17 11:54:02 -04:00
6ffe8018ef
fixup spacing/braces
2017-05-17 11:52:25 -04:00
a933d4ae12
fix spacing and braces
2017-05-17 11:40:54 -04:00
3e35fc24a3
Add Socket Support to zmupdate ( #1867 )
...
* Update zmupdate.pl.in
* Fix spacing
* Update zmupdate.pl.in
2017-05-17 11:31:13 -04:00
200f92b1ad
make zmexport not rely on symlinks in the webroot ( #1888 )
...
* make zmexport not rely on symlinks in the webroot
* add archive view
2017-05-17 11:30:39 -04:00
44f3738b4b
Move h264 db script to 1.30.5 ( #1884 )
...
* Move h264 db script to 1.30.5
* Move h264 db script to 1.31.0
2017-05-16 15:19:31 -04:00
dd75c4676b
trivial updates ( #1887 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
2017-05-16 14:16:32 -04:00
a1fec66b5b
fix the code to do zm.conf.new
2017-05-16 14:15:41 -04:00
ac8b09e89c
merge some trivial updates from storageareas
2017-05-16 14:14:07 -04:00
eef5e5cd90
Merge branch 'feature-h264-videostorage'
2017-05-16 13:37:24 -04:00
47743d6352
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-16 13:15:31 -04:00
2c9d21f59f
1768 fix email tokens for h264 storage ( #1814 )
...
* 1768-Fix-email-tokens-for-h264-storage Snapshot extraction impmemented
* 1768-Fix-email-tokens-for-h264-storage: Video file path fixed
* 1768-Fix-email-tokens-for-h264-storage: vframes 1 option added
* 1768-Fix-email-tokens-for-h264-storage: generateImage sub created
* 1768-Fix-email-tokens-for-h264-storage: Few typos fixed
* 1768-Fix-email-tokens-for-h264-storage: Code refactoring. EI1A and EIMA macros added
2017-05-16 13:04:42 -04:00
b1f8485969
Fix videostorage ( #1885 )
...
* merge relevant c bits to make h264 recording work
* h264 code requires libavresample and boost
* Need libavresample
2017-05-16 12:04:56 -04:00
ca090a1165
Merge pull request #1883 from SteveGilvarry/fix_readme
...
Revert Readme changes from h264
2017-05-16 18:55:58 +10:00
3f3ab0398f
Revert Readme changes from h264
2017-05-16 18:53:01 +10:00
Isaac Connor
Isaac Connor
Joshua Ruehlig
Andrew Bauer
Steve Gilvarry
Vladimir Poluyaktov