Isaac Connor
|
b16cd7ec84
|
Merge branch 'h265' into zma_to_thread
|
2018-11-20 12:38:17 -05:00 |
|
Isaac Connor
|
62e511cfd1
|
Merge branch 'master' into h265
|
2018-11-17 10:41:20 -05:00 |
Andrew Bauer
|
b4f77077e9
|
Update zmdc.pl.in
temporary fix to #2292
|
2018-11-16 18:33:54 -06:00 |
|
Andrew Bauer
|
e5f2212a32
|
fix gpl mailing address
|
2018-11-15 20:00:53 -06:00 |
|
Isaac Connor
|
e24a308481
|
Merge branch 'master' into h265
|
2018-11-14 17:15:37 -05:00 |
|
Isaac Connor
|
35b439629c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-13 18:14:35 -05:00 |
|
Isaac Connor
|
ca87936cd7
|
add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.
|
2018-11-13 14:13:41 -05:00 |
|
Isaac Connor
|
798bf68df1
|
add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.
|
2018-11-13 14:13:32 -05:00 |
|
Isaac Connor
|
31b0ed107d
|
remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258
|
2018-11-13 14:02:44 -05:00 |
Isaac Connor
|
07d6d799ce
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-13 10:30:58 -05:00 |
|
Isaac Connor
|
993da131f1
|
tidy up and use Error instead of Carp::croak
|
2018-11-13 10:29:19 -05:00 |
|
Isaac Connor
|
967fe14b22
|
Add ability to update incorrect starttime.
|
2018-11-11 10:17:32 -05:00 |
|
Isaac Connor
|
1e98ecb595
|
Sort keys in to_string
|
2018-11-09 12:14:39 -05:00 |
|
Isaac Connor
|
5f81e9111f
|
Add Scheme and SaveJPEGs to Event fields, and fix setting Scheme
|
2018-11-09 12:14:05 -05:00 |
|
Isaac Connor
|
abada5c95c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-09 10:47:00 -05:00 |
|
Isaac Connor
|
4ddd328c61
|
Check and Fix Scheme and StorageArea
|
2018-11-09 10:39:57 -05:00 |
Andrew Bauer
|
d6877b763d
|
Merge pull request #2298 from connortechnology/log_use_global_dbh
Use the global dbh in ZoneMinder::Database instead of keeping our own…
|
2018-11-07 12:29:11 -06:00 |
|
Isaac Connor
|
0e3eb0df17
|
remove extra quotes, google code style, update pod docs
|
2018-11-07 11:26:48 -05:00 |
|
Isaac Connor
|
4107082845
|
Don't delete default states if there are none
|
2018-11-07 11:01:49 -05:00 |
|
Isaac Connor
|
0ebcef7324
|
in poddoc and over needs a =back
|
2018-11-07 11:01:12 -05:00 |
|
Isaac Connor
|
56bdd53757
|
Use the global dbh in ZoneMinder::Database instead of keeping our own copy of it in Logger
|
2018-11-07 10:40:44 -05:00 |
|
Isaac Connor
|
4b24bf4e36
|
merge from storageareas, fully specify Module for zmDbDisconnect as we havn't 'used' it
|
2018-11-02 11:48:35 -04:00 |
|
Isaac Connor
|
aaeb30a72f
|
Move license down to perldocs at bottom. Remove unecessary line feeds and spaces
|
2018-10-28 17:50:22 -04:00 |
|
Isaac Connor
|
349693e27d
|
Add a missing comma
|
2018-10-25 11:24:23 -04:00 |
|
Isaac Connor
|
a8329465fb
|
Merge branch 'master' into h265
|
2018-10-22 10:30:01 -04:00 |
Isaac Connor
|
5ab1126260
|
Merge branch 'storageareas' into zma_to_thread
|
2018-10-20 17:31:14 -04:00 |
|
Isaac Connor
|
88b9a1b259
|
Don't auto enable show privacy
|
2018-10-18 08:49:13 -04:00 |
|
Isaac Connor
|
372c6b7f69
|
explicitly call ZoneMinder::Database::zmDbDisconnect
|
2018-10-17 20:57:24 -04:00 |
|
Isaac Connor
|
c2af380e29
|
Merge branch 'master' into storageareas
|
2018-10-16 11:39:26 -04:00 |
|
Isaac Connor
|
7149576a7c
|
Merge branch 'smarter_packetqueue' into storageareas
|
2018-10-15 10:59:50 -04:00 |
Andy Bauer
|
5b964ba3d5
|
create the upload folder if it does not exist
|
2018-10-11 15:57:25 -05:00 |
|
Andrew Bauer
|
71e150daae
|
add missing brackets around second expression in archImagePath
|
2018-10-11 14:32:40 -05:00 |
|
Isaac Connor
|
ad71b0c626
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-11 11:28:17 -04:00 |
|
Isaac Connor
|
428b2506ec
|
Add .mp4 and snapshot files to glob for upload archive
|
2018-10-11 11:28:07 -04:00 |
|
Andrew Bauer
|
7ffc5ab266
|
Merge branch 'master' into control_plugin_psia
|
2018-10-11 09:32:06 -05:00 |
|
Isaac Connor
|
e4de623537
|
Merge branch 'master' into storageareas
|
2018-10-10 14:53:51 -04:00 |
|
Isaac Connor
|
8e053aa04b
|
Merge branch 'master' into storageareas
|
2018-10-10 14:51:52 -04:00 |
|
Andrew Bauer
|
2fbe1be02b
|
implement loadMonitor sub (#2244)
* implement loadMonitor sub
* remove carriabe returns from Info, Warning, Debug statements
|
2018-10-10 14:27:05 -04:00 |
|
Isaac Connor
|
b84234cdf1
|
Remove debug line at INF level
|
2018-10-10 14:22:48 -04:00 |
|
Isaac Connor
|
1958351a13
|
Merge branch 'master' into storageareas
|
2018-10-09 10:24:24 -04:00 |
|
Andrew Bauer
|
c1de20a081
|
use $Event rather than $event (#2240)
|
2018-10-08 09:25:17 -04:00 |
|
Isaac Connor
|
4a642e1a9d
|
pass Event instead of event to executeCommand
|
2018-10-08 08:31:16 -04:00 |
|
Isaac Connor
|
9275a1d046
|
fix missing spaces after 'to' and some spacing and quotes
|
2018-10-05 09:45:47 -04:00 |
|
Isaac Connor
|
56b31becb2
|
Add explicit db disconnect in Fatal(). If we don't disconnect then we leave sockets hanging around in TIME_WAIT (I think).
|
2018-10-04 10:47:38 -04:00 |
|
Isaac Connor
|
015890a509
|
Merge branch 'master' into storageareas
|
2018-10-02 15:27:12 -04:00 |
|
Isaac Connor
|
c94367c7ad
|
The uploadArchFile takes an Event object now
|
2018-09-29 08:32:57 -04:00 |
|
Isaac Connor
|
33bd30fbbd
|
Merge branch 'master' into storageareas
|
2018-09-28 13:40:18 -04:00 |
|
Andrew Bauer
|
b533c8b257
|
don't zmMemInvalidate when reloading monitors (#2225)
* remove call to zmMemVerify when reloading monitors
* need to call zmMemVerify to attach to the mem handle
|
2018-09-28 13:35:42 -04:00 |
|
Isaac Connor
|
d45406bce7
|
ode style and some more debug
|
2018-09-28 11:50:34 -04:00 |
|
Isaac Connor
|
e6f366c5cb
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2018-09-28 09:48:37 -04:00 |