10089c6e4e
Merge pull request #3760 from friendica/revert-3743-task/update-languagedetect
...
Revert "Update languagedetect library"
2017-10-05 12:59:26 +00:00
Michael Vogel
dd57550fe7
Merge pull request #3759 from tobiasd/20171005-en
...
update EN US and GB variations
2017-10-05 14:24:37 +02:00
95e8daa4c8
update EN US and GB variations
2017-10-05 14:09:52 +02:00
Michael Vogel
d38f58fd78
Merge pull request #3758 from tobiasd/20171005-vagrant
...
give the admin user the admin panel in the Vagrant VM
2017-10-05 13:04:34 +02:00
97347692ac
give the admin user the admin panel in the Vagrant VM
2017-10-05 12:58:53 +02:00
071946fa78
Revert "Update languagedetect library"
2017-10-05 11:58:18 +02:00
c22920edba
Merge pull request #3743 from MrPetovan/task/update-languagedetect
...
Update languagedetect library
2017-10-05 08:49:17 +00:00
54e1585c22
set version to 3.6-dev
2017-10-05 10:07:21 +02:00
12b37ac596
Friendica Version 3.5.3
2017-10-05 10:05:01 +02:00
339f922652
revert unwanted (?) changes
2017-10-05 10:02:06 +02:00
4bf6ffb749
Merge pull request #3755 from tobiasd/CHANGELOG-3.5.5
...
Changelog 3.5.3
2017-10-05 08:00:27 +00:00
15216d3c34
release date
2017-10-05 09:57:32 +02:00
5039d87ba7
work on Vagrant
2017-10-05 09:57:04 +02:00
2bcd5b3243
Merge pull request #3757 from silke/develop
...
Develop
2017-10-05 07:55:00 +00:00
Silke Meyer
56bfb0f45a
Updated MySQL and PHP requirements in documentation
2017-10-04 21:57:49 +02:00
Silke Meyer
ab87f1215a
Merge remote-tracking branch 'upstream/develop' into develop
2017-10-04 21:28:35 +02:00
Silke Meyer
eadeb3ed21
Fixed settings for test mysql database and updated documentation
2017-10-04 20:25:15 +02:00
f04c84ac32
typos
2017-10-04 08:47:39 +02:00
7d3c51216f
issue closed
2017-10-04 07:56:50 +02:00
098eba9256
Merge pull request #3756 from annando/ostatus-blocked
...
Better handling of blocked contacts in OStatus
2017-10-04 05:00:49 +00:00
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
262c4d1836
some translation, release month, recent changes
2017-10-03 06:42:12 +02:00
6440297895
update ZH-CN translation thx mytbk
2017-10-03 06:35:45 +02:00
57f65a20a6
update DE translation
2017-10-03 06:29:15 +02:00
1470e8e747
Merge pull request #3753 from annando/diaspora-reshare
...
Diaspora: Reshares of reshares sometimes had problems
2017-10-02 21:45:40 +02:00
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
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
59b8b7dbee
regenerated master messages.po file
2017-10-01 08:56:06 +02:00
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
fffc360c6a
Detect the hostname when the URI is in the format data@host.tld
2017-09-30 21:39:32 +00:00
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
3354f01ed5
Doxygen and bugfix
2017-09-30 17:42:03 +00:00
2971501f63
The direct structure call is now only executed when called via the poller.php
2017-09-30 17:12:27 +00:00
d691c2e621
Database structure call is now executed directly when it cannot be called via proc_run
2017-09-30 16:45:35 +00:00
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
88a70f9e2a
Possibly better handling of the single user admin setting
2017-09-30 13:58:07 +00:00
01c2452547
Merge pull request #3747 from annando/additional-checks
...
Add additional checks for the worker
2017-09-30 13:37:32 +02:00
bd88179419
Add additional checks for the worker
2017-09-30 11:19:46 +00:00
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
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
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
