1
1
Fork 0
Commit graph

24050 commits

Author SHA1 Message Date
Hypolite Petovan 470dd6079e Update default log location
- Prevents conflict with /friendica module
2019-06-21 08:52:22 -04:00
Hypolite Petovan f0849b0a93
Merge pull request #7284 from annando/fix-fatal
Don't send activities to "null" endpoints
2019-06-19 23:42:21 -04:00
Michael 2e4e8bdf0a Don't send activities to "null" endpoints 2019-06-20 03:06:34 +00:00
Hypolite Petovan 2ba4116118
Merge pull request #7282 from annando/issue-6477
Issue 6477: Automatically repair self contact avatar
2019-06-19 16:12:56 -04:00
Michael Vogel e0b936e334
Merge pull request #7283 from annando/7280-fix
Self merging due to critical bug fixes
2019-06-19 20:40:19 +02:00
Michael f878cc2623 Fix for PR 7280 2019-06-19 18:38:22 +00:00
Michael d8ed2ed76d it is poll, not notify 2019-06-19 18:32:38 +00:00
Michael b55546b726 Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477 2019-06-19 18:26:59 +00:00
Hypolite Petovan 105c126756
Merge pull request #7280 from annando/contact-baseurl
Fix the base url detection of AP profiles
2019-06-19 14:12:47 -04:00
Michael 6bd5be281e Normalise it 2019-06-19 17:21:35 +00:00
Michael 4ab772ed67 Issue 6477: Automatically repair self contact avatar 2019-06-19 17:05:29 +00:00
Michael b48a49b0f5 Added timeout 2019-06-18 08:05:45 +00:00
Michael ea90554e7f Fix the base url detection of AP profiles 2019-06-18 07:47:21 +00:00
Hypolite Petovan 2c19b8c8e6
Merge pull request #7277 from annando/ignore-resharer
Issue #5983: Ignore reshares from blocked and ignored contacts
2019-06-17 09:01:31 -04:00
Michael 496910e750 Issue #5983: Ignore reshares from blocked and ignored contacts 2019-06-17 11:55:19 +00:00
Michael Vogel 80dce42aab
Merge pull request #7276 from MrPetovan/bug/7275-share-new-lines
Fix reshare new lines display
2019-06-17 08:13:59 +02:00
Hypolite Petovan d54e778f30 Move share conversion at the end of Text\BBCode::convert 2019-06-16 23:13:26 -04:00
Philipp 43ba24fb29
Merge pull request #7274 from MrPetovan/bug/7271-allow-brackets-in-urls
Perform link replacement at the end of BBCode::convert
2019-06-16 15:27:17 +02:00
Hypolite Petovan da56e0a541 Add tests folder to typo console coverage
- Use correct config object in Console\Typo
2019-06-15 22:27:20 -04:00
Hypolite Petovan 84ccaf50fa Allow brackets in URLs
- Remove obsolete $URLSearchString variable
- Add related tests
2019-06-15 22:26:29 -04:00
Hypolite Petovan 38311a4a02 Move link conversion to the end of BBCode::convert
- Addresses https://github.com/friendica/friendica/issues/7271
- Add related tests
2019-06-15 22:24:51 -04:00
Philipp dc95d7c4f0
Merge pull request #7273 from MrPetovan/bug/notices
Fix various notices 2019.06
2019-06-16 00:58:22 +02:00
Hypolite Petovan 14725bbd6a Fix undefined index addr notices in Model\Contact::getIdForURL
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502393030
2019-06-15 17:16:10 -04:00
Hypolite Petovan aa5a61baef Fix variable by reference notice in Module\Admin\Federation
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502347979
2019-06-15 17:12:36 -04:00
Hypolite Petovan 75894fa275 Use item created date if edited doesn't exist in Protocol\Diaspora::buildStatus
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502347886
2019-06-15 17:11:01 -04:00
Hypolite Petovan da114445c9
Merge pull request #7268 from annando/issue-5983
Issue 5983: Central check for blocked and ignored contacts added
2019-06-15 16:53:41 -04:00
Philipp 808cb39125
Merge pull request #7272 from MrPetovan/bug/directory-links
Fix directory entry display (including wrong links)
2019-06-15 15:17:20 +02:00
Hypolite Petovan 394159d41e Use correct entry list in Module\Directory 2019-06-15 08:44:55 -04:00
Hypolite Petovan 68c65af046 Remove unused Module\Directory::init method 2019-06-15 08:44:36 -04:00
Michael f6f22378f1 Ignored stuff must be stored. 2019-06-14 18:34:17 +00:00
Michael Vogel 097ecdd106
Merge pull request #7266 from MrPetovan/bug/notices
Add type-hint in ActivityPub\Receiver::fetchObject to catch wrong type coercion
2019-06-14 15:03:30 +02:00
Michael Vogel dc3bbb749b
Merge pull request #7270 from MrPetovan/bug/7269-fetch-routes
Define expected /fetch module routes
2019-06-14 13:24:43 +02:00
Hypolite Petovan 95094aa53d Check for existing protocols.inbound value in Protocol\PortableContact 2019-06-14 06:25:44 -04:00
Hypolite Petovan 9f2529df30 Define expected /fetch module routes 2019-06-14 06:22:01 -04:00
Hypolite Petovan fa3b5f2bbd
Merge pull request #7267 from annando/notice
Avoid a notice in AP Receiver
2019-06-14 06:01:52 -04:00
Michael 2482072457 Issue 5983: Central check for blocked and ignored contacts added 2019-06-14 05:25:10 +00:00
Michael e4efddbabb Avoid a notice in AP Receiver 2019-06-14 02:58:40 +00:00
Hypolite Petovan 66d4f1d40b Add type-hint in ActivityPub\Receiver::fetchObject to catch wrong type coercion 2019-06-13 19:07:39 -04:00
Hypolite Petovan af9ce6b92a Add type-hint for dynamic variables in DBA 2019-06-13 19:07:04 -04:00
Hypolite Petovan 9054e00873
Merge pull request #7265 from annando/issue-7264
Issue 7264: Count local delivery as well
2019-06-13 16:51:03 -04:00
Michael f41513f4ec Issue 7264: Count local delivery as well 2019-06-13 20:24:49 +00:00
Hypolite Petovan a74b069728
Merge pull request #7263 from nupplaphil/bug/6917-php_warning
Add additional check for $links in Probe
2019-06-13 11:50:45 -04:00
Philipp Holzer a85aa24d56
Add additional check for $links in Probe
see https://github.com/friendica/friendica/issues/6917#issuecomment-501661530
2019-06-13 15:01:24 +02:00
Philipp 41edbfd24a
Merge pull request #7262 from MrPetovan/bug/6410-normalize-message-button
Restore show_connect flag in Model\Profile::sidebar
2019-06-13 12:34:16 +02:00
Hypolite Petovan 5b291abc7f Restore show_connect flag in Model\Profile::sidebar 2019-06-13 03:26:42 -04:00
Philipp 6c6e3058f2
Merge pull request #7260 from annando/sanitize-input
Sanitize the date for mails
2019-06-13 09:11:41 +02:00
Michael 20eb7ae73f Empty dates are now set to today as well 2019-06-13 05:43:00 +00:00
Hypolite Petovan b44f75d80f
Merge pull request #7261 from annando/issue-7142
Issue 7142: Prevent respawn of "remote self" items
2019-06-13 01:32:20 -04:00
Michael 6970fb2862 Issue 7142: Prevent respawn of "remote self" items 2019-06-13 05:06:52 +00:00
Michael 2ae4371606 Sanitize the date for mails 2019-06-13 03:22:15 +00:00