1f6425b1b7
Fix for SQL to load next and previous event
2016-05-05 14:50:15 -04: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
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
078e18e6c5
Add label size to monitor options (frontend part)
...
This commit adds the option "Font size" to monitor options in the
timestamp panel. Includes translations of "Font size" for german
(de_de), french (fr_fr) and spanish (es_es). All other language files
contain the english text.
2015-08-10 15:35:19 +02: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
69090563d5
Merge branch 'master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-11-28 14:23:05 -05:00
bec58a6011
fixes WRT to db logging. I believe fixes issue #504
2014-09-26 14:43:58 -04:00
5217bb668a
Merge remote branch 'origin/master' into video
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2014-06-06 09:25:05 +03:00
3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03: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
6c637947e2
Ability to skip frames in motion detection.
...
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
2014-04-10 14:59:34 +02:00
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
003b8c9868
more removal of escaping
2013-12-17 14:38:08 -05:00
20f1b460ee
fix
2013-12-17 14:30:56 -05:00
1c028e5806
use parameter passing and remove extra escsaping
2013-12-16 16:52:30 -05:00
00478b3ff2
Fixed id parsing.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3209 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-28 21:27:08 +00:00
287517a84f
Actually added Notes to Events instead of Event
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2686 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:16:02 +00:00
8d42ead4d2
Added Notes to retrived Ajax event fields
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2685 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:15:02 +00:00
81fd3aaa41
Restructured ajax to be consistent.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2668 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-16 16:12:23 +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
bb2f87a6f0
Corrected undefined index warnings.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2613 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-08-03 15:04:44 +00:00
81065ba6dd
Removed learn state bits
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2510 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:42:20 +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
Heng Liu
SteveGilvarry
Robin Daermann
Andrew Bauer
Isaac Connor
Kfir Itzhak
Sune1337
stan
viseon