Commit graph

23532 commits

Author SHA1 Message Date
30a6211d5c Merge branch 'ap-connect' of github.com:annando/friendica into ap-connect 2019-05-03 05:55:19 +00:00
b1222e174e Ensure that an existing contact isn't archived or pending 2019-05-03 05:54:40 +00:00
Michael Vogel
56d2df04f0 Don't switch Friendica contacts to AP 2019-05-03 07:10:02 +02:00
Michael Vogel
6c34196264 Cleaning confirm 2019-05-03 06:17:26 +02:00
Michael Vogel
949fd1e8bf Fixes undefined variable 2019-05-03 06:01:01 +02:00
9941c33123 Removing a contact request needn't to be one not approved requests 2019-05-02 20:04:15 +00:00
a4dffee5f4 Fix wrong error message when updated a contact 2019-05-02 19:22:43 +00:00
8adf0e6e5c Removed test logging 2019-05-02 13:46:12 +00:00
28f316b7e4 Replace the legacy DFRN connection process with AP 2019-05-02 13:05:31 +00:00
Philipp
33689a8d4e
Merge pull request #7060 from annando/ap-connect
Preparation for switching the connect mechanism from DFRN to AP
2019-04-30 20:52:28 +02:00
Michael Vogel
581895c07d Preparation for switching the connect mechanism from DFRN to AP 2019-04-30 20:07:20 +02:00
440a43a693
Merge pull request #7058 from annando/new-backend
AP endpoints are added to the list of backend processes
2019-04-29 13:57:34 -04:00
Michael Vogel
550291afbf AP endpoints are added to the list of backend processes 2019-04-29 17:51:38 +02:00
Philipp
b0654d24c5
Merge pull request #7056 from tobiasd/20190429-lng
CS, DE translation update
2019-04-29 15:27:51 +02:00
a7998d1f1e DE translation update 2019-04-29 14:27:14 +02:00
1b621c4fae CS translation update THX Aditoo 2019-04-29 14:27:03 +02:00
da545e0245
Merge pull request #7055 from tobiasd/20190428-msg
regen messages.po
2019-04-28 09:29:22 -04:00
9325f86324 regen messages.po 2019-04-28 12:50:47 +02:00
Philipp
98bcb76d67
Merge pull request #7054 from AlfredSK/patch-1
Fix parenthesis encoding in admin.php
2019-04-28 11:59:05 +02:00
Steffen K9
0719f6436b
Fix parenthesis encoding in admin.php
Parenthesis in admin, site, worker, frontend worker have wrong encoding.
2019-04-28 11:02:11 +02:00
Michael Vogel
8f8730a39e
Merge pull request #7052 from MrPetovan/bug/atom-display-security
Move item feed display after permission checking in mod/display
2019-04-28 08:34:43 +02:00
e0deb633f0 Move item feed display after permission checking in mod/display 2019-04-28 01:13:39 -04:00
Philipp
427a79056f
Merge pull request #7046 from friendica/MrPetovan-patch-httpExit-Module-Photo
Fix "Illegal string offset 'title'/'description'" notice in Module\Photo
2019-04-26 22:56:14 +02:00
71b221a84d
Fix "Illegal string offset 'title'/'description'" notice in Module\Photo
See https://forum.friendi.ca/display/097d37de-265c-c35b-f385-e0b584714020
2019-04-26 15:39:42 -04:00
Philipp
4276926d8d
Merge pull request #7045 from annando/ap-parse
AP: Parsing of messages from Pleroma should work now again
2019-04-26 12:24:33 +02:00
eef85584c2 AP: Parsing of messages from Pleroma should work now again 2019-04-26 06:17:37 +00:00
dc154ac07d
Merge pull request #7043 from annando/ap-workaround-context
Workaround for systems who don't use a correct context in ActivityPub
2019-04-25 10:01:54 -04:00
af92f46a2d Workaround for systems who don't use a correct context in ActivityPub 2019-04-25 13:30:30 +00:00
a17eb1e04c
Merge pull request #7042 from annando/apcontact-update
Follow up to #7036: Automatically update AP contacts
2019-04-25 08:05:13 +02:00
0e29ec200f Follow up to #7036: Automatically update AP contacts 2019-04-25 05:24:53 +00:00
Michael Vogel
3f7b21ef28
Merge pull request #7041 from MrPetovan/bug/fatal-errors
Remove failing require to non-existent file in Worker\CronJobs
2019-04-25 04:04:25 +02:00
838f5762ac Remove failing require to non-existent file in Worker\CronJobs 2019-04-24 18:30:51 -04:00
9bc87e408f
Merge pull request #7039 from annando/api-reshare-quote
API: Reshares and Quotes should now work in any combination
2019-04-24 18:28:20 -04:00
27f86263c0
Merge pull request #7040 from annando/fix-ap-probe
Probing of Pleroma contacts does work again
2019-04-24 17:39:25 -04:00
d4b7e00837 Cleaning up transmitted fields (only needed for the root entry) 2019-04-24 21:28:56 +00:00
d778a29e04 Use all fields 2019-04-24 20:46:12 +00:00
ffd6896bd2 Probing of Pleroma contacts does work again 2019-04-24 20:08:43 +00:00
9753ccab33 API: Reshares and Quotes should now work in any combination 2019-04-24 19:06:39 +00:00
3c2fc68891
Merge pull request #7035 from tobiasd/20190424-changelog
updated CHANGELOG
2019-04-24 11:01:30 -04:00
2d1e771178
Merge pull request #7029 from nupplaphil/task/mod_manifest
Move mod/manifest to src/Module/Manifest
2019-04-24 09:26:57 -04:00
bc639ff459 updated CHANGELOG 2019-04-24 10:04:40 +02:00
Philipp
2376399168
Merge pull request #7034 from annando/api-announce
API: Fix the displaying of reshared posts
2019-04-24 09:07:52 +02:00
3db9420ec7 Unify behaviour of friendica-author and friendica-owner 2019-04-24 05:22:31 +00:00
dd7406f285 API: Fix the displaying of reshared posts 2019-04-24 04:26:23 +00:00
43bb4dce1b
Merge pull request #7033 from tobiasd/20190423-nodeinfo
remove superfluous leftover require that broke the .well-known page
2019-04-23 13:20:21 -04:00
bdc09f1c28 remove superfluous leftover require that broke the .well-known page 2019-04-23 19:03:03 +02:00
1573247db9
Merge pull request #7032 from tobiasd/20190423-lng
CS, PL, PT-BR Translation updates
2019-04-23 12:31:06 -04:00
8ad42f4a04 Added Estonian translation THX Rain Hawk 2019-04-23 18:29:58 +02:00
e0131d21f0 CS translation update THX Aditoo 2019-04-23 18:24:08 +02:00
2c18a59aa8 PL translation update THX waldis 2019-04-23 18:23:57 +02:00