fef503f90c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-23 13:42:44 -04:00
aada54769f
add a Group object
2017-09-23 13:42:39 -04:00
8ada30ff8c
add a group filter to montage
2017-09-23 13:42:13 -04:00
4e16523cff
Say Groups instead of listing the # of monitors in the header
2017-09-23 13:41:52 -04:00
fa37a55226
if debug is not on, limit the log level to each destination. This makes checks to meffectivelevel work
2017-09-23 13:41:20 -04:00
e679a8cfaa
Fix conf.d dir
2017-09-23 13:40:43 -04:00
079fdb02b3
Merge pull request #19 from digital-gnome/storageareas-webfixes
...
Storageareas webfixes
2017-09-20 05:25:48 -04:00
ab3f15b7c0
Add logic for Archive link on initial load
...
Javascript appears to control this but it was not firing on initial load. Added php logic.
2017-09-14 18:00:35 -04:00
a5f0103601
revert jquery change to speed slider
...
Scale was using getElementById but speed was changed to jquery. It wasn't working so I just changed it to match scale.
2017-09-14 18:00:23 -04:00
a78e568378
Change storage path text box from url to text
...
With the text box set as url you can't use a standard unix path
2017-09-14 18:00:02 -04:00
7b1142bee6
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-12 11:03:16 -04:00
6fe4b892ef
always define auth_hash
2017-09-11 17:05:46 -04:00
edb7762cf3
Merge branch 'master' into storageareas
2017-09-11 16:57:08 -04:00
496ba70819
remove checks for empty and just check for true ( #1980 )
...
Yeah I agree. I think the exists was from pre-object method days.
2017-09-11 13:27:17 -04:00
855a922d50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-09-11 10:08:58 -04:00
58a9107675
Fix incorrect links to transparent.png and index.php ( #1982 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Fix links pointing at transparent.gif
* Use relative path to index.php instead of absolute.
The installation may not be rooted at / on the server.
2017-09-10 11:49:53 -04:00
42263bf39a
pass mode when getting mp4 download link
2017-09-08 12:29:10 -04:00
ab4eb14127
Update .travis.yml
...
arm containers require arm architecture.
2017-09-04 20:12:12 -05:00
9021d1203d
Update .travis.yml
...
we can now build fedora 25 armhfp rpms using the container I built and hosted on hub.docker.com
2017-09-04 19:39:09 -05:00
b56aafb16d
Update .travis.yml
...
we can now build fedora 26 armhfp rpms using the container I built and hosted on hub.docker.com
2017-09-04 17:41:11 -05:00
7d2453e7ac
fix google code style
2017-09-04 15:28:23 -04:00
553482ab0d
Merge pull request #1975 from senden9/patch-1
...
Add zip package to the docker image. Fix #1974
2017-08-30 07:46:35 -05:00
48fe86f084
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-29 10:50:25 -04:00
35c23f5fcf
Add zip package to the docker image. Fix #1974
...
Otherwise no export of a event as ZIP file is possible.
2017-08-26 17:16:17 +02:00
a5079f205e
add Manufacturers and Models Tables
2017-08-25 15:35:17 -04:00
11b29bf1ec
Fixup ONVIF module, making it actually usable
2017-08-25 11:16:37 -04:00
08bdf5a729
fix build on trusty
2017-08-24 12:19:57 -04:00
76473027c2
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-24 12:01:11 -04:00
2a4f751a4f
ffmpeg versionc heck
2017-08-24 12:00:48 -04:00
de63aa8e8d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-24 11:00:16 -04:00
0c24556611
fix missing !
2017-08-24 10:59:56 -04:00
d11a2947bb
use Id instead of id
2017-08-24 10:44:14 -04:00
2daae43760
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-24 10:14:00 -04:00
48e9e12063
assume source=monitor when a monitor_id is specified
2017-08-24 10:13:46 -04:00
789de37d33
fix builds on older ffmpeg
2017-08-24 09:53:40 -04:00
a4cf47b5c3
move swscale into it's own files
2017-08-23 15:06:12 -04:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
5c13ae26e3
Merge branch 'storageareas' into work_on_zms
2017-08-23 10:43:19 -04:00
732ebf6df4
shorted some variable names and correct spacing
2017-08-23 10:37:32 -04:00
3033d2f2ce
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-23 10:14:38 -04:00
eb5cee7f3e
use ifdef around uses of AV_CODEC_ID_H265 and fix google code style
2017-08-23 10:14:06 -04:00
4d692d0752
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-23 09:54:17 -04:00
a8cf384be9
rpm spcfile change
...
use %{_buildshell} macro rather than hard code path to shell interpreter
2017-08-23 08:48:11 -05:00
e98ea0b891
fix non hwaccel build
2017-08-22 10:47:37 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
d406d9549c
use int instead of unsigned int. Google code style says it's right, and it gets rid of a comparison warning
2017-08-22 09:47:30 -04:00
9a6bfb2d02
fix some quotes, double to single
2017-08-22 09:44:45 -04:00
40cc13a903
fix whitespace
2017-08-22 09:34:02 -04:00
9b95259567
fix deleting monitor, but passing an event Id to deleteEvent instead of a hash consisting of just the Id
2017-08-22 09:33:51 -04:00
160641563f
packpack - add missing $parms var
2017-08-21 18:50:30 -05:00
Isaac Connor
Isaac Connor
digital-gnome
Andrew Bauer
ralimi
Stefano Probst
Isaac Connor