SteveGilvarry
|
4245928b35
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
web/skins/classic/js/skin.js
|
2014-10-12 20:10:36 +11:00 |
Isaac Connor
|
0834e1b61d
|
I see no reason for these to be posts. They retrieve info, that's it.
|
2014-07-29 16:15:31 -04: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 |
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
|
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
|
97ba7a6684
|
Corrected some Mootools issues, autoCancel => link: cancel and onComplete => onSuccess. Also fixed montage alarm state class handling
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2986 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-10-16 17:13:16 +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
|
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 |