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
2252a76979
Merge pull request #3744 from annando/contact-posts
...
Reliably show posts from contact
2017-09-28 14:51:49 +02:00
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
6616c2f094
regen credits
2017-09-27 16:32:12 +02:00
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
5d566db381
zh-cn was updated as well
2017-09-27 07:15:14 +02:00
009a028c14
update EN US and GB variations
2017-09-27 07:10:12 +02:00
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
e666c1c035
Items aren't modified when it happens within a second
2017-09-26 06:41:27 +00:00
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
8d95106b9d
XML parsing is more tolerant now
2017-09-25 21:34:44 +00:00
a60d79e36e
Merge pull request #3734 from annando/useless-function
...
Removed unused setting
2017-09-25 22:44:15 +02:00
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
03c9e22334
Poller: A limit of 1 seems to be better
2017-09-25 19:33:41 +00:00
289dde39ce
Removed unused setting
2017-09-25 19:05:05 +00:00
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
1aafb80743
Added log information
2017-09-25 06:04:40 +00:00
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
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
9d7ab9d941
OStatus: Thread completition hadn't worked for (some) Mastodon systems
2017-09-24 15:31:09 +00:00
bcdccac39c
Merge pull request #3729 from annando/plaintext-again
...
And another plaintext correction :)
2017-09-24 16:00:39 +02:00
25df40e582
Merge pull request #3728 from annando/diaspora-retraction
...
Bugfix: Diaspora retractions not always worked
2017-09-24 16:00:05 +02:00
2b3bc54049
And another plaintext correction :)
2017-09-24 13:47:31 +00:00
ff6f937f2b
Author check works now
2017-09-24 13:27:35 +00:00
80d787d990
Bugfix: Diaspora retractions not always worked
2017-09-24 12:02:32 +00:00
Michael Vogel
7430e83679
Merge pull request #3727 from tobiasd/20170924-de
...
update DE translation
2017-09-24 12:59:58 +02:00
7b89168f89
missing linebreaks
2017-09-24 12:05:28 +02:00
1353417182
minor rephrasing
2017-09-24 11:04:24 +02:00
1085487c0e
missing linebreak and a typo
2017-09-24 11:00:16 +02:00
592884467b
added missing linebreak
2017-09-24 10:55:08 +02:00
d0dfcc71a8
missing linebreaks and a small typo
2017-09-24 10:52:14 +02:00
9006a678c0
added missing link to translation docs
2017-09-24 10:51:43 +02:00
fe7dbb2d49
update DE translation
2017-09-24 10:06:41 +02:00
e6f80b3bc1
Merge pull request #3726 from annando/plaintext
...
Improved type detection
2017-09-24 09:48:36 +02:00
17f2928535
Improved type detection
2017-09-24 06:36:03 +00:00
d6d1ee9112
Merge pull request #3724 from annando/plaintext
...
Better content detection for posts to Twitter
2017-09-24 07:23:47 +02:00
c72d85333b
Merge pull request #3725 from annando/mail-bugfix
...
Bugfix for better mail import
2017-09-24 07:22:13 +02:00
fc1bfe043b
The "else" case was only confusing
2017-09-23 23:15:04 +00:00
d72e6b2c82
Bugfix for better mail import
2017-09-23 22:53:44 +00:00
aeb6e53d02
Better content detection for posts to Twitter
2017-09-23 20:13:09 +00:00
7360945d8a
Merge pull request #3722 from annando/diaspora-plink
...
The plink in Diaspora posts now links to the correct place
2017-09-23 17:41:57 +02:00
6fdc524eee
Merge pull request #3721 from annando/follow-unfollow
...
Improvements for following/unfollowing of Diaspora and OStatus
2017-09-23 17:40:53 +02:00
8983dcaa77
Improvements for following/unfollowing of Diaspora and OStatus
2017-09-23 14:48:27 +00:00
e8a2c68647
The plink in Diaspora posts now links to the correct place
2017-09-23 08:52:06 +00:00
