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

4326 Commits

Author SHA1 Message Date
Kyle Johnson 4cb0d7b1cd Use full path to zm_create.sql in bootstrap-zm.sh 2014-06-27 14:13:29 -04:00
Kyle Johnson 78c9ed2a7f Print out debug info in bootstrap-zm.sh 2014-06-27 14:08:57 -04:00
Isaac Connor 6e22278f74 password might be null when auth_relay is none. 2014-06-27 12:47:56 -04:00
Kyle Johnson 13f5bccb7c Try to cd back to the build root 2014-06-27 08:34:15 -04:00
Kyle Johnson 158432a8cf First shot at testing an individual monitor 2014-06-27 08:23:53 -04:00
Kyle Johnson 2e12a5fee7 Fix path to test.monitor.sql in run_tests 2014-06-27 08:06:04 -04:00
Kyle Johnson 5d81f59e3a Moved travis tests to their own script 2014-06-27 08:00:49 -04:00
Kyle Johnson 1ff907ae80 Reorganize the travis file. 2014-06-27 07:19:58 -04:00
Isaac Connor 07dbbd46d3 only do mmap on demand 2014-06-26 14:54:47 -04:00
Isaac Connor 8f4fb8bb64 fix mysql_escape_String call. Must use strlen, not sizeof 2014-06-26 14:44:37 -04:00
Isaac Connor e2987067f4 add avtools instead of ffmpg 2014-06-26 13:09:52 -04:00
Isaac Connor 90b06060af fix missing ExtendAlarmFrames column when add Default ZonePreset 2014-06-26 11:17:09 -04:00
Isaac Connor 20bccdf431 use the size of the username and password when calling mysql_escape_string 2014-06-25 16:23:10 -04:00
Isaac Connor 79b7792466 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 
Conflicts:
	scripts/zmdc.pl.in
 2014-06-25 15:30:04 -04:00
Isaac Connor c58c4a9720 add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall 2014-06-25 15:28:10 -04:00
Isaac Connor 676c73e26e Merge pull request #445 from clandmeter/busybox-compat 
scripts: BusyBox compatibility
 2014-06-25 15:24:51 -04:00
Isaac Connor 623837115b fix missing ARRAY() around params to dbFetchOne 2014-06-25 14:01:45 -04:00
Isaac Connor 5fac727c2f Users tab should always be available 2014-06-25 13:40:37 -04:00
Isaac Connor 11718f0559 The users tab should always be available. It is useful to configure users BEFORE turning on auth. 2014-06-25 13:39:31 -04:00
Carlo Landmeter b2323cb36d scripts: BusyBox compatibility 
BusyBox killall does not support long options using short options instead
 2014-06-25 11:19:15 +02:00
Isaac Connor f2eddf0850 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-06-24 11:22:34 -04:00
Isaac Connor 0592276f53 fix mysql_escape_string calls after referring to docs 2014-06-24 11:22:08 -04:00
Kyle Johnson 229cfcaa5b Find the last occurrence of '@' in the host string. Fixes #443 2014-06-23 14:22:27 -04:00
Kyle Johnson 89209fbe4b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-06-23 14:21:04 -04:00
Isaac Connor 924e65f42c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-06-20 12:43:07 -04:00
Isaac Connor 0f4e9eb3e4 add these dependencies, apparently they are required for sftp upload 2014-06-17 10:54:42 -04:00
Isaac Connor 03abd3c936 Merge pull request #442 from Tim-Craig/master 
Fixed issue DateTime handling in filter queries that broke timeline view...
 2014-06-17 10:37:56 -04:00
tim 8ac6ce17bc Fixed issue DateTime handling in filter queries that broke timeline view. 2014-06-15 13:05:25 -07:00
Isaac Connor b48d06b279 change commands to handle if db already has the User and Pass fields 2014-06-13 16:09:01 -04:00
Kyle Johnson 5e7cdc44a8 Made the contribution section of the readme more clear 2014-06-11 09:33:15 -04:00
Kyle Johnson 0aa5591774 Changes to the Contribution section of the readme 2014-06-11 09:30:30 -04:00
Kyle Johnson 047cff8038 Added contribution and development tips to README 2014-06-10 15:43:25 -04:00
Kfir Itzhak a9cd6caeaf Minor corrections to cURL code 2014-06-06 09:35:02 +03: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 0898df6535 Fix minor bug 2014-06-06 09:01:03 +03:00
Kfir Itzhak caa0cb0fd5 Bump version to v1.27.1 to fix upgrade db issues 2014-06-06 08:58:35 +03:00
Isaac Connor 5bf894d263 guard against unsafe monitor name 2014-06-05 15:23:15 -04:00
Isaac Connor 0689e8453c guard against dangerous (old or new) monitor names 
by rogerroger288
 2014-06-05 15:21:28 -04:00
Isaac Connor baf5da9561 guard against monitor names being dangerous 
by rogerroger288
 2014-06-05 15:20:04 -04:00
Isaac Connor 93aed26a00 escape username and password inside zm_user 
by rogerroger288
 2014-06-05 15:18:02 -04:00
Isaac Connor 5ae3cb8907 merge some security fixes from rogerroger288 2014-06-05 15:14:12 -04:00
Kyle Johnson fa2371f8e6 Merge pull request #438 from bountysource-support/patch-1 
Add Bountysource badge to README
 2014-06-05 10:58:19 -04:00
bountysource-support 007eadeb19 Add Bountysource badge to README 
Because you have some open bounties, we thought you might want to display this badge in your README!
 2014-06-04 14:42:42 -07:00
Isaac Connor a73e367d5e add libav-tools as an option instead of ffmpeg 2014-06-04 11:21:43 -04:00
stevegilvarry 755a2c9618 Remove Modern Branch for now 2014-05-31 06:12:44 +10:00
stevegilvarry 189f6cba54 Add zm_videostore.cpp to CMakeLists.txt 2014-05-30 13:31:49 +10:00
Will W 3267b59cb5 Add html5 video control to timeline and event to support mkv playback 2014-05-30 12:40:33 +10:00
Will W e45635ed57 Updates to make gcc happy 2014-05-30 02:05:20 +10:00
Will W 5051c26d31 Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem) 2014-05-30 02:05:20 +10:00
stevegilvarry 33090f2264 Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/zm_config_defines.h
	src/zm_ffmpeg.h
	web/index.php
 2014-05-30 01:55:24 +10:00