ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,344 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

478 Commits

Author SHA1 Message Date
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
stan 7e55373b87 Fixed incorrect scaling of timeout on select call 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3470 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-27 16:15:16 +00:00
stan 1ce54fb0db Enabled alternate selections when a filter has been chosen. Improved 
styles for debug entries in log.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3462 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-23 21:53:45 +00: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 7b43ac2645 Use JSON encoding for language independent serialisation (filters and control commands) rather than PHP serialisation. Removes dependency on rare PHP::Serialization perl module. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3357 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 16:18:18 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 21:59:06 +00:00
stan 173de6debf Replaced deprecated split function call 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3276 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:28:25 +00:00
stan ccfdd30988 Fixed typo in error message 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3275 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:28:01 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-07 11:10:18 +00:00
stan dc9e2755b0 Added sample apache config file. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 23:27:58 +00:00
stan 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
stan 825eda95a6 Regenerated 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3162 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:56:23 +00:00
stan 77a2d16493 Cosmetic/whitespace change 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3157 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:45:44 +00:00
stan 93b955813f Further PTZ preset tweaks 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2958 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-09-28 14:16:17 +00:00
stan c5a0f98309 Factored out action and request control functionality. Added presets to mobile view for PTZ cams. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2956 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-09-28 13:34:10 +00:00
stan 8cad0dbd6a Updated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-24 10:27:28 +00:00
stan 11a1cc2d41 Now supports custom perl install path 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-08 09:11:56 +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 72f908c4e7 Changed streaming to dynamically reduce frame rates if streams are sent too slowly. Made low bandwidth montage more resilient. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2844 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-03 12:10:54 +00:00
stan fa5db09a73 FIxed issues with negative FPS affecting streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2839 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-01 19:39:23 +00:00
stan cfccc4b9bf Updates to event export and javascript fixes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2814 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-27 09:14:54 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-23 21:59:13 +00:00
stan 3069dc2402 Final timestamp update 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:32:04 +00:00
stan 73ad3a7097 Changed types/order of stream status structs to work on 64 bit systems. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2797 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-08 14:34:09 +00:00
stan e14efbd493 Updated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 11:24:01 +00:00
stan d43d2289ed Changes from updated build tools. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-20 14:54:50 +00:00
stan 549aa39cbb Updated autoconf/make files 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-06 00:05:56 +00:00
viseon f2ad7cc770 Add offset to replay_rate to make it unsigned 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2708 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 23:56:15 +00:00
viseon b8781904ca Baselined rates and scales to base, replay_rate now short int. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2706 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 23:42:35 +00:00
stan 6d78b17d90 Added CMD_VARPLAY to stream commands 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2687 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-11-03 13:16:47 +00:00
viseon 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
viseon 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
stan 7d96edeacd Added .in files to svn 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2681 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-11-03 12:14:50 +00:00
stan e60149ce36 Modification to streaming to avoid making stream buffer if not required. Also cycle fix. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2679 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-29 23:08:21 +00:00
stan 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
stan c561a238a0 Fixed issues with event responses 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2661 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-14 12:13:44 +00:00
stan 0a9298dbbe Various web bugs fixed 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2651 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-07 09:02:17 +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 ba788cc001 Fixed issues with creation, editing and deletion of monitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2626 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 16:43:34 +00:00
stan 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
stan abaf825c95 Removed temp debug 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2567 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 15:52:09 +00:00
stan acc47c04c9 Renaming and suppressed errors from sendto in case socket not open 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2565 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 15:19:12 +00:00
stan d6f85862ac Fixed path to export functions 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2544 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 08:43:29 +00:00
stan 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
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