mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-19 22:37:36 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,394 Commits 80 Branches 104 Tags
08c8da3e8f19089028fa7f72decfe3dffc504a7f
Commit Graph

95 Commits

Author SHA1 Message Date
Isaac Connor
26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Steve Gilvarry
f804f7739d Adjust download file path to swap path to match the file generated. 2016-06-14 20:49:38 +10:00
Isaac Connor
6084e2d00f improve error message. The unrecognized action error happens above, so this error should just mention permissions 2016-05-16 14:38:40 -04:00
Isaac Connor
026d3e3189 Merge branch 'master' into feature-h264-videostorage 2016-04-11 09:30:56 -04:00
Isaac Connor
c0c543e029 change quotes to prevent php7 complaint 2016-04-09 11:25:56 -04:00
SteveGilvarry
4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am
 2016-04-05 22:06:14 +10:00
SteveGilvarry
5ff427d9e9 Removed Autotools Makefile.am 
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
 2016-02-26 22:19:02 +11:00
SteveGilvarry
7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11:00
Isaac Connor
bd71c4999d test for Server in servers_by_Id as well as just having a value for ServerId. Fixup export as well. 2016-01-02 14:36:37 -05:00
Isaac Connor
cf7e168872 Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist 2016-01-01 17:10:37 -05:00
Isaac Connor
ec7504f925 Translate ServerId to Server in Log record before sending back 2016-01-01 16:33:28 -05:00
Isaac Connor
bfe4175fdf Add Server to filters and log results 2015-12-31 10:13:25 -05:00
Isaac Connor
6d34f8f424 Use Monitor class instead of old sql 2015-12-09 09:23:42 -05:00
Heng Liu
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
SteveGilvarry
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
Robin Daermann
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
SteveGilvarry
f09a551d6a Merge branch 'master' into feature-h264-videostorage 2015-07-28 21:06:52 +10:00
SteveGilvarry
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
Isaac Connor
e10fdaf344 reduce the wait to 2/10ths instead of a whole second 2015-06-05 11:49:05 -04:00
Andrew Bauer
3a94712db2 add translate function 2015-05-10 08:10:30 -05:00
Isaac Connor
01af58018b close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session. 2015-04-20 13:06:34 -04:00
SteveGilvarry
79c82ea880 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch 2015-02-17 23:16:42 +11:00
Isaac Connor
3f64f9d919 Make the log export use ZM_PATH_SWAP and report the full path on error 2015-01-03 15:16:19 -05:00
Isaac Connor
69090563d5 Merge branch 'master' into video 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
 2014-11-28 14:23:05 -05:00
Isaac Connor
ebe35c2135 handle empty [file] to prevent logzilla 2014-11-13 09:17:54 -05:00
Isaac Connor
bec58a6011 fixes WRT to db logging. I believe fixes issue #504 2014-09-26 14:43:58 -04:00
Isaac Connor
5e262f5a67 the var is remSockFile, not remSocketFile 2014-07-24 11:05:35 -04:00
Isaac Connor
eb5f299512 increase max_socket_tries to 10 as #470 2014-07-11 10:51:24 -04:00
stevegilvarry
61cf067be0 Wrap sort order. Fixes #450 2014-06-29 22:09:59 +10:00
Kfir Itzhak
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
Kfir Itzhak
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
Kfir Itzhak
0d7c52dc1f Merge remote branch 'origin/master' into video 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
 2014-04-17 13:26:00 +03:00
Sune1337
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
Kfir Itzhak
2b79ff2cbd Initial commit for saving events as videos :) 2013-12-19 18:38:07 +02:00
Isaac Connor
003b8c9868 more removal of escaping 2013-12-17 14:38:08 -05:00
Isaac Connor
9f5b8bb03b Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO 2013-12-17 14:33:46 -05:00
Isaac Connor
20f1b460ee fix 2013-12-17 14:30:56 -05:00
Isaac Connor
ceca805b48 more updates 2013-12-17 11:07:19 -05:00
Isaac Connor
1c028e5806 use parameter passing and remove extra escsaping 2013-12-16 16:52:30 -05:00
Isaac Connor
969918781f more updates, currently the log updates are not enough. Filtering does not work. 2013-11-13 10:11:16 -05:00
Isaac Connor
93560652f1 make sortorder be asc or desc, not something arbitrary which needs to be escaped 
other fixes to use parameter passing to PDO instead of escaping them ourselves
 2013-11-01 12:30:07 -04:00
Isaac Connor
ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Isaac Connor
fcf7e5b188 Redo the patch that added the <0 test. Since it isn't an actual error there won't be an error message set so I've made it another case entirely. 2013-09-12 13:54:03 -04:00
Kyle Johnson
c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Isaac Connor
a468baf9eb cleanup 2013-05-10 13:55:45 -04:00
Kyle Johnson
2c04d0774f Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
Kyle Johnson
1ed6462354 Removed all of the old web files 2013-05-01 06:52:43 -04:00
stan
4996dd0a51 Recreated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:46:18 +00:00
stan
8b86c9af58 Removed permissions check when creating new log entries. Instead check that request is 'post'ed and moved some other requests to be 'post' only. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3509 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-26 10:50:50 +00:00
stan
e695dfd4dd Allow for level as a minimum when selecting availability criteria for other fields. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3501 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-24 13:15:58 +00:00