mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-30 00:51:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,384 Commits 66 Branches 101 Tags
181a94de82f7205dcf2c0cb9d960bd5f7ee55e56
Commit Graph

1583 Commits

Author SHA1 Message Date
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
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
d52a6f9a95 Merge branch 'improve_filter' into storageareas 2016-05-27 09:57:05 -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
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