]>
git.mxchange.org Git - friendica.git/log
Tobias Diekershoff [Sat, 7 Oct 2017 16:00:21 +0000 (16:00 +0000)]
Merge pull request #3765 from annando/resend-frio
Frio: Relocate message wasn't send
Michael [Sat, 7 Oct 2017 15:45:00 +0000 (15:45 +0000)]
Frio: Relocate message wasn't send
Tobias Diekershoff [Sat, 7 Oct 2017 13:10:39 +0000 (13:10 +0000)]
Merge pull request #3764 from annando/contact-blocked
Preparation for the possibility to globally block contacts
Michael [Sat, 7 Oct 2017 09:52:43 +0000 (09:52 +0000)]
Preparation for the possibility to globally block contacts
Tobias Diekershoff [Sat, 7 Oct 2017 06:01:16 +0000 (06:01 +0000)]
Merge pull request #3763 from annando/relocation-addr
Fixes the not changed "addr" entry when an account is imported
Michael [Sat, 7 Oct 2017 05:20:46 +0000 (05:20 +0000)]
Fixes the not changed "addr" entry when an account is imported
Tobias Diekershoff [Fri, 6 Oct 2017 23:30:11 +0000 (23:30 +0000)]
Merge pull request #3762 from annando/avoid-sql-error
Fix SQL error when changing the SSL paths
Michael [Fri, 6 Oct 2017 19:25:04 +0000 (19:25 +0000)]
Fix SQL error when changing the SSL paths
Tobias Diekershoff [Thu, 5 Oct 2017 12:59:26 +0000 (12:59 +0000)]
Merge pull request #3760 from friendica/revert-3743-task/update-languagedetect
Revert "Update languagedetect library"
Michael Vogel [Thu, 5 Oct 2017 12:24:37 +0000 (14:24 +0200)]
Merge pull request #3759 from tobiasd/
20171005 -en
update EN US and GB variations
Tobias Diekershoff [Thu, 5 Oct 2017 12:09:52 +0000 (14:09 +0200)]
update EN US and GB variations
Michael Vogel [Thu, 5 Oct 2017 11:04:34 +0000 (13:04 +0200)]
Merge pull request #3758 from tobiasd/
20171005 -vagrant
give the admin user the admin panel in the Vagrant VM
Tobias Diekershoff [Thu, 5 Oct 2017 10:58:53 +0000 (12:58 +0200)]
give the admin user the admin panel in the Vagrant VM
Tobias Diekershoff [Thu, 5 Oct 2017 09:58:18 +0000 (11:58 +0200)]
Revert "Update languagedetect library"
Tobias Diekershoff [Thu, 5 Oct 2017 08:49:17 +0000 (08:49 +0000)]
Merge pull request #3743 from MrPetovan/task/update-languagedetect
Update languagedetect library
Tobias Diekershoff [Thu, 5 Oct 2017 08:07:21 +0000 (10:07 +0200)]
set version to 3.6-dev
Tobias Diekershoff [Thu, 5 Oct 2017 08:05:01 +0000 (10:05 +0200)]
Friendica Version 3.5.3
Tobias Diekershoff [Thu, 5 Oct 2017 08:02:06 +0000 (10:02 +0200)]
revert unwanted (?) changes
Tobias Diekershoff [Thu, 5 Oct 2017 08:00:27 +0000 (08:00 +0000)]
Merge pull request #3755 from tobiasd/CHANGELOG-3.5.5
Changelog 3.5.3
Tobias Diekershoff [Thu, 5 Oct 2017 07:57:32 +0000 (09:57 +0200)]
release date
Tobias Diekershoff [Thu, 5 Oct 2017 07:57:04 +0000 (09:57 +0200)]
work on Vagrant
Tobias Diekershoff [Thu, 5 Oct 2017 07:55:00 +0000 (07:55 +0000)]
Merge pull request #3757 from silke/develop
Develop
Silke Meyer [Wed, 4 Oct 2017 19:57:49 +0000 (21:57 +0200)]
Updated MySQL and PHP requirements in documentation
Silke Meyer [Wed, 4 Oct 2017 19:28:35 +0000 (21:28 +0200)]
Merge remote-tracking branch 'upstream/develop' into develop
Silke Meyer [Wed, 4 Oct 2017 18:25:15 +0000 (20:25 +0200)]
Fixed settings for test mysql database and updated documentation
Tobias Diekershoff [Wed, 4 Oct 2017 06:47:39 +0000 (08:47 +0200)]
typos
Tobias Diekershoff [Wed, 4 Oct 2017 05:56:50 +0000 (07:56 +0200)]
issue closed
Tobias Diekershoff [Wed, 4 Oct 2017 05:00:49 +0000 (05:00 +0000)]
Merge pull request #3756 from annando/ostatus-blocked
Better handling of blocked contacts in OStatus
Michael [Tue, 3 Oct 2017 20:52:24 +0000 (20:52 +0000)]
Better handling of blocked contacts in OStatus
Michael Vogel [Tue, 3 Oct 2017 18:17:59 +0000 (20:17 +0200)]
Merge pull request #3754 from tobiasd/
20171003 -de
DE and ZH-CN translation
Tobias Diekershoff [Tue, 3 Oct 2017 04:42:12 +0000 (06:42 +0200)]
some translation, release month, recent changes
Tobias Diekershoff [Tue, 3 Oct 2017 04:35:45 +0000 (06:35 +0200)]
update ZH-CN translation thx mytbk
Tobias Diekershoff [Tue, 3 Oct 2017 04:29:15 +0000 (06:29 +0200)]
update DE translation
Tobias Diekershoff [Mon, 2 Oct 2017 19:45:40 +0000 (21:45 +0200)]
Merge pull request #3753 from annando/diaspora-reshare
Diaspora: Reshares of reshares sometimes had problems
Michael [Mon, 2 Oct 2017 19:00:33 +0000 (19:00 +0000)]
Diaspora: Reshares of reshares sometimes had problems
Michael Vogel [Mon, 2 Oct 2017 17:19:15 +0000 (19:19 +0200)]
Merge pull request #3752 from tobiasd/
20171002 -zhcn
update ZH-CN translation thx mytbk
Tobias Diekershoff [Mon, 2 Oct 2017 16:08:21 +0000 (18:08 +0200)]
update ZH-CN translation
Michael Vogel [Sun, 1 Oct 2017 07:14:58 +0000 (09:14 +0200)]
Merge pull request #3751 from tobiasd/201709´1001-messages
regenerated master messages.po file
Tobias Diekershoff [Sun, 1 Oct 2017 06:56:06 +0000 (08:56 +0200)]
regenerated master messages.po file
Tobias Diekershoff [Sun, 1 Oct 2017 00:07:18 +0000 (02:07 +0200)]
Merge pull request #3750 from annando/mail-guid
Detect the hostname when the URI is in the format data@host.tld
Michael [Sat, 30 Sep 2017 21:39:32 +0000 (21:39 +0000)]
Detect the hostname when the URI is in the format data@host.tld
Tobias Diekershoff [Sat, 30 Sep 2017 17:49:44 +0000 (19:49 +0200)]
Merge pull request #3749 from annando/poller-db-update
DB Structure call is now executed directly when it cannot be called via proc_run
Michael [Sat, 30 Sep 2017 17:42:03 +0000 (17:42 +0000)]
Doxygen and bugfix
Michael [Sat, 30 Sep 2017 17:12:27 +0000 (17:12 +0000)]
The direct structure call is now only executed when called via the poller.php
Michael [Sat, 30 Sep 2017 16:45:35 +0000 (16:45 +0000)]
Database structure call is now executed directly when it cannot be called via proc_run
Tobias Diekershoff [Sat, 30 Sep 2017 14:13:51 +0000 (16:13 +0200)]
Merge pull request #3748 from annando/single-user
Possibly better handling of the single user admin setting
Michael [Sat, 30 Sep 2017 13:58:07 +0000 (13:58 +0000)]
Possibly better handling of the single user admin setting
Tobias Diekershoff [Sat, 30 Sep 2017 11:37:32 +0000 (13:37 +0200)]
Merge pull request #3747 from annando/additional-checks
Add additional checks for the worker
Michael [Sat, 30 Sep 2017 11:19:46 +0000 (11:19 +0000)]
Add additional checks for the worker
Tobias Diekershoff [Sat, 30 Sep 2017 08:15:29 +0000 (10:15 +0200)]
Merge pull request #3746 from annando/snarl
Semaphore lock deactivated for PHP lower 5.6.1
Michael [Sat, 30 Sep 2017 07:51:09 +0000 (07:51 +0000)]
Semaphore lock deactivated for PHP lower 5.6.1
Michael Vogel [Fri, 29 Sep 2017 01:41:56 +0000 (03:41 +0200)]
Merge pull request #3745 from Alkarex/sql_fbrowser_rc
SQL fix fbrowser (RC)
Alexandre Alapetite [Thu, 28 Sep 2017 19:24:07 +0000 (21:24 +0200)]
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
```
Tobias Diekershoff [Thu, 28 Sep 2017 12:51:49 +0000 (14:51 +0200)]
Merge pull request #3744 from annando/contact-posts
Reliably show posts from contact
Michael [Thu, 28 Sep 2017 06:01:31 +0000 (06:01 +0000)]
Reliably show posts from contact
Hypolite Petovan [Thu, 28 Sep 2017 02:40:58 +0000 (22:40 -0400)]
Remove references to the library/langdet folder
Hypolite Petovan [Thu, 28 Sep 2017 02:40:05 +0000 (22:40 -0400)]
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
Hypolite Petovan [Thu, 28 Sep 2017 02:37:32 +0000 (22:37 -0400)]
Update existing Composer dependencies
- MobileDetect 2.8.26
- Pear 1.10.5
- XML Util 1.4.3
Michael Vogel [Wed, 27 Sep 2017 17:24:48 +0000 (19:24 +0200)]
Merge pull request #3741 from tobiasd/
20170927 -credits
regen credits
Tobias Diekershoff [Wed, 27 Sep 2017 14:46:11 +0000 (16:46 +0200)]
some translation
Tobias Diekershoff [Wed, 27 Sep 2017 14:42:57 +0000 (16:42 +0200)]
some translation
Tobias Diekershoff [Wed, 27 Sep 2017 14:32:12 +0000 (16:32 +0200)]
regen credits
Tobias Diekershoff [Wed, 27 Sep 2017 12:52:18 +0000 (14:52 +0200)]
Merge pull request #3740 from rabuzarus/20170927_-_add_comment
add a comment as explanation for #3737
rabuzarus [Wed, 27 Sep 2017 12:15:45 +0000 (14:15 +0200)]
add a comment as explanation for #3737
Michael Vogel [Wed, 27 Sep 2017 05:39:28 +0000 (07:39 +0200)]
Merge pull request #3738 from tobiasd/
20170927 -en
EN and ZH-CN translations
Tobias Diekershoff [Wed, 27 Sep 2017 05:15:14 +0000 (07:15 +0200)]
zh-cn was updated as well
Tobias Diekershoff [Wed, 27 Sep 2017 05:10:12 +0000 (07:10 +0200)]
update EN US and GB variations
Tobias Diekershoff [Tue, 26 Sep 2017 07:42:19 +0000 (09:42 +0200)]
Merge pull request #3737 from annando/is_modified
Items aren't edited when it happens within a second
Michael [Tue, 26 Sep 2017 06:41:27 +0000 (06:41 +0000)]
Items aren't modified when it happens within a second
Tobias Diekershoff [Tue, 26 Sep 2017 04:09:52 +0000 (06:09 +0200)]
Merge pull request #3736 from annando/more-tolerant-xml
Diaspora: XML parsing is more tolerant now
Michael [Mon, 25 Sep 2017 21:34:44 +0000 (21:34 +0000)]
XML parsing is more tolerant now
Tobias Diekershoff [Mon, 25 Sep 2017 20:44:15 +0000 (22:44 +0200)]
Merge pull request #3734 from annando/useless-function
Removed unused setting
Tobias Diekershoff [Mon, 25 Sep 2017 20:43:37 +0000 (22:43 +0200)]
Merge pull request #3735 from annando/poller-limit
Poller: A limit of 1 seems to be better
Michael [Mon, 25 Sep 2017 19:33:41 +0000 (19:33 +0000)]
Poller: A limit of 1 seems to be better
Michael [Mon, 25 Sep 2017 19:05:05 +0000 (19:05 +0000)]
Removed unused setting
Tobias Diekershoff [Mon, 25 Sep 2017 08:23:58 +0000 (10:23 +0200)]
Merge pull request #3733 from annando/diaspora-relais
Diaspora: Posts from Diaspora relais are transmitted the old way
Michael [Mon, 25 Sep 2017 06:04:40 +0000 (06:04 +0000)]
Added log information
Michael [Mon, 25 Sep 2017 04:24:47 +0000 (04:24 +0000)]
Diaspora: Posts from Diaspora relais are transmitted the old way
Michael Vogel [Sun, 24 Sep 2017 17:17:57 +0000 (19:17 +0200)]
Merge pull request #3731 from tobiasd/
20170924 -doc
some more stuff for the docs
Tobias Diekershoff [Sun, 24 Sep 2017 16:53:35 +0000 (18:53 +0200)]
Merge pull request #3730 from annando/ostatus-complete
OStatus: Thread completition hadn't worked for (some) Mastodon systems
Michael [Sun, 24 Sep 2017 15:31:09 +0000 (15:31 +0000)]
OStatus: Thread completition hadn't worked for (some) Mastodon systems
Michael Vogel [Sun, 24 Sep 2017 14:35:12 +0000 (16:35 +0200)]
Merge pull request #3723 from shaftoe/develop
Fix Nginx example config
Tobias Diekershoff [Sun, 24 Sep 2017 14:00:39 +0000 (16:00 +0200)]
Merge pull request #3729 from annando/plaintext-again
And another plaintext correction :)
Tobias Diekershoff [Sun, 24 Sep 2017 14:00:05 +0000 (16:00 +0200)]
Merge pull request #3728 from annando/diaspora-retraction
Bugfix: Diaspora retractions not always worked
Michael [Sun, 24 Sep 2017 13:47:31 +0000 (13:47 +0000)]
And another plaintext correction :)
Michael [Sun, 24 Sep 2017 13:27:35 +0000 (13:27 +0000)]
Author check works now
Michael [Sun, 24 Sep 2017 12:02:32 +0000 (12:02 +0000)]
Bugfix: Diaspora retractions not always worked
Michael Vogel [Sun, 24 Sep 2017 10:59:58 +0000 (12:59 +0200)]
Merge pull request #3727 from tobiasd/
20170924 -de
update DE translation
Tobias Diekershoff [Sun, 24 Sep 2017 10:05:28 +0000 (12:05 +0200)]
missing linebreaks
Tobias Diekershoff [Sun, 24 Sep 2017 09:04:24 +0000 (11:04 +0200)]
minor rephrasing
Tobias Diekershoff [Sun, 24 Sep 2017 09:00:16 +0000 (11:00 +0200)]
missing linebreak and a typo
Tobias Diekershoff [Sun, 24 Sep 2017 08:55:08 +0000 (10:55 +0200)]
added missing linebreak
Tobias Diekershoff [Sun, 24 Sep 2017 08:52:14 +0000 (10:52 +0200)]
missing linebreaks and a small typo
Tobias Diekershoff [Sun, 24 Sep 2017 08:51:43 +0000 (10:51 +0200)]
added missing link to translation docs
Tobias Diekershoff [Sun, 24 Sep 2017 08:06:41 +0000 (10:06 +0200)]
update DE translation
Tobias Diekershoff [Sun, 24 Sep 2017 07:48:36 +0000 (09:48 +0200)]
Merge pull request #3726 from annando/plaintext
Improved type detection
Michael [Sun, 24 Sep 2017 06:36:03 +0000 (06:36 +0000)]
Improved type detection
Tobias Diekershoff [Sun, 24 Sep 2017 05:23:47 +0000 (07:23 +0200)]
Merge pull request #3724 from annando/plaintext
Better content detection for posts to Twitter
Tobias Diekershoff [Sun, 24 Sep 2017 05:22:13 +0000 (07:22 +0200)]
Merge pull request #3725 from annando/mail-bugfix
Bugfix for better mail import
Michael [Sat, 23 Sep 2017 23:15:04 +0000 (23:15 +0000)]
The "else" case was only confusing