Commit graph

31957 commits

Author SHA1 Message Date
Michael
1bb25de287 Applied change from PR #10763 2021-09-26 12:17:30 +00:00
Michael
6d19ecfde0 Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 12:15:22 +00:00
Hypolite Petovan
0bb169b4ed Check for reply existence before using its values in Model\Mail
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-925263894
2021-09-26 08:15:07 -04:00
Hypolite Petovan
9d77958247 Ensure parent exists before adding reply to elements in OStatus and Feed
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-927118628
2021-09-26 08:15:07 -04:00
Michael Vogel
1cf759d414
Merge pull request #10763 from MrPetovan/task/10745-redir-private-posts
Limit /redir links to private posts
2021-09-26 07:03:08 +02:00
Michael
e08c5ca2e0 Another try ... 2021-09-26 04:16:21 +00:00
Michael
1e583b4f35 Space removed 2021-09-26 04:07:02 +00:00
Michael
171cbf0512 Removed spaces 2021-09-26 04:05:46 +00:00
Michael
24078ad5f0 Testing cs ... 2021-09-26 03:59:15 +00:00
Michael
96055cafff Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 03:57:31 +00:00
Michael
49f9ac0e77 Testing cs 2021-09-26 03:54:54 +00:00
Michael
a2532ad755 Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-26 03:07:59 +00:00
Michael Vogel
45277bbc47
Merge pull request #10761 from MrPetovan/task/10734-unfollow-hook
Add new hook to support unfollow contacts on non-native networks
2021-09-26 04:57:42 +02:00
Hypolite Petovan
6836b1ea78 Limit /redir links to private posts
- This allows to share public post links with anonymous users
2021-09-25 16:15:25 -04:00
Hypolite Petovan
d8febbe45e Add new hook to support unfollow contacts on non-native networks 2021-09-25 16:15:06 -04:00
Michael Vogel
255b98b5bf
Merge pull request #10758 from nupplaphil/bug/drone_chmod
Adapt permissions
2021-09-25 22:09:42 +02:00
Michael
8e979b4c9e And another operator ... 2021-09-25 18:53:35 +00:00
Michael
9369b02613 testing one operator less .. 2021-09-25 18:50:22 +00:00
Michael
6983f257c8 Updated messages.po 2021-09-25 18:45:32 +00:00
Michael
e77b5d4569 Updated messages.po 2021-09-25 18:43:19 +00:00
Michael
f60c8225a6 Change code style rules 2021-09-25 18:40:11 +00:00
Michael
1f96742695 Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-25 18:38:50 +00:00
Michael
3fddf3807a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-25 18:34:55 +00:00
Philipp
f0c4d504af
Update messages.po (new version) 2021-09-25 20:18:01 +02:00
Philipp
b970455388
Adapt permissions 2021-09-25 20:13:44 +02:00
Tobias Diekershoff
00382dd39e opened CHANGELOG for 2021.12 2021-09-25 19:22:11 +02:00
Tobias Diekershoff
944957a009 pumped version to 2021.12-dev 2021-09-25 19:21:35 +02:00
Tobias Diekershoff
1adbdfb8d1 set the version of Friendica to 2021.09 2021-09-25 19:18:27 +02:00
Tobias Diekershoff
142fad533e CHANGELOG set release date 2021-09-25 19:16:41 +02:00
Tobias Diekershoff
61484c3c4c
Merge pull request #10621 from tobiasd/2021.09-CHANGELOG
2021.09 CHANGELOG
2021-09-25 19:15:08 +02:00
Michael
d4fd151227 Partly reverting formatting to cause a code style checker error 2021-09-25 08:06:38 +00:00
Michael
5cfb0cb58a Last style stuff ... 2021-09-24 04:52:34 +00:00
Michael
943f1961ea Style again 2021-09-24 04:50:47 +00:00
Michael
8fd8241797 Style again 2021-09-24 04:46:30 +00:00
Michael
64d181c1cc Code style 2021-09-24 04:35:27 +00:00
Michael
f696fce824 Reformatting 2021-09-23 21:53:52 +00:00
Michael
a6c85f6106 Updated "messages.po" 2021-09-23 21:34:22 +00:00
Michael
26fa5e8b3f Moved functions 2021-09-23 21:29:36 +00:00
Michael
0ad904c185 The conversation functionality moved to a class 2021-09-23 21:18:36 +00:00
Michael Vogel
2d4c669a20
Merge pull request #10748 from MrPetovan/task/10740-json-ld-debug
Improve compacting error logging in Util\JsonLD
2021-09-23 17:50:43 +02:00
Hypolite Petovan
935d7ab9f0
Merge pull request #10749 from tobiasd/20210923-ru
RU translation updates THX Alexander An
2021-09-23 11:30:29 -04:00
Tobias Diekershoff
9b78d87287 RU translation updates THX Alexander An 2021-09-23 17:13:48 +02:00
Hypolite Petovan
7f7f0eb10c Improve compacting error logging in Util\JsonLD
- Exceptions thrown by friendica/json-ld are nested and their string representation shows all the exception chain
2021-09-22 23:09:46 -04:00
Hypolite Petovan
c9e30ac2c0
Merge pull request #10743 from annando/warning
Avoid warning when fetching page data
2021-09-22 07:47:57 -04:00
Michael
840d9823d4 Log unexpected value 2021-09-22 03:25:01 +00:00
Michael
7ac76639c5 AVoid warning when fetching page data 2021-09-22 02:41:24 +00:00
Tobias Diekershoff
a1d1a29163 2021.09 CHANGELOG one numbered issue more is closed 2021-09-21 18:55:18 +02:00
Tobias Diekershoff
b922e706a8 2021.09 CHANGELOG another bug fixed 2021-09-20 08:02:56 +02:00
Hypolite Petovan
be3fb5f205
Merge pull request #10730 from annando/public-contact-list
Display the public contacts for profile visitors
2021-09-19 17:32:51 -04:00
Michael Vogel
34d38a529f
Merge pull request #10733 from nupplaphil/feat/drone_checks
Drone: Add database version check
2021-09-19 20:08:01 +02:00