1
0
Fork 0
Commit graph

4021 commits

Author SHA1 Message Date
1ccc1efdcf
Merge pull request #7446 from annando/alt-text
ActivityPub: Support for incoming picture descriptions
2019-07-29 00:57:14 -04:00
ab7db9944d ActivityPub: Support for incoming picture descriptions 2019-07-29 04:35:13 +00:00
0e0fff3324 Correctly escape identifier names
- Add support for schema, multiple tables in $table parameters
- Remove Database->formatTableName method
2019-07-29 00:23:40 -04:00
e556dfd475 Don't deliver nested comments to Diaspora if the previous comment wasn't from Diaspora 2019-07-28 19:13:17 +00:00
50f3098495 Revert adding DBA::toArray to Item::selectToArray 2019-07-28 00:12:49 -04:00
3334a3d497 Fix indent in Model\Item 2019-07-28 00:06:05 -04:00
a61ce4fed0 Ensure *toArray returns an array 2019-07-28 00:03:42 -04:00
Philipp Holzer
2f5928f43a
Refactoring Profile:: selectors 2019-07-28 00:19:38 +02:00
Philipp Holzer
51d2db3998
merge DBA::selectToArray 2019-07-27 23:57:38 +02:00
Philipp Holzer
7613704d2f
improve Profile model 2019-07-27 23:56:54 +02:00
Philipp Holzer
37d03bbeae
Introduce test optimization
- Add static connection for whole tests
- Introduce ExtendedPDO class to enable nested transactions
- Add rollback logic for tests to ensure reliability and increase speed
2019-07-27 23:54:13 +02:00
Philipp Holzer
07aaf292ec
Fix tests 2019-07-27 23:54:13 +02:00
Philipp Holzer
2a87464c97
Replace q() call with Profile::get() method 2019-07-27 23:54:12 +02:00
Philipp Holzer
6c2cf494b5
Remove DependencyFactory
- Include all necessary classes in `dependencies.config.php`
- Add DI-reference to BaseObject (acts as a global registry)
- Refactor all static "init()" methods to use the global registry

