ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,282 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

1884 Commits

Author SHA1 Message Date
techrockedge 571daec8fc Merge branch 'master' of git://github.com/ZoneMinder/zoneminder 
refresh with master
 2019-01-03 15:02:57 -05:00
techrockedge e21b8dc1f9 changed to ZM db functions 2019-01-02 16:01:33 -05:00
techrockedge 51d3e6b2cd changed to ZM db functions 2019-01-02 14:09:35 -05:00
Andrew Bauer bd2b761bcd change configdata.pm.in defaults 2018-12-31 09:54:48 -06:00
techrockedge f25e176b88 added create table if not exist 2018-12-29 20:57:46 -05:00
techrockedge 60d5880694 Merge branch 'master' of git://github.com/ZoneMinder/zoneminder 2018-12-29 19:36:20 -05:00
techrockedge 2cac25d353 removed unused preset code 2018-12-29 19:35:16 -05:00
Andrew Bauer 3258d8e590 remove ZM_DIR_IMAGES (#2374) 2018-12-29 09:52:58 -05:00
techrockedge bcbe9075f9 fixed preset delete and set 2018-12-28 21:11:52 -05:00
techrockedge 826201a3f9 Merge branch 'master' of git://github.com/ZoneMinder/zoneminder 2018-12-28 20:32:04 -05:00
Jonathan Meredith 265a73ab29
Spelling mistake fix 
Changed his to this
 2018-12-27 22:26:07 -05:00
Isaac Connor 08e5166bcb remove quotes around state in command documentation. 2018-12-27 12:24:50 -05:00
Isaac Connor c017219a1e use do instead of many lines of dbi. Cleanup logic around command detection 2018-12-27 12:22:06 -05:00
techrockedge f815aaa5f5 Merge branch 'master' of git://github.com/ZoneMinder/zoneminder 2018-12-21 19:46:45 -05:00
Isaac Connor 88e148068e Logging and whitespace 2018-12-20 13:56:57 -05:00
Isaac Connor 6af8f0d419 Logging and whitespace 2018-12-20 13:55:18 -05:00
Isaac Connor 64bdf40e86 Logging and whitespace changes. No logical changes 2018-12-20 13:50:55 -05:00
Isaac Connor eccfdb8a6a Logging and whitespace changes. No logical changes 2018-12-20 13:50:07 -05:00
techrockedge 180a4b07b1 foscam r2c ptz 2018-12-14 19:13:41 -05:00
techrockedge 51b4c27b27 foscam r2c ptz 2018-12-14 17:30:45 -05:00
Pliable Pixels ebaafef607 Ffmpeg logs optional (#2345) 
* make ffmpeg logs configurable via web

* fix Info
 2018-12-14 08:01:23 -05:00
Isaac Connor b61eb7d4fc Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-12-13 10:53:56 -05:00
Isaac Connor 0c5eead929 Merge branch 'master' into fix_startup_db_connection 2018-12-13 10:53:34 -05:00
Andrew Bauer db81465fa2 allow one to set manpage destination 2018-12-07 09:47:00 -06:00
Isaac Connor f2f1e230d1 put back missing ! 2018-12-03 16:25:03 -05:00
Isaac Connor f9139f2d98 Use the word skipped instead of aborted 2018-11-30 10:48:20 -05:00
Isaac Connor 45a9f9158d spelling mistakes 2018-11-29 10:45:30 -05:00
Isaac Connor b3703a5eed Check in db a second time for the event. Long running zmaudits can find an event in the fs that was created after we loaded all the db events. 2018-11-26 15:16:10 -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 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
Andy Bauer 5b964ba3d5 create the upload folder if it does not exist 2018-10-11 15:57:25 -05:00