Commit graph

25612 commits

Author SHA1 Message Date
Tobias Diekershoff
671e71b2d0 pumping version 2020.03-dev 2019-12-23 20:07:38 +01:00
Tobias Diekershoff
00756737b5 Merge branch 'master' 2019.12 into develop 2019-12-23 20:03:47 +01:00
Tobias Diekershoff
b9ec52d267 wrapping up 2019.12 2019-12-23 20:03:25 +01:00
Tobias Diekershoff
caa58b82ed
Merge pull request #7973 from tobiasd/2019.12-CHANGELOG
2019.12 CHANGELOG
2019-12-23 19:50:58 +01:00
Tobias Diekershoff
4bde0fd237
Merge pull request #7985 from tobiasd/20191221-credots
updated the credits for 2019.12
2019-12-23 19:50:40 +01:00
Michael Vogel
9bf23c2409
Merge pull request #7993 from tobiasd/2019.12-rc
EN GB and EN US translation update THX AndyH3
2019-12-23 07:24:00 +01:00
Tobias Diekershoff
56eb9adbdd EN GB translation update THX AndyH3 2019-12-23 06:43:14 +01:00
Tobias Diekershoff
2ab92f1f4d EN US translation update THX AndyH3 2019-12-23 06:43:01 +01:00
Michael Vogel
c57dc2a02f
Merge pull request #7990 from stom79/patch-1
Update FAQ.md
2019-12-22 18:25:58 +01:00
Thomas
29ba51ee95
Update FAQ.md
Update Fedilab link
2019-12-22 18:21:13 +01:00
Philipp
5c88777122
Merge pull request #7988 from friendica/MrPetovan-notice
Ensure $item exists in mod/display
2019-12-22 15:14:46 +01:00
Hypolite Petovan
637d526d6a
Ensure $item exists in mod/display
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-567575161
2019-12-22 09:00:16 -05:00
Tobias Diekershoff
1c499f498d
Merge pull request #7986 from MrPetovan/task/update-api-docs
Update Mastodon API documentation
2019-12-21 16:10:42 +01:00
Hypolite Petovan
80cb097c13 Update Mastodon API documentation
- Change endpoint label style to monospace
- Explicit expected IDs for follow_requests endpoints
- Add official documentation link for api/v1/instance/peers
- Add unimplemented endpoint api/v1/instance/activity
2019-12-21 09:51:11 -05:00
Hypolite Petovan
f1c1afe6b5 Update link label to API page in doc home 2019-12-21 09:49:35 -05:00
Tobias Diekershoff
c5389601d2 updated the credits for 2019.12 2019-12-21 15:33:02 +01:00
Tobias Diekershoff
03ee62e845
Merge pull request #7983 from annando/nodeinfo-dfrn
Fix: Newer Friendica servers had been detected as ActivityPub
2019-12-21 15:02:10 +01:00
Tobias Diekershoff
ea21f2867d stom79 has worked on the docs as well 2019-12-21 15:01:06 +01:00
Hypolite Petovan
f0e1c54d1d
Merge pull request #7982 from stom79/2019.12-rc
Update API-Mastodon.md
2019-12-21 08:58:10 -05:00
Tobias Diekershoff
9cba35cf21 the Markdown bug will stay for later ;) 2019-12-21 14:56:55 +01:00
Michael
1af52dd050 Fix: Newer Friendica servers had been detected as ActivityPub 2019-12-21 13:51:25 +00:00
Thomas
162755c3c8
Update API-Mastodon.md 2019-12-21 14:24:24 +01:00
Tobias Diekershoff
5506d19d0b CHANGELOG appendum for 2019-12-20 2019-12-21 08:34:27 +01:00
Hypolite Petovan
564952cf1a
Merge pull request #7979 from Quix0r/fixes/prvKey-verus-prvkey
Fixed prvkey causing 3rd parameter for set() method not set
2019-12-20 17:23:02 -05:00
Roland Häder
a7c617cae2
Fixed:
- needs to be `prvkey`, not `prvKey`

