Commit graph

31152 commits

Author SHA1 Message Date
Michael
db90e3bf25 Remove attachment on plaintext conversion 2021-07-05 20:20:39 +00:00
Michael
c06331e690 Changelog updated 2021-07-05 19:44:08 +00:00
Michael
903c646a62 Style 2021-07-05 19:42:17 +00:00
Michael
aed5e4cc96 New struture for post related links 2021-07-05 18:45:49 +00:00
Michael
90588ddb8e Avoid proxyfying images that are removed or replaced later 2021-07-05 07:00:35 +00:00
Michael
a5176cb841 Unused constant removed 2021-07-05 05:41:05 +00:00
Michael
31bf8d3ea0 Updated messages.po 2021-07-05 05:15:35 +00:00
Michael
fccb725651 Unneeded workaround removed 2021-07-05 05:11:35 +00:00
Michael
a06d699480 Item cache related functionality removed 2021-07-05 04:57:50 +00:00
Michael
844727dc19 Simplyfying code 2021-07-05 04:16:02 +00:00
Michael
7188ed745c Merge remote-tracking branch 'upstream/develop' into proxy 2021-07-05 03:44:15 +00:00
Hypolite Petovan
fcfbd3edf9
Merge pull request #10471 from annando/notice
Fix notice "Undefined index: account-type"
2021-07-04 23:33:27 -04:00
Michael
b09f555f4f Merge remote-tracking branch 'upstream/develop' into notice 2021-07-05 03:03:41 +00:00
Hypolite Petovan
9126c2c454
Merge pull request #10470 from annando/local-publish-search
Allow search for only locally published contacts
2021-07-04 19:42:55 -04:00
Michael
1b6d0f8b1f Fix notice "Undefined index: account-type" 2021-07-04 21:26:08 +00:00
Michael
e519b782fd Simplified proxy handling 2021-07-04 21:24:49 +00:00
Michael
dfc1b1e7a5 Allow search for only locally published contacts 2021-07-04 19:58:02 +00:00
Tobias Diekershoff
968122337d pump version to :wq2021.09-dev 2021-07-04 20:54:24 +02:00
Tobias Diekershoff
2b95a7e7cd Merge branch 'stable' into develop 2021-07-04 20:52:22 +02:00
Tobias Diekershoff
d1d208f18b version 2021.07 2021-07-04 20:44:52 +02:00
Tobias Diekershoff
49994a7b4c typos 2021-07-04 20:43:26 +02:00
Tobias Diekershoff
4bfae21f1d set release date in the CHANGELOG 2021-07-04 20:39:32 +02:00
Tobias Diekershoff
7155f825da
Merge pull request #10362 from tobiasd/2021.06-CHANGELOG
2021.06 CHANGELOG
2021-07-04 20:36:26 +02:00
Tobias Diekershoff
55a3104ca9 and an old one as well issue fixed 2021-07-04 20:32:05 +02:00
Tobias Diekershoff
916e52f894 one issue fixed 2021-07-04 20:22:11 +02:00
Hypolite Petovan
54844d21a3
Merge pull request #10467 from annando/fetch-owner-data
Use "getOwnerDataById" and "getOwnerDataByNick" to fetch owner data
2021-07-04 13:41:56 -04:00
Michael
0d0b14303a Remove space 2021-07-04 17:36:28 +00:00
Tobias Diekershoff
39064a9865 updated the CHANGELOG 2021-07-04 19:31:32 +02:00
Michael
f0268b57be Use "getOwnerDataById" and "getOwnerDataByNick" to fetch owner data 2021-07-04 17:25:08 +00:00
Hypolite Petovan
638723ea1c
Merge pull request #10466 from annando/local-follow
Ensure that the network is set for "self" contacts
2021-07-04 12:21:21 -04:00
Michael
582fd613e0 Ensure that the network is set for "self" contac ts 2021-07-04 14:17:10 +00:00
Hypolite Petovan
b84c68f024
Merge pull request #10465 from annando/local-follow
Fix local follow (and local contact data update)
2021-07-04 10:15:10 -04:00
Hypolite Petovan
bedc8e1427
Merge pull request #10463 from annando/proxy-security
Proxy: Avoid access for not logged in users
2021-07-04 10:12:36 -04:00
Hypolite Petovan
c0579bcad9
Merge pull request #10462 from annando/duplicate-avatars
Removal of duplicated photo entries for a contact
2021-07-04 09:56:47 -04:00
Hypolite Petovan
4a1bcb13d5
Merge pull request #10461 from annando/ap-preview
Transmit preview link
2021-07-04 09:07:56 -04:00
Michael
74a0bfc6da Ensure to not update the "self" contact 2021-07-04 12:38:35 +00:00
Michael
87cc17337b Fix local follow (and local contact data update) 2021-07-04 12:35:48 +00:00
Michael
24f013a654 Redirecting not logged in user instead of failing 2021-07-04 11:53:49 +00:00
Michael
4f6be0bd03 Function only needs to be private 2021-07-04 10:59:24 +00:00
Michael
da484a48e3 Proxy: Avoid access for not logged in users 2021-07-04 10:55:32 +00:00
Michael
47904f99c2 Removal of duplicated photo entries for a contact 2021-07-04 10:40:03 +00:00
Michael
5ee0f6e5e1 Transmit preview link 2021-07-04 06:30:54 +00:00
Hypolite Petovan
3780e51806
Merge pull request #10460 from annando/issue-10352
Issue 10352: Fixing photo entries for contact avatars
2021-07-03 18:08:27 -04:00
Michael
1da6fa0043 Issue 10352: Fixing photo entries for contact avatars 2021-07-03 20:43:00 +00:00
Tobias Diekershoff
16d0c5b279 updated the CHANGELOG 2021-07-03 19:57:24 +02:00
Tobias Diekershoff
b4f2630fea
Merge pull request #10289 from tobiasd/2021.06-credits
update the CREDITS.txt for the 2021.06 release
2021-07-03 19:40:53 +02:00
Hypolite Petovan
9419372739
Merge pull request #10459 from annando/private-images
Fixed fetching private local images
2021-07-03 12:39:55 -04:00
Michael
f37e808e02 Fix test 2021-07-03 15:47:11 +00:00
Michael
c72abe48a8 Fixed fetching private local images 2021-07-03 15:29:27 +00:00
Tobias Diekershoff
a0772c91d0
Merge pull request #10456 from annando/issue-10454
Quickfix for hashtags in author names in shared posts
2021-07-02 07:47:27 +02:00