Commit graph

19846 commits

Author SHA1 Message Date
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
Pierre Rudloff
9bb11ccfa5 $attachments should aways be an array
In order to avoid a PHP 7.2 error when using count()
2018-05-08 12:16:48 +02:00
Pierre Rudloff
23371880e8 $called_api should always be an array
In order to avoid a PHP 7.2 error when using count()
2018-05-08 12:16:48 +02:00
Hypolite Petovan
7997df877d
Merge pull request #4996 from fabrixxm/docs-theme-dev
Docs: add a note on adding `use` on theme.php
2018-05-08 04:02:37 -04:00
fabrixxm
5ebe10d7fc Docs: add a note on adding use on theme.php 2018-05-08 09:53:58 +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
Hypolite Petovan
4e1441bb3e
Merge pull request #4981 from annando/remote-self
"remote-self" is now working for Diaspora and Twitter as well
2018-05-04 17:50:17 -04:00
Hypolite Petovan
7de52788b3
Merge pull request #4982 from annando/no-blocked-contact
Suppress blocked contacts from being displayed
2018-05-04 17:49:21 -04:00
7cd7b1a9bf Some more replaced queries 2018-05-04 21:43:29 +00:00
dfa0dbf33f Ups 2018-05-04 21:33:15 +00:00
125afb4ae5 Suppress blocked contacts from being displayed 2018-05-04 21:27:20 +00:00
1230ff146a "remote-self" is now working for Diaspora and Twitter as well 2018-05-04 21:12:13 +00:00
Hypolite Petovan
244c9d7a5b
Merge pull request #4980 from nupplaphil/install-pdo-bugfix
using \PDO instead of PDO (bugfix)
2018-05-04 14:23:36 -04:00
7e28e3e5f4 using \PDO instead PDO (bugfix) 2018-05-04 19:48:01 +02:00
6dbf0de9f2 Removed activities that aren't in the Diaspora protocol 2018-05-04 06:34:02 +00:00
a83970bc0e Some more dba stuff 2018-05-04 06:33:36 +00:00
Hypolite Petovan
e5a6e7b449
Merge pull request #4977 from annando/dba-error
Avoid SQL error with wrong formatted datetime value
2018-05-03 17:03:30 -04:00
d52b226a6e Reformat wrong expansion 2018-05-03 20:49:32 +00:00
321a36d4db Avoid SQL error with wrong formatted datetime value 2018-05-03 20:48:35 +00:00
Hypolite Petovan
89cf2ea186
Merge pull request #4975 from annando/fix-blocked-contacts
"pending" shouldn't be set as well by default ...
2018-05-03 14:22:50 -04:00
08bfced11b "pending" shouldn't be set as well by default ... 2018-05-03 18:19:40 +00:00
Hypolite Petovan
4158dcccaf
Merge pull request #4974 from annando/fix-blocked-contacts
Ugly bugfix: Public contacts had been blocked automatically when created
2018-05-03 14:06:01 -04:00
bce3b6f896 Urgent bugfix: Public contacts had been blocked automatically when created 2018-05-03 17:43:10 +00:00