Isaac Connor
|
63fb424bc7
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-03-13 15:43:12 -04:00 |
|
Isaac Connor
|
147c2546b3
|
include HAVE_MP4V2_MP4V2_H and MP4_H
|
2017-03-13 15:42:51 -04:00 |
|
Isaac Connor
|
d5312ce21f
|
fix libswscale for 1604
|
2017-03-13 15:37:55 -04:00 |
Isaac Connor
|
b22e48868b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-03-13 14:40:27 -04:00 |
|
Isaac Connor
|
67b7b76e1a
|
add libswresample and mp4v2
|
2017-03-13 14:40:01 -04:00 |
|
Isaac Connor
|
fc464d988c
|
add x264
|
2017-03-13 14:36:08 -04:00 |
|
Isaac Connor
|
1cbcd3612f
|
add libswscale4
|
2017-03-13 14:28:13 -04:00 |
|
Isaac Connor
|
9f99d34807
|
fix calls to getStreamHTML
|
2017-03-13 14:22:33 -04:00 |
|
Isaac Connor
|
adbb5f431d
|
fix version of x264
|
2017-03-11 11:00:46 -05:00 |
|
Isaac Connor
|
21d3cd6835
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-03-11 10:48:39 -05:00 |
|
Isaac Connor
|
e04cc1be05
|
add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604.
|
2017-03-11 10:41:39 -05:00 |
|
Isaac Connor
|
6ac6161af6
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-03-08 16:25:16 -05:00 |
|
Isaac Connor
|
14c4a156c6
|
set img.src='' first so that Chrome closes the old stream.
|
2017-03-06 20:21:12 -05:00 |
|
Isaac Connor
|
4df12ae370
|
Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height
|
2017-03-06 17:30:00 -05:00 |
|
Isaac Connor
|
d3f7451736
|
Merge branch 'storageareas' into montage_width_height
|
2017-03-06 16:56:18 -05:00 |
|
Isaac Connor
|
fdcb93eacc
|
Merge branch 'master' into storageareas
|
2017-03-06 16:22:28 -05:00 |
|
Isaac Connor
|
3f7583ebda
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-03-06 16:22:25 -05:00 |
|
Isaac Connor
|
2686946ce9
|
Merge pull request #1800 from knnniggett/fix_deb_zm.conf_perms
fix permissions on zm.conf in deb pkg scripts
|
2017-03-05 13:32:48 -05:00 |
Andy Bauer
|
f66408b998
|
update the path to zm.conf
|
2017-03-05 10:50:09 -06:00 |
|
Andy Bauer
|
cfeb12fc73
|
fix permissions on zm.conf in deb pkg scripts
|
2017-03-05 10:37:44 -06:00 |
|
Isaac Connor
|
ebafc62b51
|
Must reopen the session so we can generate an auth hash
|
2017-03-01 15:27:42 -05:00 |
|
Isaac Connor
|
4fc0aead70
|
wip
|
2017-03-01 15:26:40 -05:00 |
|
Isaac Connor
|
c4caa9a631
|
convert arguments from an array of strong to a hash and use http_build_query
|
2017-02-27 21:48:08 -05:00 |
Isaac Connor
|
c3a52272d8
|
implement changeWidth, changeHeight and alter getStreamHTML to take an array of options
|
2017-02-27 20:56:14 -05:00 |
|
Isaac Connor
|
a0dd36d869
|
add width and height scale dropdowns
|
2017-02-27 16:40:40 -05:00 |
|
Isaac Connor
|
f9c6742c25
|
Merge pull request #1794 from knnniggett/getdiskpercent
use === operator in getDiskPercent function
|
2017-02-21 14:53:36 -05:00 |
|
Andy Bauer
|
8759e2bdb4
|
prevent divide by zero, make error messages more descriptive
|
2017-02-21 13:10:41 -06:00 |
|
Andy Bauer
|
27ca8d8674
|
use === operator in getDiskPercent function
|
2017-02-21 12:33:05 -06:00 |
|
Isaac Connor
|
660939ff37
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-02-21 09:50:52 -05:00 |
|
Isaac Connor
|
c36872daa5
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-02-21 09:48:12 -05:00 |
|
Isaac Connor
|
186e5ba866
|
Merge branch 'master' into storageareas
|
2017-02-21 09:48:00 -05:00 |
|
Isaac Connor
|
971c70f540
|
Merge pull request #1793 from mnoorenberghe/api_debug_default
Reduce the default API debug level
|
2017-02-20 21:44:48 -05:00 |
|
Andrew Bauer
|
81403eb1ce
|
Merge pull request #1792 from kunkku/link-content
zmlinkcontent: fix syntax error
|
2017-02-20 06:52:46 -06:00 |
Kaarle Ritvanen
|
548464c0d5
|
zmlinkcontent: fix syntax error
|
2017-02-20 11:12:15 +02:00 |
|
Isaac Connor
|
6ecfdf2c31
|
Merge pull request #1790 from vajonam/1789-fix-misssing-isset-check
fix missing isset check, caused number of Undefined Property warnings
|
2017-02-19 17:12:26 -05:00 |
Matthew Noorenberghe
|
df4739826b
|
Reduce the default API debug level
|
2017-02-18 23:06:53 -08:00 |
Manojav Sridhar
|
f50c0e2096
|
fix missing isset check, caused number of Undefined Property warnings
|
2017-02-18 11:15:43 -05:00 |
Andrew Bauer
|
33e8afa0e0
|
only patch packpack if it is not already patched
|
2017-02-17 13:25:17 -06:00 |
Kyle Johnson
|
b2b73edbfa
|
Merge pull request #1785 from vajonam/1784-wrong-key-for-alarmref
fix usage of wrong key
|
2017-02-17 11:13:06 -07:00 |
|
Manojav Sridhar
|
11b90e6011
|
fix usage of wrong key
|
2017-02-17 12:37:58 -05:00 |
|
Isaac Connor
|
70820abc1e
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-02-17 10:55:50 -05:00 |
|
Isaac Connor
|
d139623ed5
|
change where binary packages get uploaded to
|
2017-02-17 09:42:30 -05:00 |
|
Isaac Connor
|
980b088d57
|
google style and add label tags around Scale
|
2017-02-17 09:19:54 -05:00 |
|
Andrew Bauer
|
dc76a876a1
|
packpack rpm specfile - ensure Crud submodule folder is empty
|
2017-02-17 07:07:17 -06:00 |
Andrew Bauer
|
4809a5d7de
|
patch packpack to remove "bebian" from the tarball filename
|
2017-02-16 15:59:43 -06:00 |
|
Isaac Connor
|
a97941edd3
|
change level from error to debug on message about not supporting non-FLTP
|
2017-02-16 13:30:34 -05:00 |
|
Isaac Connor
|
8280f79c32
|
set default on DefaultVideo
|
2017-02-16 13:29:19 -05:00 |
|
Isaac Connor
|
ef653b97d7
|
set default on DefaultVideo
|
2017-02-16 13:28:50 -05:00 |
|
Isaac Connor
|
78612e3925
|
use format 1.0
|
2017-02-15 11:25:11 -05:00 |
|
Isaac Connor
|
63d92323eb
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2017-02-15 11:18:49 -05:00 |