5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
5c62c654ce
fix WatchScale -> EventScale
2016-11-03 16:47:22 -04:00
cb69d1a693
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2016-11-03 14:57:29 -04:00
0ea8461192
remove extra s
2016-11-03 09:43:38 -04:00
ca69a79bed
fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist.
2016-10-27 17:05:33 -04:00
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
dcf6a39bf6
split Event and Monitor into objects and use properties from appropriate object
2016-10-12 15:39:32 -04:00
5b8b9c5345
merge update
2016-10-12 09:24:10 -04:00
b4f065eb75
Convert event view to use Objects
2016-10-12 09:17:57 -04:00
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -04:00
cf9fa78ca3
work on fixing event view
2016-09-29 09:28:48 -04:00
02a196d98b
add missing ]
2016-09-28 08:30:22 -04:00
167214cb01
Merge branch 'cookie_scale' into storageareas
2016-09-27 10:05:16 -04:00
6c3a3d3d50
store the scale value for watch and event views in a cookie, differentiated by monitorId.
2016-09-27 09:46:04 -04:00
5f07911a63
fix spacing
2016-08-31 10:09:42 -04:00
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
851e8f46ff
redo fix_rotate
2016-04-25 15:57:39 -04:00
85798932ee
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
2016-04-25 14:10:26 -04:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
6816a4c75b
Merge branch 'iconnor_video' into storageareas
2016-04-01 11:35:38 -04:00
5ea11a8bfe
use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
...
also fixed bug which prevented seeking in timeline video preview
2015-11-18 21:21:56 -08:00
05a2445b7a
better way of detecting showing image or video in timeline and event view
...
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
2015-10-24 22:22:52 -07:00
7502e5b3e3
added control for video playback rate
...
Conflicts:
web/skins/classic/views/event.php
2015-07-29 00:07:19 +10:00
9b06b1399c
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02:00
fd94d22b0e
Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors
2015-03-22 17:31:22 +11:00
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
dd714665bd
use explode instead of preg_split
2015-02-23 14:18:10 -05:00
bd3a9806b8
Fix sql query when user is limited to specific monitors
2015-02-23 14:16:04 -05:00
851a246cf2
Revert "Fix sql query when user is limited to specific monitors"
...
This reverts commit 41b581552e
2015-02-23 14:10:53 -05:00
41b581552e
Fix sql query when user is limited to specific monitors
2015-02-23 14:10:18 -05:00
ada53bbb28
Testing videojs for video playback
2015-02-16 19:43:13 +11:00
9fe5b08726
Fix bracket issues post merge
2015-01-06 15:12:09 +10:00
b79c2c1604
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
web/skins/classic/views/timeline.php
Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
2014-12-25 08:24:48 +10:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
bf33eab17c
Merge branch 'video' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/Makefile.am
src/zm_event.cpp
web/skins/classic/views/js/event.js
2014-12-02 20:58:35 +11:00
617179b649
spaces to tabs, hide video stuff if video writer is turned off
2014-11-28 16:47:16 -05:00
8d71d4de03
Swap to mp4 container
2014-11-09 18:15:43 +11:00
3267b59cb5
Add html5 video control to timeline and event to support mkv playback
2014-05-30 12:40:33 +10:00
df3ab025f8
Imported missing files from master to feature-h264-videostorage
2014-05-30 01:47:52 +10:00
0d7c52dc1f
Merge remote branch 'origin/master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-04-17 13:26:00 +03:00
967dda737c
more copying mysql2PDO from classic. Also, some fixes in classic
2014-03-21 17:16:56 -04:00
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
3393a63525
more updates
2013-12-17 12:53:15 -05:00
ef765afa2d
Merge branch 'master' into mysql2PDO
2013-10-17 17:02:44 -04:00
355c10c3a4
fix error when strict modes is on.
2013-10-17 17:02:17 -04:00
2a45506bff
more quoting removal
2013-10-17 16:15:04 -04:00
Isaac Connor
Andy Bauer
Isaac Connor
Steve Gilvarry
Heng Liu
Michael
SteveGilvarry
Andrew Bauer
Emmanuel Papin
Will W
Kfir Itzhak