- Refactor Logging for Worker-Logger a little bit
2019-07-27 23:54:12 +02:00
8b344141da
Merge pull request #7434 from annando/contact-protocol
New functions to check if a contact supports that protocol
2019-07-27 17:47:54 -04:00
f5cb6148cf Improved documentation 2019-07-27 21:45:36 +00:00
Philipp
b5a9a1f1d3
Merge pull request #7435 from annando/select-to-array
Added "selectToArray" functions in DBA and Item
2019-07-27 19:45:32 +02:00
5d9472dccf Type hints 2019-07-27 17:00:06 +00:00
f48452dd29 Some more 2019-07-27 16:57:00 +00:00
580f9cf6c7 Replaced some " with ' 2019-07-27 16:53:48 +00:00
555c444b4e Moved function to Database.php 2019-07-27 16:08:48 +00:00
1a3bf05dfb Changed "Contact::select" to "Contact::selectToArray" 2019-07-27 15:57:23 +00:00
89454fabdb Changed "Photo::select(" to "Photo::selectToArray(" 2019-07-27 15:52:02 +00:00
ac6bfd3e4c Changed Attach::select to Attach::selectToArray 2019-07-27 15:47:17 +00:00
975ff86bae Fix: The $contact error is expected to be a single row array 2019-07-27 15:40:43 +00:00
2be0ceac6b Added "selectToArray" functions in DBA and Item 2019-07-27 14:33:17 +00:00
264936100f New functions to check if a contact supports that protocol 2019-07-27 11:09:12 +00:00
eaf217ef7d Update server block admin page to reflect the addition of shell wildcard syntax 2019-07-25 22:37:30 -04:00
1dbdb9dd15 Update server block console help text to reflect the addition of shell wildcard syntax 2019-07-25 22:37:14 -04:00
46f7b79c7d Switch server blocklist check to case-insensitive shell wildcard 2019-07-25 22:36:25 -04:00
Philipp
56e0a92d83
Merge pull request #7425 from MrPetovan/task/2fa-ping-disallowed
2FA: Remove mod/ping from exception list
2019-07-25 08:49:20 +02:00
d75e3e1650
Merge pull request #7430 from annando/contact-not-archived
"all contacts" shouldn't show archived contacts
2019-07-24 16:00:41 -04:00
e256876ec1 Support for empty nick names 2019-07-24 19:30:36 +00:00
aac086bf91 "all" contacts shouldn't show archived contacts 2019-07-24 19:29:45 +00:00
4ec4a04e49 Remove mod/ping from 2fa exception list
- Prevent asynchronous calls to redirect to /2fa in case of missing valid 2fa session
2019-07-23 20:03:08 -04:00
4821fe1b98 Use template-displayed errors in TwoFactor\Verify
- Remove the page dependency on jGrowl notices
2019-07-23 20:02:26 -04:00
56afc43b21 Extend the use of exceptions in App::runFrontend
- Replace an explicit header locatiobn + exit with System::externalRedirect
2019-07-23 20:01:45 -04:00
3812d3d445 Enable two-factor app-specific passwords for ejabberd 2019-07-23 05:11:33 -04:00
64b10205bc
Merge pull request #7420 from annando/reshare-contact
Fix contact issues with fake reshares from Twitter
2019-07-23 05:05:44 -04:00
2a213c215e Fix contact issues with fake reshares from Twitter 2019-07-23 04:26:20 +00:00
8677428edb Remove debug 2019-07-22 17:41:21 -04:00
cd257dc7e8 Enable app-specific password authentication for API login 2019-07-22 07:56:36 -04:00
1a164b0dc5 Add two-factor app-specific password settings page
- Add two-factor app-specific model
- Add link to new page from 2fa settings index page
2019-07-22 07:56:00 -04:00
a149d6ec44 Move recovery code model to sub-folder 2019-07-22 07:41:01 -04:00
1d8b809227
Merge pull request #7414 from annando/fetch-diaspora
Fetch Diaspora posts by url
2019-07-22 07:01:42 -04:00
105378f5a4 Changed regexp 2019-07-22 06:03:18 +00:00
55e2006312
Merge pull request #7412 from nupplaphil/task/dice
Introduce DICE
2019-07-21 11:04:41 -04:00
Philipp Holzer
05102911db
Fix App\Mode determination 2019-07-21 14:40:50 +02:00
Philipp Holzer
7aa9917ca8
Fix DB_UPDATE_VERSION constant 2019-07-21 14:34:42 +02:00
Philipp Holzer
a8e6a57e9b
Fixing installer 2019-07-21 14:21:02 +02:00
53ffe5a2e1 Fetch Diaspora posts by url 2019-07-21 07:37:50 +00:00
a11206dbcd Issue 6675: Improved check for follower, removed global setting 2019-07-21 05:56:57 +00:00
Philipp
c6131c057b
Merge pull request #7411 from annando/ap-quote
Preparation for quoted reshares on AP
2019-07-21 01:49:22 +02:00
Philipp Holzer
55999730e0
Introduce DICE
- Adding dice library
- Adding dependency config

- Removing Factories
- Refactoring App\Mode constructor
- Refactoring App\Router constructor
- Refactoring BasePath for DI usage
- Refactoring ConfigFileLoader constructor
- Refactoring Profiler constructor

- Adjust entrypoints (index, console, worker, ..)