Signed-off-by: Roland Häder <roland@mxchange.org>
2019-12-20 23:15:21 +01:00
Hypolite Petovan
f617e2a287
Merge pull request #7977 from annando/api-nick
Remove legacy function
2019-12-20 17:06:27 -05:00
Hypolite Petovan
c57b2d3821
Merge pull request #7976 from annando/notice
Fix notice because of a missing subject
2019-12-20 17:05:42 -05:00
Michael
c9c408d5e5 Fix notice because of a missing subject 2019-12-20 21:47:10 +00:00
Hypolite Petovan
75a62fc9e4
Merge pull request #7975 from annando/attach-newlines
Fix optical glitch: Replace multiple newlines when replacing attachments
2019-12-20 10:28:14 -05:00
Michael
81d500c271 Fix optical glitch: Replace multiple newlines when replacing attachments 2019-12-20 09:45:34 +00:00
Philipp
48d95815a9
Merge pull request #7974 from tobiasd/20191220-lng
JA and PL translation updates
2019-12-20 08:01:04 +01:00
Michael
30dfbb95d9 Remove legacy function 2019-12-20 06:40:41 +00:00
Tobias Diekershoff
3b0051fe84 PL translation update THX waldis 2019-12-20 06:49:14 +01:00
Tobias Diekershoff
31b876714a updated JA translation THX Ozero Dien 2019-12-20 06:47:54 +01:00
Tobias Diekershoff
42dbbd303b 2019.12 CHANGELOG 2019-12-19 15:50:59 +01:00
Philipp
fb4e59e3d4
Merge pull request #7972 from MrPetovan/bug/notices
Various notices fixes
2019-12-19 14:32:28 +01:00
Hypolite Petovan
85ae12a873
Merge pull request #7971 from annando/issue-7685
Issue 7685: Just forward on remoteauth for non legacy-DFRN and other contacts
2019-12-19 07:51:49 -05:00
Hypolite Petovan
33ea5dfe35 Add check for $_REQUEST key existence in Module\Item\Compose
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-566254464
2019-12-19 07:48:08 -05:00
Hypolite Petovan
bba8f03296 Check for parent existence in mod/display
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-566079001
2019-12-19 07:47:35 -05:00
Michael
295ee82a61 Changed "??" to "?:" 2019-12-19 12:39:30 +00:00
Michael
6dbaf34290 Issue 7685: Just forward on remoteauth for non legacy-DFRN and other contacts 2019-12-19 11:02:50 +00:00
Philipp
2fbfae0ce5
Merge pull request #7970 from annando/api-announce
API: Missing endpoint for reshares had been added
2019-12-19 08:56:34 +01:00
Michael
1c7bc56cb3 API: Missing endpoint for reshares had been added 2019-12-19 07:19:03 +00:00
Tobias Diekershoff
ac24bc92cc
Merge pull request #7969 from annando/api-instance
API: Provide data for the account array of the instance array
2019-12-19 06:43:08 +01:00
Michael
da78b7a8b8 API: Provide data for the account array of the instance array 2019-12-19 04:11:31 +00:00
Philipp
5197833c55
Merge pull request #7930 from MrPetovan/task/7887-api-followers-request
Add POST follow request Mastodon API endpoint
2019-12-18 22:12:52 +01:00
Philipp
b885777da2
Merge pull request #7966 from annando/issue-7664
Issue 7664: Don't notify every time a contact posted something
2019-12-18 09:14:56 +01:00
Michael
3a6a78ca46 Issue 7664: Don't notify every time a contact posted something 2019-12-18 06:36:43 +00:00
Michael Vogel
1525e9dde3
Merge pull request #7965 from tobiasd/20191218-install
fix requested stuff for Install.md from 7938
2019-12-18 06:51:29 +01:00
Tobias Diekershoff
c26a8bcffe fix requests from 7938 and correct rename to copy 2019-12-18 06:32:15 +01:00