Andrew Bauer
32bf57d35b
docker support files moved to zmdockerfiles
2018-01-19 15:15:11 -06:00
Andy Bauer
95edf1b2a8
fix typo
2018-01-18 09:35:04 -06:00
Andy Bauer
2e4a20dfba
entrypoint.sh - add multi-distro compatibility
2018-01-18 09:08:09 -06:00
Andrew Bauer
9d28836e57
Merge pull request #2036 from ZoneMinder/fix_export
...
Add a few more extensions to the list of files to include in export
2018-01-18 08:34:08 -06:00
Andrew Bauer
b7258bb6c1
Merge pull request #2037 from kb5won/patch-1
...
Update packpack.rst
2018-01-18 08:33:18 -06:00
Brian Gallimore
9df7349e8e
Update packpack.rst
...
added path to git clone command. (I'm following install guide for first time and that step didn't work without the path)
2018-01-17 19:57:45 -06:00
Isaac Connor
55fa86c7be
Add a few more extensions to the list of files to include in export
2018-01-17 16:57:38 -05:00
Andrew Bauer
6c5dd0d395
Update zmlinkcontent.sh.in
2018-01-17 14:46:21 -06:00
Andrew Bauer
285a3a2958
zmlinkcontent.sh - only symlink events & images folder when -o flag is set
2018-01-17 14:41:44 -06:00
Andrew Bauer
617331ef32
fix apache alias
2018-01-17 10:38:20 -06:00
Andrew Bauer
5d0defd9fa
zmlinkcontent.sh - modify temp folder link command
2018-01-17 09:58:18 -06:00
Andrew Bauer
064be68efa
fix typo
2018-01-17 08:46:38 -06:00
Andrew Bauer
8c8c257799
log folder check moved to zmlinkcontent.sh
2018-01-17 08:18:41 -06:00
Andrew Bauer
0ddf9633ed
zmlinkcontent.sh - verify zm temp and log folders
2018-01-17 08:16:15 -06:00
Andrew Bauer
0305dfea92
Update entrypoint.sh
2018-01-16 20:47:23 -06:00
Andrew Bauer
530e10610e
Update entrypoint.sh
2018-01-16 20:14:42 -06:00
Andrew Bauer
fe0bd66f74
fix whitespace in service startup text
2018-01-16 20:12:26 -06:00
Andrew Bauer
7b3f72d7a2
update service startup text
2018-01-16 20:02:18 -06:00
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