Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 20:22:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
26335 commits 3 branches 64 tags 246 MiB
Commit graph

26335 commits

This branch
This branch
All branches
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
7fd1d674a9 Zot seems to work now 2019-12-23 15:07:49 +00:00
Michael
2306b949f2 Partly reworked, part 2 2019-12-23 14:30:48 +00:00
Michael
9cc2212b4b Restructuring code 2019-12-23 14:26:06 +00: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
Michael
4653d7d3b0 Renamed function, added documentation 2019-12-22 17:20:11 +00: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
Michael
03d6203410 We can now detect Hubzilla accounts 2019-12-22 08:13:12 +00:00
Michael
c975d0f799 Added documentation 2019-12-21 20:18:44 +00:00
Michael
537da657cc Renamed functions 2019-12-21 18:57:00 +00:00
Michael
33cb241ed3 Renamed function 2019-12-21 18:24:43 +00:00
Michael
26ac9a0063 "CheckServer" is now "UpdateGServer" 2019-12-21 18:11:51 +00: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
Michael
598f314577 Merge remote-tracking branch 'upstream/2019.12-rc' into poco-cleanup 2019-12-21 14:03:47 +00: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
Michael
90408b9d49 Discover directory type 2019-12-21 13:48:20 +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
Michael
fab85255b6 Relocated functions 2019-12-21 06:39:22 +00:00
Michael
4024d725db Fixed logger call 2019-12-21 04:23:26 +00:00
Michael
01205f7d41 Merge remote-tracking branch 'upstream/2019.12-rc' into poco-cleanup 2019-12-20 22:25:32 +00: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
Michael
b4f690839a "CheckServer" added 2019-12-20 21:46:30 +00:00
Michael
ef9bdfdff2 Fix some errors 2019-12-20 21:27:49 +00:00
Michael
3c4f44a4ab "FetchPoCo" added 2019-12-20 21:21:25 +00:00
Michael
e5546dd40a "UpdateServers" added 2019-12-20 21:12:44 +00:00
Michael
5fee84f2e2 Added "DiscoverContacts" 2019-12-20 21:04:38 +00:00
Michael
bf852cc096 "UpdateSuggestions" added 2019-12-20 20:49:09 +00:00
Michael
a1ad549e0b Added UpdateServerDirectory 2019-12-20 20:37:21 +00:00
Michael
37f0519514 'SearchDirectory' created (moved out of 'DiscoverPoco' mess) 2019-12-20 20:30:13 +00:00