Isaac Connor
|
0ebcef7324
|
in poddoc and over needs a =back
|
2018-11-07 11:01:12 -05:00 |
|
Isaac Connor
|
4993894b27
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-07 10:43:41 -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
|
c0c1247fa0
|
bump verion to 1.32.2
|
2018-11-07 10:33:55 -05:00 |
Isaac Connor
|
93bf05be4e
|
Merge branch 'zmrecover' into storageareas
|
2018-11-06 20:37:35 -05:00 |
|
Isaac Connor
|
9a96785fa4
|
Add in Frame.php
|
2018-11-06 20:37:00 -05:00 |
|
Isaac Connor
|
5495ab8036
|
Fix package for Event
|
2018-11-06 16:15:27 -05:00 |
|
Isaac Connor
|
c60bd3af1e
|
Need to new an Event
|
2018-11-06 15:43:22 -05:00 |
|
Isaac Connor
|
5a6ffe758a
|
Merge branch 'zmrecover' into storageareas
|
2018-11-06 15:29:02 -05:00 |
|
Isaac Connor
|
f86ed5c66c
|
allow interactive=0 and use Inf for log lines about resurecting events
|
2018-11-06 15:28:56 -05:00 |
|
Isaac Connor
|
181a8c29e1
|
Add SaveJPEGs to Event
|
2018-11-06 15:28:37 -05:00 |
Isaac Connor
|
be0767b4cd
|
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
|
2018-11-06 15:27:17 -05:00 |
|
Isaac Connor
|
5a933a93c2
|
clean up static vars and google code style
|
2018-11-06 15:27:10 -05:00 |
|
Isaac Connor
|
6d6d25261f
|
Merge branch 'zmrecover' into storageareas
|
2018-11-06 12:14:54 -05:00 |
|
Isaac Connor
|
3cd1887d54
|
Cleanup POSIX use. Fix conflict between POSIX and Date::Format.
|
2018-11-06 12:14:42 -05:00 |
|
Isaac Connor
|
d973d55d2f
|
Use SaveJPEGs from the Event record instead of the Monitor Object
|
2018-11-06 11:45:34 -05:00 |
|
Isaac Connor
|
aa9bb81b61
|
Merge branch 'zmrecover' into storageareas
|
2018-11-06 09:57:01 -05:00 |
|
Isaac Connor
|
e0bc0484d4
|
Add empty string default for DefaultVideo
|
2018-11-06 09:56:29 -05:00 |
|
Isaac Connor
|
18b327b4ac
|
Turn off massive debugging
|
2018-11-06 09:55:53 -05:00 |
Andrew Bauer
|
ec95163810
|
Add fedora 29 support to buildsystem
|
2018-11-05 19:35:05 -06:00 |
|
Isaac Connor
|
762874fb4a
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-11-05 16:53:17 -05:00 |
|
Isaac Connor
|
e1a5940254
|
Merge branch 'zmrecover' into storageareas
|
2018-11-05 16:53:01 -05:00 |
|
Isaac Connor
|
451c42ddf5
|
Implement rmrecover script. Flush out Object code to support find, find_one, find_sql, improve to_string, etc.
|
2018-11-05 16:52:34 -05:00 |
|
Andrew Bauer
|
d3064e4402
|
Update zoneminder.spec
|
2018-11-05 07:06:34 -06:00 |
|
Andrew Bauer
|
b8066e66ed
|
Update zoneminder.spec
|
2018-11-05 06:51:08 -06:00 |
|
Andrew Bauer
|
720505cbea
|
spelling
|
2018-11-04 17:14:46 -06:00 |
|
Andrew Bauer
|
e6e7069ec0
|
Merge pull request #2293 from knight-of-ni/rpm-nginx
update nginx support on redhat
|
2018-11-04 17:13:11 -06:00 |
Andy Bauer
|
3aee902a96
|
update nginx support on redhat
|
2018-11-04 17:11:19 -06:00 |
|
Andrew Bauer
|
6360b84e15
|
Merge pull request #2288 from connortechnology/add_monitor_status_to_api
rough in adding Monitor_Status to Monitors
|
2018-11-03 20:46:11 -05:00 |
|
Andrew Bauer
|
cac049e2c9
|
Merge pull request #2291 from pliablepixels/api-updates
updated API - streaming/server/storage/other edits
|
2018-11-03 20:45:52 -05:00 |
|
Andrew Bauer
|
0e6fbe2213
|
Merge pull request #2286 from ratmole/api-php-notice-fix
API - Disable E_NOTICE from php error reporting in cake debug
|
2018-11-03 20:41:52 -05:00 |
|
Andrew Bauer
|
a50c2bae35
|
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg
Audio only with ffmpeg
|
2018-11-03 20:39:18 -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
|
09fab280ea
|
SOCKS dir creation logs should be debug
|
2018-11-02 10:57:47 -04:00 |
|
Isaac Connor
|
17c091f9f9
|
Google code style and add a debug showing the # of addresses in hp
|
2018-11-02 10:26:39 -04:00 |
|
Isaac Connor
|
89c3de432f
|
fix crud version
|
2018-11-01 17:50:51 -04:00 |
Pliable Pixels
|
ace1134df1
|
further reading
|
2018-11-01 14:40:31 -04:00 |
|
Pliable Pixels
|
86a086c216
|
server json api typo
|
2018-11-01 14:13:22 -04:00 |
|
Pliable Pixels
|
14c30eac76
|
typo
|
2018-11-01 14:08:09 -04:00 |
|
Pliable Pixels
|
536d9226e0
|
ptz - clarify this is meta-data
|
2018-11-01 14:07:53 -04:00 |
|
Pliable Pixels
|
46cd2fc3ff
|
relocate monitor_status to the right place
|
2018-11-01 14:04:51 -04:00 |
|
Pliable Pixels
|
cd8d609e84
|
initial multi-server/storage changes
|
2018-11-01 14:00:09 -04:00 |
|
Pliable Pixels
|
2953ff4db4
|
header level fix
|
2018-11-01 13:40:07 -04:00 |
|
Pliable Pixels
|
37b2da59ce
|
added streaming interface docs
|
2018-11-01 13:30:08 -04:00 |
|
Isaac Connor
|
1dac088000
|
Merge branch 'audio_only_with_ffmpeg' into storageareas
|
2018-10-31 14:48:24 -04:00 |
|
Isaac Connor
|
48c9c2b6c0
|
Merge branch 'add_monitor_status_to_api' into storageareas
|
2018-10-31 14:47:52 -04:00 |
|
Isaac Connor
|
eb6d978927
|
Merge branch 'master' into storageareas
|
2018-10-31 14:47:43 -04:00 |
|
Isaac Connor
|
fb25c0c4eb
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-31 11:56:19 -04:00 |
|
Isaac Connor
|
bdb50567df
|
fix disk_event_space to event_disk_space
|
2018-10-31 11:56:08 -04:00 |
|
Isaac Connor
|
589b6f3eef
|
add further note about needing h264 passthrough
|
2018-10-31 11:35:06 -04:00 |