b5699dcac3
google code style
2017-09-26 17:14:27 -04:00
35482ba53c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-26 16:13:51 -04:00
8c1cfb28a5
use c-style casts because they work
2017-09-26 16:13:26 -04:00
94fd113b63
use c-style casts because they work
2017-09-26 16:12:20 -04:00
1ba0a52769
remove const... which is preventing us from building on trusty
2017-09-26 12:53:54 -04:00
d69b16df24
add group filter to montagereview
2017-09-26 11:28:19 -04:00
bc1b770c14
add translation for AddNewStorage
2017-09-26 11:27:55 -04:00
766b31dc0e
Merge pull request #20 from digital-gnome/webfixes2
...
Webfixes2
2017-09-26 11:01:37 -04:00
38a4ca1a6f
use storageareas when outputting zone diag images
2017-09-26 09:33:33 -04:00
e277456682
put parenthesis back in
2017-09-26 09:15:54 -04:00
00c33aa758
remove extra /div
...
I somehow let an extra /div slip into the commit for making archive work.
2017-09-25 22:14:53 -04:00
cc4b6cd0b0
switch to jquery
...
switched both scaleslider and speedslider to jquery
2017-09-25 22:14:46 -04:00
7dd95f6afe
getNearEvents prev always 0
...
getNearEvents always returns 0 for prev event. sortColumn is escaped with passes it with single quotes and breaks the query. I changed it to match next event by removing the escape.
2017-09-25 22:14:36 -04:00
9f93bfc23b
use Monitor Id in path to diag images instead of monitor name as the name is a convenience link and not guaranteed to exist
2017-09-25 18:45:58 -04:00
1791d3d5b7
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-09-25 16:23:33 -04:00
84be41998a
make debug lines more informative
2017-09-25 16:23:27 -04:00
74bb2da668
remove extra parenthesis
2017-09-25 16:23:15 -04:00
3227599e01
google code style
2017-09-25 16:22:52 -04:00
869d2b4f16
make failure to symlink non-fatal. Someday we may want to use a file store that doesn't do symlinks
2017-09-25 16:22:41 -04:00
8941bc80b8
reduce log level for success debug message
2017-09-25 16:21:46 -04:00
2a39cf2bcd
split videostore opening out of the constructor so that we can test for failure
2017-09-25 15:28:14 -04:00
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
Isaac Connor
Isaac Connor
digital-gnome
Andrew Bauer
ralimi
Stefano Probst