jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16203 commits 10 branches 58 tags 216 MiB
Commit graph

16203 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Hypolite Petovan
ba1975ac3a Remove references to the library/langdet folder 2017-09-27 22:40:58 -04:00
Hypolite Petovan
64243d33d0 Add Composer dependency LanguageDetect 
Warning: LanguageDetect.php has been manually modified until this PR is
accepted: https://github.com/pear/Text_LanguageDetect/pull/4

Please use the version provided in vendor in the meantime
 2017-09-27 22:40:05 -04:00
Hypolite Petovan
6067da7d28 Update existing Composer dependencies 
- MobileDetect 2.8.26
- Pear 1.10.5
- XML Util 1.4.3
 2017-09-27 22:37:32 -04:00
Michael Vogel
0b02d009b0 Merge pull request #3741 from tobiasd/20170927-credits 
regen credits
 2017-09-27 19:24:48 +02:00
Tobias Diekershoff
9ad03e5b43 some translation 2017-09-27 16:46:11 +02:00
Tobias Diekershoff
b60a6e6f7f some translation 2017-09-27 16:42:57 +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
Michael Vogel
21fecb956c Merge pull request #3723 from shaftoe/develop 
Fix Nginx example config
 2017-09-24 16:35:12 +02: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
Michael
2b3bc54049 And another plaintext correction :) 2017-09-24 13:47:31 +00:00
Michael
ff6f937f2b Author check works now 2017-09-24 13:27:35 +00:00
Michael
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
Tobias Diekershoff
7b89168f89 missing linebreaks 2017-09-24 12:05:28 +02:00
Tobias Diekershoff
1353417182 minor rephrasing 2017-09-24 11:04:24 +02:00
Tobias Diekershoff
1085487c0e missing linebreak and a typo 2017-09-24 11:00:16 +02:00
Tobias Diekershoff
592884467b added missing linebreak 2017-09-24 10:55:08 +02:00
Tobias Diekershoff
d0dfcc71a8 missing linebreaks and a small typo 2017-09-24 10:52:14 +02:00
Tobias Diekershoff
9006a678c0 added missing link to translation docs 2017-09-24 10:51:43 +02:00
Tobias Diekershoff
fe7dbb2d49 update DE translation 2017-09-24 10:06:41 +02:00
Tobias Diekershoff
e6f80b3bc1 Merge pull request #3726 from annando/plaintext 
Improved type detection
 2017-09-24 09:48:36 +02:00
Michael
17f2928535 Improved type detection 2017-09-24 06:36:03 +00:00
Tobias Diekershoff
d6d1ee9112 Merge pull request #3724 from annando/plaintext 
Better content detection for posts to Twitter
 2017-09-24 07:23:47 +02:00
Tobias Diekershoff
c72d85333b Merge pull request #3725 from annando/mail-bugfix 
Bugfix for better mail import
 2017-09-24 07:22:13 +02:00
Michael
fc1bfe043b The "else" case was only confusing 2017-09-23 23:15:04 +00:00
Michael
d72e6b2c82 Bugfix for better mail import 2017-09-23 22:53:44 +00:00