]>
git.mxchange.org Git - friendica.git/log
rabuzarus [Sun, 15 Oct 2017 16:45:49 +0000 (18:45 +0200)]
extend checkbox template for customized attributes
rabuzarus [Sun, 15 Oct 2017 15:30:28 +0000 (17:30 +0200)]
add event action: duplicate events
Tobias Diekershoff [Fri, 13 Oct 2017 16:47:02 +0000 (18:47 +0200)]
Merge pull request #3784 from annando/receive-migration
Diaspora: We now support the receiving of account migration messages
Michael Vogel [Fri, 13 Oct 2017 16:26:29 +0000 (18:26 +0200)]
Merge pull request #3785 from tobiasd/
20171013-de
update DE translation
Michael [Fri, 13 Oct 2017 16:24:38 +0000 (16:24 +0000)]
Fixed indention level
Tobias Diekershoff [Fri, 13 Oct 2017 16:10:08 +0000 (18:10 +0200)]
update DE translation
Michael [Fri, 13 Oct 2017 15:51:57 +0000 (15:51 +0000)]
Can be private
Michael [Fri, 13 Oct 2017 15:48:59 +0000 (15:48 +0000)]
Parameter should fit ...
Michael [Fri, 13 Oct 2017 15:32:10 +0000 (15:32 +0000)]
Diaspora: We now support the receiving of account migration messages
rabuzarus [Fri, 13 Oct 2017 11:06:46 +0000 (13:06 +0200)]
Merge pull request #3779 from annando/event-data
export event data for display purposes
Tobias Diekershoff [Fri, 13 Oct 2017 10:59:47 +0000 (12:59 +0200)]
Merge pull request #3783 from annando/diaspora-migration
Diaspora: Support account migration
Michael [Fri, 13 Oct 2017 10:49:51 +0000 (10:49 +0000)]
Added documentation
Michael Vogel [Fri, 13 Oct 2017 09:44:27 +0000 (11:44 +0200)]
Merge pull request #3782 from tobiasd/
20171013-msg
regenerated master messages.po file
Michael [Fri, 13 Oct 2017 09:41:01 +0000 (09:41 +0000)]
Now it could work
Michael [Fri, 13 Oct 2017 09:26:07 +0000 (09:26 +0000)]
Improved documentation
Michael [Fri, 13 Oct 2017 09:22:05 +0000 (09:22 +0000)]
Diaspora: Support account migration
Tobias Diekershoff [Fri, 13 Oct 2017 05:28:17 +0000 (07:28 +0200)]
regenerated master messages.po file
Tobias Diekershoff [Thu, 12 Oct 2017 21:44:17 +0000 (23:44 +0200)]
Merge pull request #3781 from annando/display-improvements
Improve the data generation for the display page
Michael [Thu, 12 Oct 2017 19:54:49 +0000 (19:54 +0000)]
Improve the data generation for the display page
Michael Vogel [Thu, 12 Oct 2017 16:07:25 +0000 (18:07 +0200)]
Merge pull request #3780 from AlfredSK/patch-1
Update vier with new global support forum
S.Krumbholz [Thu, 12 Oct 2017 13:59:13 +0000 (15:59 +0200)]
Update vier with new global support forum
vier has a hardcoded path to the helpers forum as well.
I've changed the path of the global support forum to https://forum.friendi.ca/profile/helpers.
Tobias Diekershoff [Thu, 12 Oct 2017 05:24:16 +0000 (07:24 +0200)]
Merge pull request #3778 from annando/initialize-sql
"dba" is now static
Michael [Wed, 11 Oct 2017 20:45:03 +0000 (20:45 +0000)]
We should take the event-id as well
Michael [Wed, 11 Oct 2017 19:51:18 +0000 (19:51 +0000)]
export event data for display purposes
Michael [Wed, 11 Oct 2017 18:21:10 +0000 (18:21 +0000)]
Avoid basepath problems
Michael [Wed, 11 Oct 2017 14:52:08 +0000 (14:52 +0000)]
Avoid undefined class variables
Michael [Wed, 11 Oct 2017 12:56:36 +0000 (12:56 +0000)]
"dba" is now a static class
Tobias Diekershoff [Wed, 11 Oct 2017 05:14:46 +0000 (07:14 +0200)]
Merge pull request #3776 from annando/initialize-sql
Checks if the database variable is initialized
Michael [Tue, 10 Oct 2017 22:25:38 +0000 (22:25 +0000)]
Additional check if the database object is initialized
Michael [Tue, 10 Oct 2017 22:18:57 +0000 (22:18 +0000)]
Checks if the database variable is initialized
Michael Vogel [Tue, 10 Oct 2017 09:39:56 +0000 (11:39 +0200)]
Merge pull request #3774 from tobiasd/
20171010-lng
ES and PT BR translation work
Tobias Diekershoff [Tue, 10 Oct 2017 09:23:51 +0000 (11:23 +0200)]
Merge pull request #3775 from annando/ostatus-nick-change
OStatus: Better handling of changed nicknames
Michael [Tue, 10 Oct 2017 09:13:37 +0000 (09:13 +0000)]
OStatus: Better handling of changed nicknames
Tobias Diekershoff [Tue, 10 Oct 2017 05:13:52 +0000 (07:13 +0200)]
update for ES thx Albert
Tobias Diekershoff [Tue, 10 Oct 2017 05:12:40 +0000 (07:12 +0200)]
update for PT BR thx abinoam
Tobias Diekershoff [Mon, 9 Oct 2017 19:39:24 +0000 (21:39 +0200)]
Merge pull request #3773 from annando/force-republish
Force a republish to the directory server
Michael [Mon, 9 Oct 2017 19:26:45 +0000 (19:26 +0000)]
Force a republish to the directory server
Tobias Diekershoff [Mon, 9 Oct 2017 05:16:32 +0000 (05:16 +0000)]
Merge pull request #3772 from annando/relocate-ignore
Process "relocate" messages even if we are ignoring a contact
Michael [Mon, 9 Oct 2017 05:02:50 +0000 (05:02 +0000)]
Process "relocate" messages even if we are ignoring a contact
rabuzarus [Sun, 8 Oct 2017 12:00:57 +0000 (14:00 +0200)]
Merge pull request #3771 from tobiasd/
20171008-doc
links in the docs
Michael Vogel [Sun, 8 Oct 2017 10:39:03 +0000 (12:39 +0200)]
Merge pull request #3770 from tobiasd/
20171008-dotca
.com -> .ca
Tobias Diekershoff [Sun, 8 Oct 2017 09:40:06 +0000 (11:40 +0200)]
changed links
Tobias Diekershoff [Sun, 8 Oct 2017 09:38:26 +0000 (11:38 +0200)]
move to forum.friendi.ca
Tobias Diekershoff [Sun, 8 Oct 2017 09:25:35 +0000 (11:25 +0200)]
move to forum.friendi.ca
Tobias Diekershoff [Sun, 8 Oct 2017 08:22:29 +0000 (10:22 +0200)]
.com -> .ca
Tobias Diekershoff [Sun, 8 Oct 2017 05:29:41 +0000 (05:29 +0000)]
Merge pull request #3769 from annando/show-forum-posts
When showing posts for a contact we have to tread forums in a special way
Michael [Sun, 8 Oct 2017 05:20:09 +0000 (05:20 +0000)]
When showing posts for a contact we have to tread forums in a special way
rabuzarus [Sat, 7 Oct 2017 21:58:15 +0000 (23:58 +0200)]
Merge pull request #3768 from annando/avoid-sql-error
Avoid SQL error when in Forum view
Michael [Sat, 7 Oct 2017 21:51:03 +0000 (21:51 +0000)]
Avoid SQL error when in Forum view
rabuzarus [Sat, 7 Oct 2017 20:39:33 +0000 (22:39 +0200)]
Merge pull request #3767 from annando/bugfix-search
Bugfix: Wrong function in search
Michael [Sat, 7 Oct 2017 19:51:49 +0000 (19:51 +0000)]
Bugfix: Wrong function in search
rabuzarus [Sat, 7 Oct 2017 18:40:33 +0000 (20:40 +0200)]
Merge pull request #3766 from annando/trim-feed
Feeds are now trimmed before importing
Michael [Sat, 7 Oct 2017 18:35:10 +0000 (18:35 +0000)]
Feeds are now trimmed before importing
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
projects / friendica.git / log