1
0
Fork 0
Commit graph

19258 commits

Author SHA1 Message Date
Hypolite Petovan
09a2c1d76b
Merge pull request #5017 from annando/dfrn-relay
Adopt the relay definition according to the suggestions from @jaywink
2018-05-10 08:18:53 -04:00
Hypolite Petovan
86ac44bd4e
Merge pull request #5016 from annando/fix-blocked
Corrects falsely blocked contacts because of some bug in the develop branch
2018-05-10 08:18:04 -04:00
Hypolite Petovan
68591e2179
Merge pull request #5015 from annando/issue-4772
Issue 4772: Display posts with uid=0 as well
2018-05-10 08:17:27 -04:00
40d3e7982c Adopt the relay definition according to the suggestions from @jaywink 2018-05-10 11:04:18 +00:00
aafc314ccc Corrects falsely blocked contacts because of some bug in the develop branch 2018-05-10 10:41:32 +00:00
df019eb5bd Issue 4772: Display posts with uid=0 as well 2018-05-10 10:13:48 +00:00
Hypolite Petovan
8612e44d19
Merge pull request #5013 from annando/feed-avatar
For feed items show the avatar of the local user
2018-05-09 17:22:55 -04:00
ed664b1091 For feed items show the avatar of the local user 2018-05-09 21:09:16 +00:00
Hypolite Petovan
5650d09504
Merge pull request #5012 from tobiasd/20180509-doctppls
added dedicated documentation about tools for admins
2018-05-09 13:04:23 -04:00
03743184a8 added dedicated documentation about tools for admins 2018-05-09 18:52:11 +02:00
Michael Vogel
1823b86589
Merge pull request #5009 from tobiasd/20180509-msg
regenerated master messages.po file
2018-05-09 17:14:30 +02:00
fcd2721dc1 regenerated master messages.po file 2018-05-09 15:05:19 +02:00
Hypolite Petovan
5b835c16ab
Merge pull request #5008 from tobiasd/20180509-2115
Issue #2115
2018-05-09 08:19:26 -04:00
Hypolite Petovan
d7377215a4
Merge pull request #5007 from tobiasd/20180509-doc
documentation update for !mentions of forum accounts
2018-05-09 08:13:58 -04:00
7f7ccc3f51 the widget is not needed here 2018-05-09 12:49:29 +02:00
21f9f74ad0 use Archives for the additional feature setting like it is used in the network sidebar 2018-05-09 12:32:47 +02:00
fada32a1c4 documentation update for !mentions of forum accounts 2018-05-09 11:49:29 +02:00
418f19d35b
Merge pull request #5006 from annando/fix-empty-avatar
Bugfix: Avoid empty avatar photos when a public contact is created
2018-05-09 09:24:16 +02:00
df96d81a0e Ensure avatar photo in update routine 2018-05-09 07:09:47 +00:00
3eb0b795fc Bugfix: Avoid empty avatar photos when a public contact is created 2018-05-09 06:53:57 +00:00
Hypolite Petovan
6dda5366de
Merge pull request #5004 from annando/missing-posts
Issue 4990: Fixes missing posts on network page
2018-05-08 18:53:41 -04:00
Hypolite Petovan
d3f122dfe2
Merge pull request #5005 from annando/missing-10n
Fixes missing L10n class
2018-05-08 18:51:17 -04:00
450863da85 Fixes missing L10n class 2018-05-08 22:34:47 +00:00
6c792588fd Ensure to mostly fetch the item with an non zero user id 2018-05-08 22:26:49 +00:00
8d513d74be Reverted SQL sorting 2018-05-08 22:08:25 +00:00
14833edb2d Issue 4990: Fixes missing posts on network page 2018-05-08 22:00:32 +00:00
Hypolite Petovan
f8139d1179
Merge pull request #5003 from annando/fix-author-id
Update script to set author-id and owner-id
2018-05-08 17:03:32 -04:00
74908c0125 Corrected placeholders 2018-05-08 20:22:21 +00:00
08bf19082c Ensure that there will always be an author-id and owner-id in the items 2018-05-08 20:20:15 +00:00
e7e0bee0a9 Added maintenance notice 2018-05-08 18:46:47 +00:00
6c35f8ebf3 Update script for setting author-id and owner-id in item and thread table 2018-05-08 17:50:06 +00:00
Hypolite Petovan
8890657bcd
Merge pull request #5001 from tobiasd/20180508-lng2
translation updates DE, FI, PL
2018-05-08 12:58:20 -04:00
41d301b496 update DE translations 2018-05-08 18:55:18 +02:00
2db9f8a2cc update PL translations THX waldis 2018-05-08 18:55:14 +02:00
4e3784de6b update FI translations THX Kris 2018-05-08 18:55:10 +02:00
6021a7504d
Merge pull request #4995 from annando/vanished-feeds
Fix for issue 4994: Feed items now appear again
2018-05-08 08:33:47 +02:00
7d6b1264ec Fix for issue 4994: Feed items now appear again 2018-05-08 06:11:46 +00:00
574191104b time for a RC 2018-05-07 20:28:13 +02:00
b1cb955110
Merge pull request #4991 from annando/dbclean
dbclean settings are now available from the frontend
2018-05-07 14:28:59 +02:00
bd432c89d9 Text for translations 2018-05-07 08:46:32 +00:00
eb4650ff23 dbclean settings are now available from the frontend 2018-05-07 05:37:20 +00:00
Hypolite Petovan
850e296020
Merge pull request #4989 from annando/video-bbcode
Fix video display problems with videos with parameters
2018-05-06 17:59:05 -04:00
c33df7a05e Fix video display problems with videos with parameters 2018-05-06 16:57:46 +00:00
Michael Vogel
5ab675891d
Merge pull request #4987 from tobiasd/20180506-lng
translation updates for FI, PL and ZH CN
2018-05-06 13:57:41 +02:00
Michael Vogel
b7f3607790
Merge pull request #4988 from tobiasd/20180506-4689
API docs, the count parameter
2018-05-06 13:56:21 +02:00
0c6333599d API docs, the count parameter 2018-05-06 12:25:23 +02:00
cf13511066 update PL translations THX waldis 2018-05-06 11:18:56 +02:00
bfca51c450 update FI translations THX Samuli Valavuo 2018-05-06 11:18:08 +02:00
d98d9a5e60 update to the zh-cn translation THX 朱陈锬 2018-05-06 11:17:15 +02:00
Hypolite Petovan
3a3a4807a8
Merge pull request #4978 from annando/dba-2
Diaspora: Fix person/contact retraction
2018-05-04 18:04:38 -04:00