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
1ed6462354
Removed all of the old web files
2013-05-01 06:52:43 -04:00
2c47a15f9b
Use event dimensions instead of monitor ones as they may have changed.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3520 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:53:29 +00:00
88a6371d46
Preserve replay mode in cookie
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3159 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:49:46 +00:00
1fad2d7ec9
Changed query separator to & and miscellaneous html fixes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:09:16 +00:00
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
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
106882c161
Updated copyright notices
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:48:16 +00:00
8107c93933
Changed OPT_MPEG to OPT_FFMPEG
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2558 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:21:26 +00:00
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
Isaac Connor
SteveGilvarry
Will W
stevegilvarry
Kfir Itzhak
Kyle Johnson
stan