Isaac Connor
|
e29a0ebe71
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-06-21 13:48:32 -04:00 |
|
Isaac Connor
|
1069b301a0
|
functions have been moved from ConfigAdmin to Config
|
2016-06-12 15:38:59 -04:00 |
Isaac Connor
|
76cb031a5e
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-06-12 07:14:30 -04:00 |
|
Isaac Connor
|
c0cb1419a3
|
fixup delete_empty_directories
|
2016-06-07 22:03:46 -04:00 |
|
Isaac Connor
|
eb4e36789d
|
maybe fix delete_empty_directories
|
2016-06-07 21:43:47 -04:00 |
|
Isaac Connor
|
5ff53ebce0
|
More output on errors, make them non-fatal
|
2016-06-07 21:37:33 -04:00 |
|
Isaac Connor
|
b081d2e3bf
|
rename fs_monitor to monitor_id, which is what it is
|
2016-06-06 10:30:52 -04:00 |
|
Isaac Connor
|
2460bccdac
|
fix missing $
|
2016-06-06 10:18:21 -04:00 |
|
Isaac Connor
|
5f83bac59c
|
add line to delete empty directories
|
2016-06-03 12:01:31 -04:00 |
|
Isaac Connor
|
ad185809f8
|
Merge branch 'fix_zmaudit' into storageareas
|
2016-06-03 11:57:38 -04:00 |
|
Isaac Connor
|
575180ba5e
|
introduce new function that recursively deletes empty directories. Call it on each monitor dir
|
2016-06-03 11:35:28 -04:00 |
|
Isaac Connor
|
ef9c0ca33a
|
Debug the SQL on execute, not on parse
|
2016-06-03 11:15:40 -04:00 |
|
Isaac Connor
|
b8c406f969
|
Merge branch 'master' into storageareas
|
2016-06-03 09:32:55 -04:00 |
|
Isaac Connor
|
b8cf7c04c1
|
Fix messed up SQL. die when the selectFrameData sql doesn't execute
|
2016-05-31 09:14:50 -04:00 |
|
Isaac Connor
|
8a14d6f4d2
|
Don't not load the event if it was videod before
|
2016-05-30 14:57:46 -04:00 |
|
Isaac Connor
|
409545b386
|
Add concat to the usage line and format it better
|
2016-05-30 14:08:38 -04:00 |
|
Isaac Connor
|
326c4f1fee
|
Check for existence of libraries specified in LD_PRELOAD and warn about them not existing
|
2016-05-30 14:08:08 -04:00 |
|
Isaac Connor
|
4469f909fa
|
Add support for DefaultVideo to video generation
|
2016-05-30 14:07:40 -04:00 |
|
Isaac Connor
|
07878e3e13
|
Put back the code that makes getDiskPercent look in the storagearea
|
2016-05-30 10:43:51 -04:00 |
|
Isaac Connor
|
886d88b184
|
Merge branch 'improve_filter' into storageareas
|
2016-05-30 09:30:18 -04:00 |
|
Isaac Connor
|
2da709848a
|
remove extra comma screwing up the sql
|
2016-05-30 09:30:02 -04:00 |
|
Isaac Connor
|
63ac75b440
|
use ::Database::dbh instead of 3013self{dbh}
|
2016-05-30 09:27:36 -04:00 |
|
Isaac Connor
|
2663781adc
|
put back missing my =__git_main[0];
|
2016-05-30 09:13:39 -04:00 |
|
Isaac Connor
|
7bc95561ad
|
fix
|
2016-05-29 11:37:32 -04:00 |
|
Isaac Connor
|
408646ea4d
|
remove extra s
|
2016-05-27 10:52:59 -04:00 |
|
Isaac Connor
|
d52a6f9a95
|
Merge branch 'improve_filter' into storageareas
|
2016-05-27 09:57:05 -04:00 |
|
Isaac Connor
|
1983f106f4
|
Add a missing sth->finish
|
2016-05-27 09:01:01 -04:00 |
|
Isaac Connor
|
b0116f25e9
|
put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo
|
2016-05-27 08:59:46 -04:00 |
|
Isaac Connor
|
419e67caa1
|
Put back the code that populates ZM_SERVER_ID
|
2016-05-26 12:42:22 -04:00 |
|
Isaac Connor
|
05709f3084
|
Merge branch 'id_on_console' into storageareas
|
2016-05-26 11:17:41 -04:00 |
|
Isaac Connor
|
f969186abb
|
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
|
2016-05-26 11:15:13 -04:00 |
|
Isaac Connor
|
b9322a02e8
|
Merge branch 'get_rid_of_ConfigAdmin' into storageareas
|
2016-05-26 09:56:16 -04:00 |
|
Isaac Connor
|
e329bacb78
|
remove deprecated ConfigAdmin
|
2016-05-26 09:51:48 -04:00 |
|
Isaac Connor
|
7a08d4620f
|
Merge branch 'master' into storageareas
|
2016-05-25 10:17:46 -04:00 |
Isaac Connor
|
a0af99459a
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-25 10:12:22 -04:00 |
Isaac Connor
|
aedba1bc7f
|
whitespace, google code style. Adds special cases for ServerId Attribute. ANd uses * to load all event fields instead of specifying each one.
|
2016-05-24 16:49:04 -04:00 |
|
Isaac Connor
|
8fabeb78d3
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-05-24 15:55:49 -04:00 |
Isaac Connor
|
3f880fad3a
|
Merge pull request #1500 from knnniggett/zmdc_unlink
remove one unlink, add better error reporting to the rest
|
2016-05-24 14:35:39 -04:00 |
Andrew Bauer
|
0052bb080c
|
unlink only if file exists
|
2016-05-24 12:13:17 -05:00 |
|
Andrew Bauer
|
11701357aa
|
remove one unlink, add better error reporting to the rest
|
2016-05-24 09:01:32 -05:00 |
|
Andrew Bauer
|
bc163b33fc
|
move multiserver message to once during startup only
|
2016-05-23 20:06:29 -05:00 |
josh4trunks
|
57a25373fa
|
Add logic to Config.pm
|
2016-05-22 08:53:30 -07:00 |
|
josh4trunks
|
a3fe6ea181
|
Apply changes to Logger.pm
|
2016-05-22 08:28:23 -07:00 |
|
josh4trunks
|
38e1cc909c
|
Reapply changes to Database.pm
|
2016-05-22 08:19:18 -07:00 |
|
Isaac Connor
|
1e52934dcf
|
Implement a time function that gets unix_timestamp from StartTime, and implement check_for_files_in_filessytem
|
2016-05-20 20:33:47 -04:00 |
|
Andrew Bauer
|
8bbb443c67
|
fix invalid key name in config hash
|
2016-05-20 10:35:03 -05:00 |
|
Isaac Connor
|
bb5dbf3e4a
|
Need to import Config Data into Config
|
2016-05-20 09:29:40 -04:00 |
|
Isaac Connor
|
182fa9a5cd
|
revert the bulk of the merge_db_connects changes.
|
2016-05-20 08:53:53 -04:00 |
|
Isaac Connor
|
924acf4284
|
fix zmdc.pl hang due to needing to connect to db after fork
|
2016-05-19 15:01:31 -04:00 |
|
Isaac Connor
|
8e06c0ec63
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-05-19 12:08:56 -04:00 |
|
Isaac Connor
|
183f9c70a4
|
Must use ZoneMinder instead of ZoneMinder::Logger
|
2016-05-19 12:08:45 -04:00 |
|
Isaac Connor
|
d57690903d
|
Must use ZoneMinder instead of ZoneMinder::Logger
|
2016-05-19 12:08:25 -04:00 |
Andrew Bauer
|
8bac5fbdfb
|
typo - remove extra comma
|
2016-05-18 16:58:04 -05:00 |
|
Andrew Bauer
|
46039a1887
|
Merge pull request #1472 from ZoneMinder/v4l1_compat
V4l1 compat
|
2016-05-16 13:02:27 -05:00 |
|
Isaac Connor
|
0b00659f26
|
Merge branch 'update_zmupdate' into storageareas
|
2016-05-16 12:24:14 -04:00 |
|
Isaac Connor
|
b53a0a564d
|
Don't need the extra use ZoneMinder::Config
|
2016-05-16 10:07:24 -04:00 |
|
Isaac Connor
|
dd24c35afa
|
revert bogus optimisation
|
2016-05-16 10:05:12 -04:00 |
|
Isaac Connor
|
3780f8a2e6
|
move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module
|
2016-05-16 09:31:54 -04:00 |
|
Isaac Connor
|
5df85770cd
|
zmupdate.pl.in
|
2016-05-13 13:52:34 -04:00 |
|
Isaac Connor
|
3a0aa09c2f
|
Force reconnect to the db after fork.
|
2016-05-13 09:09:49 -04:00 |
|
Isaac Connor
|
e9d8b7925a
|
Merge branch 'db_reconnect' into storageareas
|
2016-05-10 11:13:09 -04:00 |
|
Isaac Connor
|
aaa4b3a824
|
check for db connection before assuming that dbh is valid
|
2016-05-10 11:11:45 -04:00 |
|
Isaac Connor
|
a5ba4759bf
|
fix new config entry
|
2016-05-10 10:54:40 -04:00 |
|
Isaac Connor
|
17f4f5789e
|
Merge branch 'master' into v4l1_compat
|
2016-05-10 10:10:48 -04:00 |
|
Isaac Connor
|
56e0e4e3c6
|
Use Event->getPath instead of something wrong
|
2016-05-10 09:07:09 -04:00 |
|
Isaac Connor
|
a012320a3e
|
Whitespace and code style changes. Change Event->getEventPath to Event->getPath to sync with PHP version
|
2016-05-10 09:06:49 -04:00 |
|
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 |
|
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
|
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 |