Isaac Connor
|
cc8de69eba
|
Merge branch 'master' into storageareas
|
2019-01-22 11:44:42 -05:00 |
|
Isaac Connor
|
e60e3666d5
|
Fix comment
|
2019-01-22 10:53:53 -05:00 |
Matt N
|
0619a4a161
|
Validate cnj, obr, and cbr arguments in parseFilter (#2434)
|
2019-01-22 08:03:25 -05:00 |
|
Isaac Connor
|
b8d065275b
|
Merge branch 'master' into storageareas
|
2019-01-04 15:22:18 -05:00 |
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 |
|
Isaac Connor
|
5060358870
|
Merge branch 'master' into storageareas
|
2018-12-29 09:56:53 -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 |
|
Isaac Connor
|
1a1231fdaa
|
Merge branch 'master' into storageareas
|
2018-12-28 10:47:27 -05:00 |
Jonathan Meredith
|
265a73ab29
|
Spelling mistake fix
Changed his to this
|
2018-12-27 22:26:07 -05:00 |
|
Isaac Connor
|
3e06bbcef8
|
Merge branch 'master' into storageareas
|
2018-12-27 13:50:29 -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
|
7a8beffdcc
|
Merge branch 'master' into storageareas
|
2018-12-20 15:10:52 -05:00 |
|
Isaac Connor
|
e626049f6b
|
Merge branch 'swresample' into storageareas
|
2018-12-20 14:08:40 -05:00 |
|
Isaac Connor
|
0c09616059
|
put back privacy notice update
|
2018-12-20 13:58:09 -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 |
|
Isaac Connor
|
3a068ae6a3
|
Merge branch 'master' into swresample
|
2018-12-16 16:15:28 -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 |
|
Isaac Connor
|
0bfe1007c8
|
Merge branch 'master' into storageareas
|
2018-12-14 10:16:08 -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
|
0c7f91c38a
|
Merge branch 'master' into storageareas
|
2018-12-03 16:25:28 -05:00 |
|
Isaac Connor
|
f2f1e230d1
|
put back missing !
|
2018-12-03 16:25:03 -05:00 |
|
Isaac Connor
|
14272a42b4
|
fix use of getcwd in delete_empty_subdirs. We use absolute paths
|
2018-12-03 11:08:24 -05:00 |
|
Isaac Connor
|
7d90a56561
|
Merge branch 'master' into storageareas
|
2018-11-30 14:46:42 -05:00 |
|
Isaac Connor
|
f9139f2d98
|
Use the word skipped instead of aborted
|
2018-11-30 10:48:20 -05:00 |
|
Isaac Connor
|
df0b600431
|
Merge branch 'master' into storageareas
|
2018-11-29 10:49:06 -05:00 |
|
Isaac Connor
|
45a9f9158d
|
spelling mistakes
|
2018-11-29 10:45:30 -05:00 |
|
Isaac Connor
|
1a85e282e2
|
use find_one instead of new. We seem to be comparing against unfound event objects
|
2018-11-29 10:09:49 -05:00 |
|
Isaac Connor
|
4625f7c879
|
Merge branch 'master' into storageareas
|
2018-11-28 10:46:49 -05:00 |
|
Isaac Connor
|
6de704922c
|
Set scheme to '' if undefined to quiet warnings
|
2018-11-27 17:01:49 -05:00 |
|
Isaac Connor
|
e15bbba090
|
Make debug line more useful by printing out the containing directory
|
2018-11-26 15:45:05 -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 |
|
Isaac Connor
|
3f4e918b9e
|
Merge branch 'zmaudit_check_other_storageareas' into storageareas
|
2018-11-26 15:09:14 -05:00 |
|
Isaac Connor
|
d6fb4e1910
|
Add StorageId function to clear Storage when you set a new StorageId. Clear Path when assigning a new StorageArea
|
2018-11-26 15:09:04 -05:00 |