Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 15:20:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
28456 commits 3 branches 64 tags 237 MiB
Commit graph

28456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
3efbf1beb7 Fix notice 2020-09-26 18:59:31 +00:00
Michael
3aa255c6a1 Updated messages 2020-09-26 18:40:27 +00:00
Michael
3553b564b4 Template now collapses 2020-09-26 18:34:55 +00:00
Michael
4a40a40ed1 Merge remote-tracking branch 'upstream/develop' into hide-sharer 2020-09-26 18:05:15 +00:00
Michael
c0ddcfb0cd Hide own contacts 2020-09-26 18:01:10 +00:00
Michael Vogel
59d16e13cb
Merge pull request #9284 from tobiasd/2020026-de 
DE translation update
 2020-09-26 19:22:40 +02:00
Tobias Diekershoff
e24b7b11b1 DE translation update 2020-09-26 18:56:03 +02:00
Hypolite Petovan
5348a9903b
Merge pull request #9283 from annando/community-accounts 
Improve naming, make widget collapsible
 2020-09-26 12:04:44 -04:00
Michael
3ffb90cf07 Improve naming, make widget collapsable 2020-09-26 14:13:14 +00:00
Hypolite Petovan
4657a8c97a
Merge pull request #9280 from annando/account-selector 
Account selector for the community page
 2020-09-26 08:45:28 -04:00
Hypolite Petovan
8e6483970a
Merge pull request #9277 from annando/issue-9268 
Issue 9268: Don't show posts from followers on community page
 2020-09-26 08:28:01 -04:00
Hypolite Petovan
f30d1a6d70
Merge pull request #9278 from annando/issue-9276 
Issue 9276: Cache the trending hashtags in the background
 2020-09-26 08:24:54 -04:00
Michael
4504d3c32d Using the equal sign 2020-09-26 12:21:32 +00:00
Michael
3b90dc0289 Use period and limit in the cache key 2020-09-26 12:16:46 +00:00
Michael
f936d93730 Moved "selected" check into the template 2020-09-26 12:13:30 +00:00
Hypolite Petovan
6788c68977
Merge pull request #9279 from annando/unneeded-reload 
Remove unneeded addon reload
 2020-09-26 07:42:07 -04:00
Michael
5a48002575 Account selector for the community page 2020-09-26 11:05:18 +00:00
Michael
91ccdac652 Remove unneeded addon reload 2020-09-26 09:53:44 +00:00
Michael
f7cf8fe3d0 Issue 9276: Cache the trending hashtags in the background 2020-09-26 09:42:12 +00:00
Michael
b522f20702 Issue 9268: Don't show posts from followers on community page 2020-09-26 09:09:56 +00:00
Hypolite Petovan
04f993b611
Merge pull request #9273 from annando/inherit-causer 
We now inherit the causer for completing a thread
 2020-09-25 10:46:28 -04:00
Michael
9ea34370a6 We now inherit the causer for completing a thread 2020-09-25 12:16:08 +00:00
Michael Vogel
60d1630d3a
Merge pull request #9272 from MrPetovan/bug/parse-url-charset 
Add style and script tag escaping when parsing charset in Util\ParseUrl
 2020-09-25 13:26:00 +02:00
Hypolite Petovan
f52d44554e Add style and script tag escaping when parsing charset in Util\ParseUrl 
- Address https://github.com/friendica/friendica/issues/9251#issuecomment-698086677
 2020-09-25 06:55:52 -04:00
Tobias Diekershoff
6d4454582d
Merge pull request #9270 from annando/issue-9264 
Issue 9264: post types should now work
 2020-09-25 09:54:13 +02:00
Michael
9552473db5 Issue 9264: post types should now work 2020-09-25 06:47:07 +00:00
Tobias Diekershoff
e0b0ca96d1 Version 2020.12-dev again 2020-09-24 15:29:57 +02:00
Tobias Diekershoff
51c785f89c Version 2020.09-1 2020-09-24 15:24:20 +02:00
Tobias Diekershoff
40cdd58008
Merge pull request #9266 from tobiasd/2020.09.1-CHANGELOG 
2020.09.1 Changelog
 2020-09-24 15:22:42 +02:00
Tobias Diekershoff
0441a8b12f don't forget the new Nominatim addon 2020-09-24 15:13:33 +02:00
Tobias Diekershoff
9c14230056 use dashes, and some more fixed things for the 2020.09-1 release 2020-09-24 15:11:58 +02:00
Hypolite Petovan
9cfd4ef868
Merge pull request #9267 from annando/follower-indicator 
Issue 9264: Ensure that "pt_follower" is only set when its a real follower
 2020-09-24 08:41:50 -04:00
Hypolite Petovan
013d3510f4
Merge pull request #9265 from annando/uri-id 
Ensure that the uri-id is always set
 2020-09-24 08:18:48 -04:00
Michael
d9d1268194 Issue 9264: Ensure that "pt_follower" is only set when its a real follower 2020-09-24 10:26:28 +00:00
Tobias Diekershoff
922a59fa2a typo 2020-09-24 09:41:33 +02:00
Tobias Diekershoff
ef99c3ce5c 2020.09.1 Changelog 2020-09-24 07:54:36 +02:00
Michael
c06e077c27 Ensure that the uri-id is always set 2020-09-23 18:55:16 +00:00
Hypolite Petovan
3038e4a3f9
Merge pull request #9262 from nupplaphil/phpmailer_fix 
E-Mail Message-ID & Newline fix
 2020-09-23 14:22:12 -04:00
Philipp
fae7256d82
wrong annotation for preserverGlobalState .. 2020-09-23 19:46:24 +02:00
Philipp
3eaaf716e9
just log double message IDs, don't discard the email 2020-09-23 19:38:20 +02:00
Hypolite Petovan
fa94c82299
Merge pull request #9260 from annando/ap-relay-settings 
Relay settings are now valid for the ActivityRelay as well
 2020-09-23 12:46:32 -04:00
Michael
ea698b6702 Delimiter added 2020-09-23 15:57:10 +00:00
Hypolite Petovan
befc8c86ab
Merge pull request #9261 from annando/relay-distribution 
Delayed relay distribution
 2020-09-23 11:43:52 -04:00
Michael
4a8531354b Use preg_quote 2020-09-23 15:28:00 +00:00
Michael
8805348abc Removed parameter 2020-09-23 15:20:16 +00:00
Michael
c5304d1ff4 Use plainext 2020-09-23 09:00:09 +00:00
Michael Vogel
9c93240770
Merge pull request #9263 from MrPetovan/bug/parse-url-charset 
Improve charset detection in Util\ParseUrl
 2020-09-23 05:13:50 +02:00
Hypolite Petovan
2cb87aca33 Improve charset detection in Util\ParseUrl 
- Pages with charset meta tag weren't properly decoded
 2020-09-22 20:35:36 -04:00
Philipp
e2b736d0a9
Fix phpmailer (Case sensitive Check) 2020-09-22 22:48:34 +02:00
Michael Vogel
380828d78c Delayed relay distribution 2020-09-22 22:14:37 +02:00