Isaac Connor
|
07e988266a
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-09 13:28:40 -04:00 |
|
Isaac Connor
|
1a1e009533
|
simplify use's, add some sth->finishes and move some lines to take properly use DBI
|
2016-05-09 13:28:09 -04:00 |
|
Isaac Connor
|
9d9f2453c3
|
deprecate ConfigAdmin, merge it into Config.pm
|
2016-05-09 13:27:22 -04:00 |
|
Isaac Connor
|
cd8c9703c0
|
remove extra q
|
2016-05-09 12:48:56 -04:00 |
|
Isaac Connor
|
2fec880ff6
|
fix help/description mixup
|
2016-05-09 12:48:35 -04:00 |
|
Isaac Connor
|
5806eb0958
|
Merge branch 'v4l1_compat' into storageareas
|
2016-05-09 12:46:34 -04:00 |
|
Isaac Connor
|
605edfd6d0
|
add ENV{LD_PRELOAD} setting
|
2016-05-09 12:46:26 -04:00 |
|
Isaac Connor
|
08bf97fe85
|
Add a config entry for ZM_LD_PRELOAD
|
2016-05-09 12:44:41 -04:00 |
|
Isaac Connor
|
beebe74e7b
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-09 12:26:17 -04:00 |
|
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
|
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 |
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
|
0da0896757
|
Merge branch 'master' into storageareas
|
2016-04-20 10:01:06 -04:00 |
|
Isaac Connor
|
e52e880553
|
rework open event check to not use group by
|
2016-04-20 10:00:13 -04:00 |
|
Isaac Connor
|
bb15915ce5
|
Use EventPrefix, not Prefix
|
2016-04-19 15:23:36 -04:00 |
|
Isaac Connor
|
588dbc0c3c
|
Don't JOIN MOnitors to get event prefix. Use {->MonitorID} instead
|
2016-04-19 15:22:46 -04:00 |
|
Isaac Connor
|
d9646d6ceb
|
Populate a Monitors hash with the Monitors data so we don't have to use in JOINs later
|
2016-04-19 15:19:37 -04:00 |
abi
|
7058b0862a
|
suppressed warnings of killall for FreeBSD
|
2016-04-16 16:39:58 +03:00 |
|
Isaac Connor
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
|
Isaac Connor
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -04:00 |
|
Isaac Connor
|
87088d95ac
|
change error to Warning... it is possible to not have any filters returned
|
2016-04-05 09:22:36 -04:00 |
Andy Bauer
|
4e9a925933
|
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
|
2016-04-04 20:52:49 -05: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
|
82b32578ec
|
Merge branch 'master' into iconnor_video
|
2016-04-01 12:54:09 -04:00 |
|
Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -04:00 |
|
Isaac Connor
|
e5a36c02bd
|
Merge remote-tracking branch 'origin/master' into video_remote
|
2016-03-30 16:55:24 -04:00 |
|
Isaac Connor
|
ea49dc20d1
|
Merge branch 'master' into storageareas
|
2016-03-30 10:58:07 -04:00 |
Isaac Connor
|
22554603b1
|
remove duplicate zmtelemetry.pl entry
|
2016-03-29 12:31:27 -04:00 |
|
Isaac Connor
|
f0a307e082
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
Conflicts:
distros/ubuntu1504_cmake/control
|
2016-03-29 11:53:17 -04:00 |
|
Isaac Connor
|
e3564f6a63
|
add zmtelemtry.pl
|
2016-03-29 11:51:03 -04:00 |
Sándor Czettner
|
38e3c92546
|
Minor grammar fixes
|
2016-03-25 13:18:43 +00:00 |