mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-19 06:18:15 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,384 Commits 80 Branches 104 Tags
181a94de82f7205dcf2c0cb9d960bd5f7ee55e56
Commit Graph

644 Commits

Author SHA1 Message Date
Isaac Connor
b33e35bda7 move the require to the top 2016-05-09 12:14:59 -04:00
Isaac Connor
3522c5796b add BEGIN Back to ZoneMinder.pm 2016-05-09 12:01:26 -04:00
Isaac Connor
e064af4214 Merge branch 'merge_db_connects' into storageareas 2016-05-07 09:35:14 -04:00
Isaac Connor
b444c8a6b4 Move the BEGIN from ZoneMinder to ZoneMinder/Base. 2016-05-07 09:34:45 -04:00
Isaac Connor
6e32b5d266 Use fully specified COnfig hash to simplify Symbol tables 2016-05-07 09:34:04 -04:00
Isaac Connor
1d63062188 Merge branch 'merge_db_connects' into storageareas 2016-05-07 09:30:18 -04:00
Isaac Connor
f55f979cc9 use fully specified Config to simplify symbol tables 2016-05-07 09:30:03 -04:00
Isaac Connor
18442be77f Merge branch 'merge_db_connects' into storageareas 2016-05-03 14:09:18 -04:00
Isaac Connor
e3d581dcab use single quotes instead of double quotes 2016-05-03 10:23:09 -04:00
Isaac Connor
24bf91707f Database module should really use DBI 2016-05-03 10:22:38 -04:00
Isaac Connor
e80db4c433 Use zmDbConnect instead of duplicated db connect code 2016-05-03 10:22:16 -04:00
Isaac Connor
49e3d3be7a Turn the config loading code from a BEGIN to a function that could be called repeatedly. 2016-05-03 10:21:50 -04:00
Isaac Connor
9406a2337f Add a BEGIN section to load things in the correct order. 2016-05-03 10:21:01 -04:00
Isaac Connor
2ba18e14fc Merge branch 'merge_db_connects' into storageareas 2016-05-03 09:05:36 -04:00
Isaac Connor
30f34a6f49 instead of code duplication for opening the db, use zmDbConnect everywhere 2016-05-03 08:59:40 -04:00
Isaac Connor
55d58a140e instead of code duplication for opening the db, use zmDbConnect everywhere 2016-05-03 08:57:51 -04:00
Isaac Connor
408fba8d24 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-04-30 10:09:52 -04:00
Steve Gilvarry
6bf43631e2 Merge pull request #1428 from ZoneMinder/better_zmvideo 
Better zmvideo
 2016-04-28 22:00:52 +10:00
Isaac Connor
0adbaafd98 Merge branch 'master' into storageareas 2016-04-26 13:10:37 -04:00
Andrew Bauer
1072327dd1 remove extra quote 2016-04-21 08:01:13 -05:00
Andrew Bauer
3a9ab7f685 Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option 2016-04-21 07:27:19 -05:00
Isaac Connor
67f38d07df Merge branch 'master' into better_zmvideo 2016-04-20 12:04:15 -04:00
Isaac Connor
a2d92300b3 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-04-11 21:51:41 -04:00
Isaac Connor
60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Andy Bauer
7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Isaac Connor
dd7f399959 Merge branch 'remove_local_zm_conf_override' into storageareas 2016-04-04 16:13:44 -04:00
Isaac Connor
a31660c1f6 Remove the code looks for zm.conf in the current dir. 2016-04-04 10:45:58 -04:00
Isaac Connor
ea49dc20d1 Merge branch 'master' into storageareas 2016-03-30 10:58:07 -04:00
Sándor Czettner
38e3c92546 Minor grammar fixes 2016-03-25 13:18:43 +00:00
Isaac Connor
3a8352eb6b Merge branch 'master' into storageareas 2016-03-21 10:25:03 -04:00
Kyle Johnson
4e1af516d7 Don't output sudo test cmd to /dev/null. Other tests aren't, and info us useful. 2016-03-11 14:29:48 -07:00
Andrew Bauer
facae6cb0d use make "-f" parameter instead of "--makefile" 2016-03-10 13:58:41 -06:00
Isaac Connor
0d8c63f578 Merge branch 'master' into storageareas 2016-03-02 09:11:55 -05:00
Kyle Johnson
bc89b95470 Merge pull request #1292 from ZoneMinder/telemetry 
Telemetry Data
 2016-03-01 07:17:16 -07:00
SteveGilvarry
d40bf89b17 Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
SteveGilvarry
6b169af655 Remove eyezm configdata 
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
 2016-02-26 22:35:24 +11:00
Isaac Connor
86c223668d Merge branch 'master' into storageareas 2016-02-25 19:11:38 -05:00
Andy Bauer
7a42a8c3f9 add Netcat ONVIF compatible ptz control 2016-02-24 10:15:59 -06:00
Isaac Connor
66e76e4c2e Merge branch 'zm_trigger_improvements' into storageareas 2016-02-19 11:09:41 -05:00
Isaac Connor
64c5b64068 Log error before croaking and include port# in the error message 2016-02-19 11:04:02 -05:00
Isaac Connor
327a01cb20 Log error before croaking and show path to file in the error message 2016-02-19 10:59:40 -05:00
Isaac Connor
3a512f87a5 Log the reason for croaking before croaking. 2016-02-19 10:57:52 -05:00
Andy Bauer
ee3f87a2ad additional refinements to zmtelemetry 2016-02-13 14:53:22 -06:00
Isaac Connor
0ff0262c8b Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-12 19:12:12 -05:00
Andrew Bauer
18c493a180 Add getUUID subroutine, Add ZM_TELEMETRY_LAST_UPLOAD 2016-02-10 13:04:14 -06:00
Isaac Connor
b7256a6891 Merge branch 'master' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	version
 2016-02-10 09:17:40 -05:00
Andy Bauer
b718bd298f Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ 2016-02-09 06:56:38 -06:00
Dmitry Smirnov
5bcc414038 codespell: misc. spelling corrections 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-08 20:41:36 +11:00
Andrew Bauer
8a537029ea Initial commit to add zmtelemetry.pl 2016-02-06 14:08:28 -06:00
Isaac Connor
1837cc89ea Merge branch 'schrorg-vivotek-ePTZ' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2016-02-04 12:24:07 -05:00