- Adding functional test for DI
- Fix tests because of refactorings
2019-07-21 01:22:10 +02:00
23830dc45f Preparation for quoted reshares on AP 2019-07-20 21:32:19 +00:00
6df53624c7 Remove confusing extraneous success_update >= failure_update conditions 2019-07-20 13:34:08 -04:00
f5e07be04e Fix undefined property notice in L10n\L10n 2019-07-18 21:21:16 -04:00
3f85a921da Force invite remaining variable to be integer in Content\Widget
- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-512786156
2019-07-18 08:42:07 -04:00
931c190566 Removed test output 2019-07-18 06:20:54 +00:00
1553581175 Merge remote-tracking branch 'upstream/develop' into fetch-item 2019-07-18 06:16:40 +00:00
c771c575a7 Fix PR 7399: Added missing "use" 2019-07-18 06:12:43 +00:00
41a1c1c3e6 Fetch items by given uri 2019-07-18 06:11:02 +00:00
Michael Vogel
dcebf53ecf
Merge pull request #7402 from MrPetovan/bug/7401-node-settings-style
Ensures node theme settings are used to render theme embed
2019-07-18 06:32:40 +02:00
477a84a8c4 Ensures node theme settings are used to render theme embed 2019-07-17 23:25:22 -04:00
9b927fa333
Merge pull request #7399 from annando/only-sharer
Added the option to only receive top level posts from people you follow
2019-07-17 20:53:28 -04:00
e247a14d2b Added the option to only receive top level posts from people you follow 2019-07-17 21:37:13 +00:00
4fc3eb8f06
Merge pull request #7398 from annando/fetch-posts
Preparation for being able to fetch AP posts by proving the URL
2019-07-17 16:01:19 -04:00
a80a6bec74 Preparation for being able to fetch AP posts by proving the URL 2019-07-17 19:36:32 +00:00
11e4f906c2
Hot-fix: Core\L10n::t method passing parameter bug
Follow-up to #7379
2019-07-16 21:18:25 -04:00
0b97b32a59
Merge pull request #7379 from nupplaphil/task/refactor_l10n_for_test
Refactor L10n for testing
2019-07-16 16:03:42 -04:00
3b1f777d0c
Merge pull request #7391 from annando/warning
Avoid a warning in Notifier worker
2019-07-16 16:03:17 -04:00
379a1a52e0 Avoid a warning 2019-07-16 19:58:47 +00:00
Philipp Holzer
346290cc23
Reverted indention 2019-07-16 21:54:22 +02:00
Philipp Holzer
46a260aa01
Fix indentations 2019-07-16 20:19:56 +02:00
Philipp Holzer
92fb0a82ca
Dynamic config loading
- Move settings, defaults and dbstructure to directory 'static'
- Dynamic loading of config files (after the static loading)
- Filter out '-sample.config.php' and '-sample.ini.php' files
- Remove unnecessary ConfigFileManager
- Move ConfigFileLoader to Utils
- Add tests for multi-loading for INI, config and sample-filtering
2019-07-16 20:16:43 +02:00
Philipp Holzer
79e69ee528
Fix language (again ;-) ) 2019-07-16 16:50:49 +02:00
Philipp Holzer
eb024a3718
Refactor L10n for testing
- Moving L10n to L10n\L10n
- Adding constructor information
- Adding to factory
- simplify/speedup tests
2019-07-16 16:44:47 +02:00
Philipp
966043712f
Merge pull request #7389 from MrPetovan/bug/7387-local_user-int
Ensure NULL isn't passed to Feature::isEnabled
2019-07-16 16:37:38 +02:00
c6cd2b131d Add transitive type hints in Core\PConfig 2019-07-16 07:45:24 -04:00
8c2f50eb72 Issue 7315: Set the forum's contact id for forum posts 2019-07-16 05:07:26 +00:00
Michael Vogel
bb83f23e26
Merge pull request #7386 from MrPetovan/bug/7293-hide-registration-link
Hide registration button on login page when registration are closed
2019-07-16 05:38:12 +02:00
68f5b639eb Restore $uid parameter integer type-hint in Config
- Add integer type-hint to Feature::isEnabled
2019-07-15 22:00:49 -04:00
19247b62ae Ensure $uid parameter of Feature::isEnabled to be an integer 2019-07-15 22:00:49 -04:00
e9511b4f34
Merge pull request #7388 from annando/issue-7315
Issue 7315: Changed handling of "Group" posts
2019-07-15 16:32:42 -04:00
d1c048cd4b
Fix typo in Model\Config\PConfig 2019-07-15 16:32:13 -04:00
1a213bd8e8 Issue 7315: Changed handling of "Group" posts 2019-07-15 20:05:36 +00:00
Philipp Holzer
f70271aa5d
Allow nullable UID in PConfigCache 2019-07-15 21:14:13 +02:00
Philipp Holzer
d5de5b6789
Bugfixing bad UIDs for PConfig 2019-07-15 21:11:38 +02:00
Philipp Holzer
ebf00e32a1
minor phpdoc fixings 2019-07-15 20:54:33 +02:00
Philipp Holzer
74f7c16585
Fixup phpdoc 2019-07-15 20:19:52 +02:00
Philipp Holzer
9d98a4ce3a
Refactor PConfiguration 2019-07-15 20:13:53 +02:00
e16c410b59 Hide registration button on login page when registration are closed 2019-07-15 09:11:21 -04:00
ff99a62584
Merge pull request #7384 from nupplaphil/bug/fixing_config_load
Fixing initial load config (Simplify Config Part 3a)
2019-07-15 08:06:29 -04:00
Philipp
e9c6746c3b
Merge pull request #7382 from annando/issue-7367
Issue 7367: Enhanced check when DFRN delivery can be skipped
2019-07-15 09:59:16 +02:00
Philipp Holzer
6801e8b5ab
Fixing initial load config 2019-07-15 08:58:37 +02:00
143566b853 Missing word 2019-07-15 04:36:55 +00:00
6170ddf58d Issue 7367: Only skip DFRN delivery when both author and owner of the post support AP 2019-07-15 04:33:00 +00:00
6c68b8359d
Merge pull request #7372 from nupplaphil/task/simplify_config
Refactor Configuration (Simplify Config Part 3)
2019-07-14 19:05:09 -04:00
Philipp Holzer
4af08d82b2
Added string type-hint for get() and a test case for it 2019-07-14 23:23:20 +02:00
7ce48d1b77
Merge pull request #7376 from annando/contact-update
Contact update overhaul - again
2019-07-14 17:07:04 -04:00
Philipp Holzer
aa249adf6d
some more minor fixups (phpdoc, unused using) 2019-07-14 22:49:17 +02:00
Philipp Holzer
a654470061
fix phpdoc 2019-07-14 22:41:09 +02:00
Philipp Holzer
b48c22dc1a
minor fixing: phpdoc & type-hint 2019-07-14 22:31:53 +02:00
Philipp Holzer
a2c6240da0
some minor fixings 2019-07-14 22:26:36 +02:00
Philipp Holzer
4913502922
bugfix: add lost changes due merge 2019-07-14 22:12:45 +02:00
Philipp Holzer
c293eadb78
Improve & fixing Tests 2019-07-14 22:12:11 +02:00
Philipp Holzer
486f139342
Move Preload/JIT Configuration logic from Adapter to Core-Configuration 2019-07-14 22:09:07 +02:00
83729b8c00 "defaults" is replaced 2019-07-14 16:04:52 +00:00
9ba3ee13a8 Use an insert to avoid duplicates and for analyzing 2019-07-14 10:22:19 +00:00
5bba0e7d39 Hopefully avoiding duplicated relay entries 2019-07-13 23:53:15 +00:00
2df17fc0c0 Fix SQL problem with "not null" 2019-07-13 07:39:53 +00:00
002963f198 Fix wrong variable 2019-07-13 07:29:56 +00:00
9b8396620b Fix duplicated contacts due to relay probing 2019-07-13 07:25:01 +00:00
Philipp Holzer
8c0f047bc7
Add namespace 2019-07-12 23:08:01 +02:00
7dfadf7e7e Simplify the contact update in "getIdForURL" 2019-07-12 21:07:47 +00:00
Philipp Holzer
a30200083a
BugFix: forgot configCache in ConfigFactory 2019-07-12 23:05:48 +02:00
Philipp Holzer
c82127ffb7
Splitting ConfigCache & PConfigCache
- Remove IConfigCache & IPConfigCache
- Add new PConfigCache
- Add missing Logger::init() (bugfixing tests)
2019-07-12 22:53:37 +02:00
c34204cf50 Merge remote-tracking branch 'upstream/develop' into contact-update 2019-07-12 20:51:27 +00:00
b56709d802
Merge pull request #7358 from nupplaphil/bug/installer_db
Bugfixing DB/Installer (Simplify Config Part 1)
2019-07-12 16:48:17 -04:00
8cbdc7939e Fetch more comtact data from probing, remove duplicated contacts 2019-07-12 14:55:23 +00:00
Michael Vogel
807d2665ea Use standard function to update the contact to avoid SQL errors 2019-07-11 22:11:51 +02:00
Michael Vogel
6b25fd5b2f added logging 2019-07-10 05:19:54 +02:00
Michael Vogel
54d96da94a Fix fatal error with incomplete contact data upon delivery 2019-07-10 05:16:50 +02:00
Philipp Holzer
e1d135238a
Revert default password setting & using "HiddenString" even for empty strings 2019-07-09 22:38:54 +02:00
Philipp Holzer
ab7c6499ff
Bugfixing DB/Installer
- default value with HiddenString
- Fixing checkDB during installation
2019-07-09 22:22:06 +02:00
Jeroen De Meerleer
01dc0c031c There are no dead nodes anymore 2019-07-09 09:23:36 +02:00
fe8a53425a
Revert "Changed unavailable to in a relation" 2019-07-08 15:55:08 -04:00
8e2d1fad17
Merge pull request #7347 from JeroenED/task/relationship-status
Changed unavailable to in a relation
2019-07-08 13:02:36 -04:00
d1435bef61 Add ActivityPub related fields to the "uri" function 2019-07-08 12:00:11 +00:00
Jeroen De Meerleer
6811ee5d16 Merge remote-tracking branch 'friendica.github.com/develop' into task/relationship-status 2019-07-08 07:48:07 +02:00
6bb418c5a7 Use "received" instead of "created" when displaying posts in creation order 2019-07-07 21:30:33 +00:00
Jeroen De meerleer
dea0bfd01f changed unavailable to In a relation, deleted available 2019-07-07 22:51:05 +02:00
9b8b2b36cd
Merge pull request #7339 from annando/gcontact-update
Restructured Contact/GContact handling
2019-07-07 13:28:20 -04:00
dda86f6dfc Basepath function now uses the contact field 2019-07-05 06:41:48 +00:00
be0a102333 Simplified the Contact update 2019-07-04 21:19:23 +00:00
c9666a9f1d We don't update inside the probing anymore 2019-07-04 19:40:48 +00:00
8d6aa9914c We now handling the contact type 2019-07-04 19:31:42 +00:00
ef5be9668f New fields in contact table / don't update on probe 2019-07-04 04:08:55 +00:00
Philipp
f60792348a
Merge pull request #7336 from MrPetovan/bug/globalcommunity-silence-getidforurl
Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup
2019-07-03 16:47:37 +02:00
7b0a9ffd89 Update gcontact when public contact is updated 2019-07-03 05:46:35 +00:00
50fa6b7e02 Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup
- Address https://forum.friendi.ca/display/0b6b25a8-215d-1bab-29c9-77a221796252
- Normalize quote style
- Remove deprecated get_app() call
2019-07-02 19:25:24 -04:00
80c3a81618 Use the term-date as archive date 2019-07-02 14:46:04 +00:00
1d7154a7d1 Update the gcontact entry when the public contact entry has changed 2019-07-02 09:06:48 +00:00
a248da8f2e
Merge pull request #7334 from annando/federated-protocol
New constant for federated protocols
2019-07-01 21:52:55 -04:00
ee8baf00ce Now without array_merge 2019-07-01 22:14:34 +00:00
9e3aff9ade Removed comment line 2019-07-01 18:09:40 +00:00
6041f74df6 New constant for federated protocols 2019-07-01 18:00:55 +00:00
7abc42700c Fix missing App object in Worker\OnePoll 2019-06-30 12:16:18 -04:00
3121d967c5 Item delivery data must only be stored when there is data 2019-06-29 08:30:48 +00:00
9bf065c9d8 Merge remote-tracking branch 'upstream/develop' into delivery-statistics 2019-06-28 14:08:54 +00:00
7b4bba66db
Merge pull request #7323 from annando/contact-discovery
Removing functionality from OnePoll.php
2019-06-28 07:08:57 -04:00
0a15222576 Collect data about used protocols for delivery 2019-06-28 09:03:58 +00:00
e48fbeda0a restore updating of the public contact 2019-06-28 04:34:01 +00:00
8838a1f2d1 Avoid overwriting of avatars for feeds 2019-06-28 04:26:49 +00:00
96651ae76d Fix a missing variable 2019-06-28 02:46:56 +00:00
d552db5c55 Polling functions are split into several functions 2019-06-27 20:38:09 +00:00
7e7acf5763 Last old query replaced in OnePoll.php 2019-06-27 16:21:23 +00:00
d4dc2a129e Replace old database queries 2019-06-27 13:30:26 +00:00
59b1a1aced Removing many now unused or duplicated tasks from OnePoll 2019-06-27 05:38:16 +00:00
4db3c79d04 Archive/unarchive the contacts 2019-06-27 05:03:58 +00:00
9caa8bae35 Unused parts removed, query refurbished 2019-06-26 05:18:11 +00:00
9b49fd7f3f Changed logging 2019-06-25 17:36:24 +00:00
Dean Townsley
fdbd160141 Add spaces for standards compliance 2019-06-24 21:37:44 -05:00
Dean Townsley
59553ab978 Don't try to auth for public images 2019-06-24 19:45:50 -05:00
Michael Vogel
26accbe3ef
Merge pull request #7296 from MrPetovan/task/smilies-replace
Limit smilies replacement to BBCode::convert
2019-06-24 22:05:37 +02:00
Philipp Holzer
91c295b55f
Rebase type-hint based on af9ce6b92a 2019-06-24 09:36:07 +02:00
Philipp Holzer
082634adbc
Moving from DBA to Database 2019-06-24 09:36:07 +02:00
80f4214d91 Merge remote-tracking branch 'upstream/develop' into contact-discovery 2019-06-24 05:41:10 +00:00
bca1dc1ca4 Moving functionality to the contact model 2019-06-24 03:25:01 +00:00
037cf01a15 Merge remote-tracking branch 'upstream/master' into contact-discovery 2019-06-24 03:23:57 +00:00
2fb70bd5f2 Use Unicode to convert multiple hearts in Content\Smilies 2019-06-23 17:53:25 -04:00
9545ff614b Limit smilies replacement to BBCode::convert 2019-06-23 17:53:25 -04:00
b9ab613777 Merge branch 'master' into develop 2019-06-23 17:40:52 -04:00
fa191bd821
Merge pull request #7305 from deantownsley/imageauthfix
Make authentication work for local private images
2019-06-23 15:18:15 -04:00
Michael Vogel
9559266075 todo added 2019-06-23 12:01:14 +02:00
857469d16a Constantly updating public contacts 2019-06-23 09:27:40 +00:00
Michael Vogel
f84e2e9d93 Fix for distribution of event deletions 2019-06-23 08:41:49 +02:00
Philipp
5306622225
Merge pull request #7304 from MrPetovan/bug/smilies-escape-code-blocks
Escape HTML pre-formatted blocks before converting smilies
2019-06-23 03:00:22 +02:00
Dean Townsley
0c6a0942cc Clarify comment and log message 2019-06-22 19:08:34 -05:00
Dean Townsley
9dff3d2b6d Use User:: API insteadd of direct database read 2019-06-22 18:56:33 -05:00
dc25355412
Merge pull request #7306 from annando/perform-activity
Fix the processing of event activities
2019-06-22 19:23:09 -04:00
Michael Vogel
449305e527 Fix the processing of event activities 2019-06-23 00:38:52 +02:00
cf11f57a5b Escape HTML pre-formatted blocks before converting smilies 2019-06-22 18:22:37 -04:00
Michael Vogel
1883cfba24
Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray" 2019-06-22 22:06:43 +02:00
Dean Townsley
042fcfeb50 Enable multi-auth in dfrn autoRedir
Update checks to account for a user being authenticated to multiple
contacts on the local server at the same time.
It was also necessary to remove a looping procection to make this work
correcly with browsers that open multiple connections because the
information about what contacts are authenticated is stored in the PHP
session.
2019-06-22 12:34:54 -05:00
Dean Townsley
b5e195b415 Add auth to load sequence for photos
This allows private photos to load on any page.  Previously auth
depended on some other thing like the enclosing page triggering the
authentication of the specific contact for the photo owner.
2019-06-22 12:24:30 -05:00
Michael Vogel
85772f02ca
Merge pull request #7286 from MrPetovan/bug/invading-smilies
Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray
2019-06-22 12:51:49 +02:00
cdd23e5b6d Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray 2019-06-22 04:16:02 -04:00
b5de71c390 Fix a notice when the author is missing 2019-06-21 17:57:26 +00:00
b07490266c
Merge pull request #7288 from annando/fix-search
Fix searching for contacts
2019-06-20 19:33:00 -04:00
7c87e83dcf Fix searching for contacts 2019-06-20 21:56:18 +00:00
14c28868eb Issue 6477: Use the correct content-type to resize the images 2019-06-20 20:09:33 +00:00
f0849b0a93
Merge pull request #7284 from annando/fix-fatal
Don't send activities to "null" endpoints
2019-06-19 23:42:21 -04:00
2e4e8bdf0a Don't send activities to "null" endpoints 2019-06-20 03:06:34 +00:00
2ba4116118
Merge pull request #7282 from annando/issue-6477
Issue 6477: Automatically repair self contact avatar
2019-06-19 16:12:56 -04:00
f878cc2623 Fix for PR 7280 2019-06-19 18:38:22 +00:00
d8ed2ed76d it is poll, not notify 2019-06-19 18:32:38 +00:00
b55546b726 Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477 2019-06-19 18:26:59 +00:00
6bd5be281e Normalise it 2019-06-19 17:21:35 +00:00
4ab772ed67 Issue 6477: Automatically repair self contact avatar 2019-06-19 17:05:29 +00:00