Commit Graph

7684 Commits

Author SHA1 Message Date
Andy Bauer 6826ebff9f new docker entrypoint script 2018-01-16 18:00:37 -06:00
Andrew Bauer c0955e0043
link cakephp tmp folder to /var/tmp
This has be done for docker builds
2018-01-15 21:01:02 -06:00
Andrew Bauer 4af48a5885
silence a2enmod output 2018-01-15 14:40:04 -06:00
Andrew Bauer 7451afcfab
delete extra apostraphe 2018-01-15 11:13:26 -06:00
Andrew Bauer 31cc03eafc
fix datatype issue with BTTV Video presets 2018-01-15 09:45:40 -06:00
Andrew Bauer d54f3f7168
fix misaligned fields in Axis & Qihan presets 2018-01-15 09:15:57 -06:00
Andrew Bauer 80362f99fa fix misaligned db fields for certain presets (#2034) 2018-01-14 21:14:30 -05:00
Andrew Bauer 40928b2f3c
Update README.md 2018-01-14 16:41:21 -06:00
Andrew Bauer e1f8278712
Update ISSUE_TEMPLATE.md 2018-01-14 15:24:47 -06:00
Andrew Bauer d53f3e8048
Update README.md 2018-01-14 15:21:40 -06:00
Andy Bauer 0994b1f211 Dockerfile moved to ZoneMinder/zmdockerfiles 2018-01-14 14:54:10 -06:00
Andrew Bauer 36ab7b01e8
Merge pull request #2018 from connortechnology/robots
add a robots.txt to the docroot to tell bots to not scrape our ZM install
2018-01-04 20:42:15 -06:00
Andrew Bauer da4d6d168d
Merge pull request #2022 from connortechnology/fix_Channel
alter the type of the Channel field to match the update that occurred…
2018-01-04 20:40:08 -06:00
Andrew Bauer bc096bcc3d
make zoneminder rpm depend on zip package 2017-12-14 14:14:31 -06:00
Andrew Bauer b017394961
Remove Fedora 25 support from build system 2017-12-13 15:49:31 -06:00
Isaac Connor 833ae0ee8f alter the type of the Channel field to match the update that occurred in 1.23.3 2017-12-11 15:09:41 -05:00
Andrew Bauer 0d9f330356 call zmcamtool during postinst (#2021) 2017-12-10 14:14:39 -05:00
Andy Bauer a2d266f8f9 fix floreen ptz control sql 2017-12-09 16:05:42 -06:00
Pliable Pixels 08b5c26a15 2019 maxscoreframeid (#2020)
* added MaxScoreFrameId to address #2019

* consistent quotes
2017-12-07 14:11:06 -05:00
Isaac Connor fb424a7eef add a robots.txt to the docroot to tell bots to not scrape our ZM install. 2017-12-07 09:32:23 -05:00
kimmeld 1a5d9d5586 Fix monitor sorting (#2015)
Fixed issue #2014
2017-12-06 15:43:33 -05:00
Isaac Connor 004a41b122 remove boost dependency. 2017-12-04 22:59:50 -05:00
digital-gnome f8d3c07586 Add h264 event view functionality and new feature alarmCues (#2012)
* Fix nearEventsQuery

Removed dbEscape from getNearEvents previous event because it only returns 0.  Now matches next.  Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch.  Also added start times to allow for videoJS replaymode.

* Unescape filters

Filters need to be unescaped

* Add initial values to page load

* Add replay modes to videojs

* rough in figuring out a frame in between bulk frames

* Add alarmCues

Add a graphical indication of where alarm frames happened in an event.  Similar to what zmNinja shows.

* Add remaining buttons to videojs

Functionality for all buttons on videojs streams.  FF/RW buttons show as active when they are active.

* Whitespace and fix Bulkframe calcs

* Fix zms events trying to generate with mp4 code

ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed

* ZMS scrub bar

Move zms scrub bar to bottom of image feed.  Make it simpler and more like videojs style.

* Wrap event feeds properly

* Fix dvrControls on watch view

* Add scaleToFit

Add a scaleToFit option to event view

* Add navigation for videoJS streams

Disables nav buttons at beginning and end of events.  Handles switching from zms to videojs.  If zms crashes changes next event function to reload page instead of ajax.

* Add scaleToFit to watch and frame view

Adds scaleToFit to watch view.  Since frame view uses the watch cookie this required changes to frame view

* Add transition to zoom

* Change stills view to match stream

Move stills slider bar to match scrub bar on streams.  Allow it to resize, make it larger.  Add alarmcues.

* Add Stills for every event

Add stills for every event.  Match size to stream size

* Progressbox transitions
2017-12-04 21:26:59 -05:00
digital-gnome fb952179cd Fix delete filter (#2010)
Delete filter didn't work because the request does not include 'object'.
2017-12-04 21:26:21 -05:00
digital-gnome 03ad4898d9 Fix montage monitors jumping on alert (#2013)
The alert class from bootstrap was not overriden on monitors in montage.
2017-12-04 21:25:56 -05:00
Isaac Connor 7cdd6b2596 fix crap from merge of Floreen camera ptz 2017-11-21 12:19:47 -05:00
Isaac Connor 13098c92d2 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-11-21 11:54:06 -05:00
Isaac Connor 9e12830bf5 add a test for devscripts being installed. 2017-11-21 11:53:53 -05:00
Ognyan Bankov ded6b1864a 2006 support floureon 1080p 18x 30x (#2007)
* perl control script for Fluoreon 1080p

* DB update for Floureon cameras support
2017-11-18 19:02:23 -05:00
Andrew Bauer b918a7be10
add support for fedora 27 2017-11-16 13:42:38 -06:00
Andrew Bauer e825e5d61e initial commit to change color of web console systemstats (#1981)
* initial commit to change color of web console systemstats

* use css classes
2017-10-07 18:42:39 -04:00
Pliable Pixels a8fc832481 fix for monitor API edit perm (#1995) 2017-10-07 09:55:13 -04:00
MalakymR de6f8de3f8 Include Gentoo ebuild (#1993)
package: https://packages.gentoo.org/packages/www-misc/zoneminder
wiki: https://wiki.gentoo.org/wiki/ZoneMinder

Currently at 1.30.2, PR pending for .4
Will be a -9999 ebuild to track git soon as well.
2017-10-04 07:41:44 -04:00
Andrew Bauer aa25936b3d Merge pull request #1991 from ZoneMinder/UserLanguageFix
Fix user language setting never being used
2017-09-29 12:20:03 -05:00
Steve Gilvarry 9c40f65757 Fix user language setting never being used
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858675 pointed here
https://forums.zoneminder.com/viewtopic.php?t=19403
Checked and sure enough was still there not pointing to the lang folder.
2017-09-29 11:20:20 +10:00
Steve Gilvarry d83b9ce622 Fixes #1983 (#1989)
Fair point here we put a command it should run, but I have added assistance with this part of the install is not zoneminder specific
2017-09-28 18:03:39 -04:00
DeathByKorea 6cbab6e68b Added Arch AUR package (#1986)
Package is well maintained, [Arch Wiki page](https://wiki.archlinux.org/index.php/ZoneMinder)
2017-09-23 13:46:40 -04:00
Isaac Connor 9ad29f4baf fix and move pod to bottom 2017-09-11 22:19:49 -04:00
Isaac Connor 5516a62a0e google code style, switch quotes 2017-09-11 22:12:10 -04:00
Isaac Connor 104bf07c5a fix pod docs 2017-09-11 21:52:22 -04:00
Isaac Connor 54b8cce5e4 fix tabs to spaces 2017-09-11 16:57:51 -04:00
Andrew Bauer 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
ralimi 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
Andrew Bauer ab4eb14127 Update .travis.yml
arm containers require arm architecture.
2017-09-04 20:12:12 -05:00
Andrew Bauer 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
Andrew Bauer 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
Andrew Bauer 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
Stefano Probst 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
Andrew Bauer a8cf384be9 rpm spcfile change
use %{_buildshell} macro rather than hard code path to shell interpreter
2017-08-23 08:48:11 -05:00
Isaac Connor 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