Isaac Connor
|
53166fabf5
|
Merge branch 'master' into storageareas
|
2016-11-03 14:59:06 -04:00 |
|
Isaac Connor
|
099cca210b
|
fix monitorId to MonitorId
|
2016-11-03 14:34:17 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
cf9fa78ca3
|
work on fixing event view
|
2016-09-29 09:28:48 -04:00 |
|
Isaac Connor
|
e04266600e
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-27 11:04:12 -04:00 |
|
Isaac Connor
|
4ce531099c
|
add an auth field to request=stream results to give the client a new auth hash to use
|
2016-09-27 11:03:12 -04:00 |
|
Isaac Connor
|
167214cb01
|
Merge branch 'cookie_scale' into storageareas
|
2016-09-27 10:05:16 -04:00 |
|
Isaac Connor
|
6c3a3d3d50
|
store the scale value for watch and event views in a cookie, differentiated by monitorId.
|
2016-09-27 09:46:04 -04:00 |
SteveGilvarry
|
ada53bbb28
|
Testing videojs for video playback
|
2015-02-16 19:43:13 +11:00 |
|
SteveGilvarry
|
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 |
Will W
|
3267b59cb5
|
Add html5 video control to timeline and event to support mkv playback
|
2014-05-30 12:40:33 +10:00 |
stevegilvarry
|
df3ab025f8
|
Imported missing files from master to feature-h264-videostorage
|
2014-05-30 01:47:52 +10:00 |
Kfir Itzhak
|
2b79ff2cbd
|
Initial commit for saving events as videos :)
|
2013-12-19 18:38:07 +02:00 |
Kyle Johnson
|
1ed6462354
|
Removed all of the old web files
|
2013-05-01 06:52:43 -04:00 |
stan
|
6ff385e407
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-06-21 09:19:10 +00:00 |
|
stan
|
49daed8658
|
Changed name of event variable as Chrome objects.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3289 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-02-08 14:30:59 +00:00 |
|
stan
|
240027dd98
|
Fixed javascript error due to archive button permissions - http://www.zoneminder.com/forums/viewtopic.php?t=15387
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3286 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-02-06 16:17:42 +00:00 |
|
stan
|
60f0136ed3
|
Merged in image root changes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2010-02-28 19:16:40 +00:00 |
|
stan
|
9b31bf29e8
|
Added in image view to allow event root to be able web root
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2010-02-23 09:12:12 +00:00 |
|
stan
|
034f37cf4b
|
Applied contributed patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-05-25 18:03:46 +00:00 |
|
stan
|
e69489e841
|
Changes to stills event view for IE etc
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2866 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-05-08 11:21:28 +00:00 |
|
stan
|
eaaaf88493
|
Applied 'mitch' IE compatibility patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2865 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-05-08 10:04:12 +00:00 |
|
stan
|
dc42b4a83b
|
Further mootools mods and slightly enlarged event view
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2836 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-04-01 08:01:49 +00:00 |
|
stan
|
b044291233
|
More mootools 1.2 migration mods.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2833 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-03-31 14:06:13 +00:00 |
|
stan
|
f5d7391e72
|
Changed Object reference to Hash for mootools 1.2
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2828 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-03-31 13:00:20 +00:00 |
|
stan
|
7b4c0fa926
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2820 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-03-27 16:01:59 +00:00 |
|
stan
|
ef8f7b85fd
|
Continuing development and bugfixes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-09-26 09:47:20 +00:00 |
|
stan
|
2824cb7355
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-14 13:54:50 +00:00 |