Tobias Diekershoff
098eba9256
Merge pull request #3756 from annando/ostatus-blocked
...
Better handling of blocked contacts in OStatus
2017-10-04 05:00:49 +00:00
Michael
a8a7f4a76d
Better handling of blocked contacts in OStatus
2017-10-03 20:52:24 +00:00
Michael Vogel
ef55b7160e
Merge pull request #3754 from tobiasd/20171003-de
...
DE and ZH-CN translation
2017-10-03 20:17:59 +02:00
Tobias Diekershoff
6440297895
update ZH-CN translation thx mytbk
2017-10-03 06:35:45 +02:00
Tobias Diekershoff
57f65a20a6
update DE translation
2017-10-03 06:29:15 +02:00
Tobias Diekershoff
1470e8e747
Merge pull request #3753 from annando/diaspora-reshare
...
Diaspora: Reshares of reshares sometimes had problems
2017-10-02 21:45:40 +02:00
Michael
c33aa2ccee
Diaspora: Reshares of reshares sometimes had problems
2017-10-02 19:00:33 +00:00
Michael Vogel
a6f359190f
Merge pull request #3752 from tobiasd/20171002-zhcn
...
update ZH-CN translation thx mytbk
2017-10-02 19:19:15 +02:00
Tobias Diekershoff
dcc9e16d50
update ZH-CN translation
2017-10-02 18:08:21 +02:00
Michael Vogel
cde1d91b2e
Merge pull request #3751 from tobiasd/201709´1001-messages
...
regenerated master messages.po file
2017-10-01 09:14:58 +02:00
Tobias Diekershoff
59b8b7dbee
regenerated master messages.po file
2017-10-01 08:56:06 +02:00
Tobias Diekershoff
8f02bcbda8
Merge pull request #3750 from annando/mail-guid
...
Detect the hostname when the URI is in the format data@host.tld
2017-10-01 02:07:18 +02:00
Michael
fffc360c6a
Detect the hostname when the URI is in the format data@host.tld
2017-09-30 21:39:32 +00:00
Tobias Diekershoff
5a77f7c326
Merge pull request #3749 from annando/poller-db-update
...
DB Structure call is now executed directly when it cannot be called via proc_run
2017-09-30 19:49:44 +02:00
Michael
3354f01ed5
Doxygen and bugfix
2017-09-30 17:42:03 +00:00
Michael
2971501f63
The direct structure call is now only executed when called via the poller.php
2017-09-30 17:12:27 +00:00
Michael
d691c2e621
Database structure call is now executed directly when it cannot be called via proc_run
2017-09-30 16:45:35 +00:00
Tobias Diekershoff
7d746482b8
Merge pull request #3748 from annando/single-user
...
Possibly better handling of the single user admin setting
2017-09-30 16:13:51 +02:00
Michael
88a70f9e2a
Possibly better handling of the single user admin setting
2017-09-30 13:58:07 +00:00
Tobias Diekershoff
01c2452547
Merge pull request #3747 from annando/additional-checks
...
Add additional checks for the worker
2017-09-30 13:37:32 +02:00
Michael
bd88179419
Add additional checks for the worker
2017-09-30 11:19:46 +00:00
Tobias Diekershoff
cc7d5602a9
Merge pull request #3746 from annando/snarl
...
Semaphore lock deactivated for PHP lower 5.6.1
2017-09-30 10:15:29 +02:00
Michael
42a8f27034
Semaphore lock deactivated for PHP lower 5.6.1
2017-09-30 07:51:09 +00:00
Michael Vogel
65ffd1bc2b
Merge pull request #3745 from Alkarex/sql_fbrowser_rc
...
SQL fix fbrowser (RC)
2017-09-29 03:41:56 +02:00
Alexandre Alapetite
da4b08fc4a
SQL fix fbrowser (RC)
...
https://github.com/friendica/friendica/pull/3742
Fixing non-standard GROUP BY, and non-standard ORDER BY.
```
DB Error 1055: Expression #2 of SELECT list is not in GROUP BY clause
and contains nonaggregated column 'friendica.photo.id' which is not
functionally dependent on columns in GROUP BY clause; this is
incompatible with sql_mode=only_full_group_by
q, fbrowser_content
SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS
`hiq`,max(`scale`) AS `loq`, `desc` FROM `photo` WHERE `uid` = 1 AND
`album` != 'Contact Photos' AND `album` != 'Contact Photos' GROUP BY
`resource-id` ORDER BY created DESC LIMIT 0, 10
2017-09-27T17:16:35Z@tmkfko6titb71nug3i4vr1mnb1 [NORMAL]:dba.php:553:p
DB Error 1055: Expression #2 of SELECT list is not in GROUP BY clause
and contains nonaggregated column 'friendica.photo.id' which is not
functionally dependent on columns in GROUP BY clause; this is
incompatible with sql_mode=only_full_group_by
q, fbrowser_content
```
```
ERROR 1055 (42000): Expression #1 of ORDER BY clause is not in GROUP BY
clause and contains nonaggregated column 'friendica.photo.created' which
is not functionally dependent on columns in GROUP BY clause; this is
incompatible with sql_mode=only_full_group_by
```
2017-09-28 21:24:07 +02:00
Tobias Diekershoff
2252a76979
Merge pull request #3744 from annando/contact-posts
...
Reliably show posts from contact
2017-09-28 14:51:49 +02:00
Michael
98a3e012f8
Reliably show posts from contact
2017-09-28 06:01:31 +00:00
Michael Vogel
0b02d009b0
Merge pull request #3741 from tobiasd/20170927-credits
...
regen credits
2017-09-27 19:24:48 +02:00
Tobias Diekershoff
6616c2f094
regen credits
2017-09-27 16:32:12 +02:00
Tobias Diekershoff
4189e75d65
Merge pull request #3740 from rabuzarus/20170927_-_add_comment
...
add a comment as explanation for #3737
2017-09-27 14:52:18 +02:00
rabuzarus
b4d203947b
add a comment as explanation for #3737
2017-09-27 14:15:45 +02:00
Michael Vogel
3e0b76f478
Merge pull request #3738 from tobiasd/20170927-en
...
EN and ZH-CN translations
2017-09-27 07:39:28 +02:00
Tobias Diekershoff
5d566db381
zh-cn was updated as well
2017-09-27 07:15:14 +02:00
Tobias Diekershoff
009a028c14
update EN US and GB variations
2017-09-27 07:10:12 +02:00
Tobias Diekershoff
6915ace6ca
Merge pull request #3737 from annando/is_modified
...
Items aren't edited when it happens within a second
2017-09-26 09:42:19 +02:00
Michael
e666c1c035
Items aren't modified when it happens within a second
2017-09-26 06:41:27 +00:00
Tobias Diekershoff
4d4072cf2b
Merge pull request #3736 from annando/more-tolerant-xml
...
Diaspora: XML parsing is more tolerant now
2017-09-26 06:09:52 +02:00
Michael
8d95106b9d
XML parsing is more tolerant now
2017-09-25 21:34:44 +00:00
Tobias Diekershoff
a60d79e36e
Merge pull request #3734 from annando/useless-function
...
Removed unused setting
2017-09-25 22:44:15 +02:00
Tobias Diekershoff
c042e68de8
Merge pull request #3735 from annando/poller-limit
...
Poller: A limit of 1 seems to be better
2017-09-25 22:43:37 +02:00
Michael
03c9e22334
Poller: A limit of 1 seems to be better
2017-09-25 19:33:41 +00:00
Michael
289dde39ce
Removed unused setting
2017-09-25 19:05:05 +00:00
Tobias Diekershoff
dc6593f418
Merge pull request #3733 from annando/diaspora-relais
...
Diaspora: Posts from Diaspora relais are transmitted the old way
2017-09-25 10:23:58 +02:00
Michael
1aafb80743
Added log information
2017-09-25 06:04:40 +00:00
Michael
66515ed85e
Diaspora: Posts from Diaspora relais are transmitted the old way
2017-09-25 04:24:47 +00:00
Michael Vogel
0e4845b58a
Merge pull request #3731 from tobiasd/20170924-doc
...
some more stuff for the docs
2017-09-24 19:17:57 +02:00
Tobias Diekershoff
3e17335418
Merge pull request #3730 from annando/ostatus-complete
...
OStatus: Thread completition hadn't worked for (some) Mastodon systems
2017-09-24 18:53:35 +02:00
Michael
9d7ab9d941
OStatus: Thread completition hadn't worked for (some) Mastodon systems
2017-09-24 15:31:09 +00:00
Tobias Diekershoff
bcdccac39c
Merge pull request #3729 from annando/plaintext-again
...
And another plaintext correction :)
2017-09-24 16:00:39 +02:00
Tobias Diekershoff
25df40e582
Merge pull request #3728 from annando/diaspora-retraction
...
Bugfix: Diaspora retractions not always worked
2017-09-24 16:00:05 +02:00