]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoFix indentation
fabrixxm [Wed, 18 Apr 2018 17:44:10 +0000 (19:44 +0200)]
Fix indentation

6 years agoFrio: add template for admin/users
fabrixxm [Wed, 18 Apr 2018 15:52:34 +0000 (17:52 +0200)]
Frio: add template for admin/users

6 years agoMerge pull request #4859 from tobiasd/20180418-lng
Michael Vogel [Wed, 18 Apr 2018 06:17:16 +0000 (08:17 +0200)]
Merge pull request #4859 from tobiasd/20180418-lng

update to the FI translation THX Kris

6 years agoupdate to the FI translation THX Kris
Tobias Diekershoff [Wed, 18 Apr 2018 05:57:16 +0000 (07:57 +0200)]
update to the FI translation THX Kris

6 years agoMerge pull request #4857 from annando/duplicated-tags
Tobias Diekershoff [Wed, 18 Apr 2018 05:50:56 +0000 (07:50 +0200)]
Merge pull request #4857 from annando/duplicated-tags

Avoid duplicated multibyte tags

6 years agoMerge pull request #4858 from annando/issue-4655
Tobias Diekershoff [Wed, 18 Apr 2018 05:50:34 +0000 (07:50 +0200)]
Merge pull request #4858 from annando/issue-4655

Issue 4655: Avoid multiplicated contact requests from the same account

6 years agoIssue 4655: Avoid multiplicated contact requests from the same account
Michael [Wed, 18 Apr 2018 05:02:59 +0000 (05:02 +0000)]
Issue 4655: Avoid multiplicated contact requests from the same account

6 years agoAvoid duplicated multibyte tags
Michael [Wed, 18 Apr 2018 05:00:28 +0000 (05:00 +0000)]
Avoid duplicated multibyte tags

6 years agoMerge pull request #4856 from annando/dandelion
Hypolite Petovan [Tue, 17 Apr 2018 16:50:06 +0000 (12:50 -0400)]
Merge pull request #4856 from annando/dandelion

better support for the Diaspora app "Dandelion"

6 years agobetter support for the Diaspora app "Dandelion"
Michael [Tue, 17 Apr 2018 16:46:57 +0000 (16:46 +0000)]
better support for the Diaspora app "Dandelion"

6 years agoMerge pull request #4782 from Alkarex/fix-update-password
Hypolite Petovan [Tue, 17 Apr 2018 11:25:52 +0000 (07:25 -0400)]
Merge pull request #4782 from Alkarex/fix-update-password

Fix update password rehash

6 years agoMerge pull request #4853 from annando/site-defaults
Tobias Diekershoff [Tue, 17 Apr 2018 08:12:11 +0000 (10:12 +0200)]
Merge pull request #4853 from annando/site-defaults

Default values for site configuration

6 years agoMerge pull request #4852 from tobiasd/20180417-fi
Michael Vogel [Tue, 17 Apr 2018 05:24:48 +0000 (07:24 +0200)]
Merge pull request #4852 from tobiasd/20180417-fi

update to the FI translation THX Kris

6 years agoDefault values for site configuration
Michael [Tue, 17 Apr 2018 05:18:26 +0000 (05:18 +0000)]
Default values for site configuration

6 years agoupdate to the FI translation THX Kris
Tobias Diekershoff [Tue, 17 Apr 2018 05:17:46 +0000 (07:17 +0200)]
update to the FI translation THX Kris

6 years agoMerge pull request #4850 from tobiasd/20180416-newinfo
Hypolite Petovan [Mon, 16 Apr 2018 18:35:57 +0000 (14:35 -0400)]
Merge pull request #4850 from tobiasd/20180416-newinfo

new info mail address

6 years agonew info mail address
Tobias Diekershoff [Mon, 16 Apr 2018 15:28:19 +0000 (17:28 +0200)]
new info mail address

6 years agoMerge pull request #4848 from tobiasd/20180416-tos2
Hypolite Petovan [Mon, 16 Apr 2018 11:35:59 +0000 (07:35 -0400)]
Merge pull request #4848 from tobiasd/20180416-tos2

display the thing

6 years agodisplay the thing
Tobias Diekershoff [Mon, 16 Apr 2018 08:25:39 +0000 (10:25 +0200)]
display the thing

6 years agoMerge pull request #4847 from tobiasd/20180416-tos
Michael Vogel [Mon, 16 Apr 2018 08:12:17 +0000 (10:12 +0200)]
Merge pull request #4847 from tobiasd/20180416-tos

profile data is transmitted to other nodes

6 years agoprofile data is transmitted to other nodes
Tobias Diekershoff [Mon, 16 Apr 2018 07:27:16 +0000 (09:27 +0200)]
profile data is transmitted to other nodes

6 years agoMerge pull request #4846 from tobiasd/20180416-lng
Michael Vogel [Mon, 16 Apr 2018 06:50:47 +0000 (08:50 +0200)]
Merge pull request #4846 from tobiasd/20180416-lng

update to the PL translation THX waldis

6 years agoupdate to the PL translation THX waldis
Tobias Diekershoff [Mon, 16 Apr 2018 05:09:08 +0000 (07:09 +0200)]
update to the PL translation THX waldis

6 years agoMerge pull request #4845 from annando/diaspora-forums
Hypolite Petovan [Sun, 15 Apr 2018 20:35:30 +0000 (16:35 -0400)]
Merge pull request #4845 from annando/diaspora-forums

Forum posts now show the author when posted to Diaspora

6 years agoForum posts now show the author when posted to Diaspora
Michael [Sun, 15 Apr 2018 19:01:19 +0000 (19:01 +0000)]
Forum posts now show the author when posted to Diaspora

6 years agoMerge pull request #4842 from tobiasd/20180415-deluser
Hypolite Petovan [Sun, 15 Apr 2018 10:41:44 +0000 (06:41 -0400)]
Merge pull request #4842 from tobiasd/20180415-deluser

notify admin when user deletes account

6 years agonotify admin when user deletes account
Tobias Diekershoff [Sun, 15 Apr 2018 09:39:05 +0000 (11:39 +0200)]
notify admin when user deletes account

6 years agoRevert removal of legacy_password column
Alexandre Alapetite [Sun, 15 Apr 2018 09:12:32 +0000 (11:12 +0200)]
Revert removal of legacy_password column

https://github.com/friendica/friendica/pull/4782#issuecomment-380978218

6 years agoRevert "Remove SQL column legacy_password"
Alexandre Alapetite [Sun, 15 Apr 2018 08:51:22 +0000 (10:51 +0200)]
Revert "Remove SQL column legacy_password"

This reverts commit 82f1f2f00e4493c3d1d4ff1df9161cc0957defee.

6 years agoMerge pull request #4840 from AndyHee/doc20180413
Hypolite Petovan [Sat, 14 Apr 2018 11:50:08 +0000 (07:50 -0400)]
Merge pull request #4840 from AndyHee/doc20180413

Update Making-Friends.md

6 years agoUpdate Making-Friends.md
Andy H3 [Sat, 14 Apr 2018 09:27:49 +0000 (16:27 +0700)]
Update Making-Friends.md

Major changes to some outdated sections.
Minor improvements, elsewhere.

6 years agoMerge pull request #4839 from annando/profile-update
Tobias Diekershoff [Sat, 14 Apr 2018 09:04:33 +0000 (11:04 +0200)]
Merge pull request #4839 from annando/profile-update

Update the "photo" and "thumb" field in the "profile" table

6 years agoUpdate the "photo" and "thumb" field in the "profile" table
Michael [Sat, 14 Apr 2018 08:03:15 +0000 (08:03 +0000)]
Update the "photo" and "thumb" field in the "profile" table

6 years agoMerge pull request #4837 from annando/improved-callstack
Hypolite Petovan [Sat, 14 Apr 2018 00:26:41 +0000 (20:26 -0400)]
Merge pull request #4837 from annando/improved-callstack

Don't show multiple calls from the "dba" class

6 years agoDon't show multiple calls from the "dba" class to show the essential parts of the...
Michael [Fri, 13 Apr 2018 20:09:12 +0000 (20:09 +0000)]
Don't show multiple calls from the "dba" class to show the essential parts of the callstack

6 years agoMerge pull request #4834 from AndyHee/doc20180413
Tobias Diekershoff [Fri, 13 Apr 2018 15:01:12 +0000 (17:01 +0200)]
Merge pull request #4834 from AndyHee/doc20180413

Update Account-Basics.md

6 years agoUpdate Account-Basics.md
Andy H3 [Fri, 13 Apr 2018 14:41:41 +0000 (21:41 +0700)]
Update Account-Basics.md

6 years agoUpdate Account-Basics.md
Andy H3 [Fri, 13 Apr 2018 14:25:16 +0000 (21:25 +0700)]
Update Account-Basics.md

Minor changes to wording + rm dead link

6 years agoMerge pull request #4824 from M-arcus/patch-1
Hypolite Petovan [Fri, 13 Apr 2018 11:41:33 +0000 (07:41 -0400)]
Merge pull request #4824 from M-arcus/patch-1

[BUGFIX] DB: Don't check DNS on IPs

6 years agoMerge pull request #4829 from tobiasd/20180413-lng
Michael Vogel [Fri, 13 Apr 2018 09:43:41 +0000 (11:43 +0200)]
Merge pull request #4829 from tobiasd/20180413-lng

update to the FI translation THX Kris

6 years agoMerge pull request #4827 from AndyHee/doc20180413
Tobias Diekershoff [Fri, 13 Apr 2018 08:02:02 +0000 (10:02 +0200)]
Merge pull request #4827 from AndyHee/doc20180413

Update Accesskeys.md

6 years agoMerge branch 'develop' into patch-1
Marcus Müller [Fri, 13 Apr 2018 07:41:24 +0000 (09:41 +0200)]
Merge branch 'develop' into patch-1

6 years agoUpdate Accesskeys.md
Andy H3 [Fri, 13 Apr 2018 05:29:10 +0000 (12:29 +0700)]
Update Accesskeys.md

6 years agoUpdate Accesskeys.md
Andy H3 [Fri, 13 Apr 2018 05:27:19 +0000 (12:27 +0700)]
Update Accesskeys.md

6 years agoupdate to the FI translation THX Kris
Tobias Diekershoff [Fri, 13 Apr 2018 05:21:05 +0000 (07:21 +0200)]
update to the FI translation THX Kris

6 years agoupdate to the NL translation THX Karel
Tobias Diekershoff [Fri, 13 Apr 2018 05:20:36 +0000 (07:20 +0200)]
update to the NL translation THX Karel

6 years agoUpdate Accesskeys.md
Andy H3 [Fri, 13 Apr 2018 04:03:22 +0000 (11:03 +0700)]
Update Accesskeys.md

Expand intro
Format keys,
Capitalization
Style
Line breaks

6 years agoMerge pull request #4825 from M-arcus/patch-3
Hypolite Petovan [Thu, 12 Apr 2018 23:48:09 +0000 (19:48 -0400)]
Merge pull request #4825 from M-arcus/patch-3

[BUGFIX] Domain Check: Remove DNS_PTR from check

6 years agoMerge pull request #4823 from rabuzarus/20180412_-_enable_remote_user_if_local_user
Michael Vogel [Thu, 12 Apr 2018 21:43:43 +0000 (23:43 +0200)]
Merge pull request #4823 from rabuzarus/20180412_-_enable_remote_user_if_local_user

local_user() could also be a remote_user()

6 years ago[BUGFIX] DB: Remove host DNS_PTR check
Marcus Müller [Thu, 12 Apr 2018 17:32:04 +0000 (19:32 +0200)]
[BUGFIX] DB: Remove host DNS_PTR check

DNS_PTR checks fail on some domains and result in the return value `false`, even if the domain is valid and reachable.

6 years ago[BUGFIX] Network: Remove URL/domain DNS_PTR checks
Marcus Müller [Thu, 12 Apr 2018 17:28:52 +0000 (19:28 +0200)]
[BUGFIX] Network: Remove URL/domain DNS_PTR checks

6 years ago[BUGFIX] DB: Don't check DNS on IPs
Marcus Müller [Thu, 12 Apr 2018 17:14:53 +0000 (19:14 +0200)]
[BUGFIX] DB: Don't check DNS on IPs

Fixes https://github.com/friendica/friendica/issues/4786

6 years agolocal_user() could also be a remote_user()
rabuzarus [Thu, 12 Apr 2018 15:10:48 +0000 (17:10 +0200)]
local_user() could also be a remote_user()

6 years agoMerge pull request #4822 from annando/issue-4816
Hypolite Petovan [Thu, 12 Apr 2018 11:13:27 +0000 (07:13 -0400)]
Merge pull request #4822 from annando/issue-4816

 Issue-4816: Avoid SQL errors / Unarchive living relais servers

6 years agoMerge pull request #4821 from tobiasd/20180412-lng
Michael Vogel [Thu, 12 Apr 2018 09:03:49 +0000 (11:03 +0200)]
Merge pull request #4821 from tobiasd/20180412-lng

DE and NL translation updates THX Karel and S.Krumbholz

6 years agoMerge pull request #4820 from tobiasd/20180412-contactreason
Michael Vogel [Thu, 12 Apr 2018 09:03:12 +0000 (11:03 +0200)]
Merge pull request #4820 from tobiasd/20180412-contactreason

added missiing information to theme templates

6 years agoStore in lowercase to avoid duplicates
Michael [Thu, 12 Apr 2018 08:55:36 +0000 (08:55 +0000)]
Store in lowercase to avoid duplicates

6 years agoMerge remote-tracking branch 'upstream/develop' into issue-4816
Michael [Thu, 12 Apr 2018 08:53:56 +0000 (08:53 +0000)]
Merge remote-tracking branch 'upstream/develop' into issue-4816

6 years agoDE and NL translation updates THX Karel and S.Krumbholz
Tobias Diekershoff [Thu, 12 Apr 2018 08:41:49 +0000 (10:41 +0200)]
DE and NL translation updates THX Karel and S.Krumbholz

6 years agoadded missiing information to theme templates
Tobias Diekershoff [Thu, 12 Apr 2018 08:33:28 +0000 (10:33 +0200)]
added missiing information to theme templates

6 years agoMerge pull request #4817 from annando/relais-duplicates
Hypolite Petovan [Wed, 11 Apr 2018 23:00:34 +0000 (19:00 -0400)]
Merge pull request #4817 from annando/relais-duplicates

Avoid sending relay posts to servers that already received content

6 years agoMerge pull request #4812 from tobiasd/20180411-noreply
Hypolite Petovan [Wed, 11 Apr 2018 22:59:17 +0000 (18:59 -0400)]
Merge pull request #4812 from tobiasd/20180411-noreply

noreply should not be translate-able in email addresses

6 years agoMerge branch 'issue-4816' of github.com:annando/friendica into issue-4816
Michael [Wed, 11 Apr 2018 19:21:23 +0000 (19:21 +0000)]
Merge branch 'issue-4816' of github.com:annando/friendica into issue-4816

6 years agoRelay: Avoid sending relay posts to servers that already received content
Michael [Wed, 11 Apr 2018 19:01:25 +0000 (19:01 +0000)]
Relay: Avoid sending relay posts to servers that already received content

6 years agoIssue-4816: Avoid SQL errors / Unarchive living relais servers
Michael [Wed, 11 Apr 2018 18:56:22 +0000 (18:56 +0000)]
Issue-4816: Avoid SQL errors / Unarchive living relais servers

6 years agomake it unreadable... almost
Tobias Diekershoff [Wed, 11 Apr 2018 12:12:53 +0000 (14:12 +0200)]
make it unreadable... almost

6 years agoMerge pull request #4813 from tobiasd/20180411-homeexample
Hypolite Petovan [Wed, 11 Apr 2018 11:58:17 +0000 (07:58 -0400)]
Merge pull request #4813 from tobiasd/20180411-homeexample

added example home css and html file

6 years agoMerge pull request #4811 from tobiasd/20180411-lng3
Hypolite Petovan [Wed, 11 Apr 2018 11:55:57 +0000 (07:55 -0400)]
Merge pull request #4811 from tobiasd/20180411-lng3

translation updates

6 years agomore text
Tobias Diekershoff [Wed, 11 Apr 2018 09:25:16 +0000 (11:25 +0200)]
more text

6 years agoadded example home css and html file
Tobias Diekershoff [Wed, 11 Apr 2018 09:03:18 +0000 (11:03 +0200)]
added example home css and html file

6 years agonoreply should not be translate-able in email addresses
Tobias Diekershoff [Wed, 11 Apr 2018 06:17:44 +0000 (08:17 +0200)]
noreply should not be translate-able in email addresses

6 years agotranslation updates
Tobias Diekershoff [Wed, 11 Apr 2018 06:02:38 +0000 (08:02 +0200)]
translation updates

6 years agoMerge pull request #4808 from tobiasd/20180410-deis
Michael Vogel [Tue, 10 Apr 2018 16:37:48 +0000 (18:37 +0200)]
Merge pull request #4808 from tobiasd/20180410-deis

Updates to DE and IS translation

6 years agoIS translation THX Sveinn í Felli
Tobias Diekershoff [Tue, 10 Apr 2018 16:30:59 +0000 (18:30 +0200)]
IS translation THX Sveinn í Felli

6 years agoDE translations THX Copiis
Tobias Diekershoff [Tue, 10 Apr 2018 16:30:17 +0000 (18:30 +0200)]
DE translations THX Copiis

6 years agoMerge pull request #4807 from annando/archival-days
Tobias Diekershoff [Tue, 10 Apr 2018 12:34:18 +0000 (14:34 +0200)]
Merge pull request #4807 from annando/archival-days

We can now define the days after a contact is archived

6 years agoWe can now define the days after a contact is archived
Michael [Tue, 10 Apr 2018 11:10:02 +0000 (11:10 +0000)]
We can now define the days after a contact is archived

6 years agoMerge pull request #4806 from MrPetovan/task/improve-strikethrough-support
Tobias Diekershoff [Tue, 10 Apr 2018 10:44:40 +0000 (12:44 +0200)]
Merge pull request #4806 from MrPetovan/task/improve-strikethrough-support

[BBCode] Improve support for strikethrough

6 years ago[BBCode] Improve support for strikethrough
Hypolite Petovan [Tue, 10 Apr 2018 10:23:40 +0000 (06:23 -0400)]
[BBCode] Improve support for strikethrough

6 years agoMerge pull request #4802 from Rudloff/feature/api_get_user
Hypolite Petovan [Tue, 10 Apr 2018 09:28:56 +0000 (05:28 -0400)]
Merge pull request #4802 from Rudloff/feature/api_get_user

api_get_user() should not return false right away if the number in the URL is not a valid user

6 years agoapi_get_user() should not return false right away if the number in the URL is not...
Pierre Rudloff [Tue, 10 Apr 2018 08:46:10 +0000 (10:46 +0200)]
api_get_user() should not return false right away if the number in the URL is not a valid user

6 years agoMerge pull request #4801 from annando/ignore-callstack
Tobias Diekershoff [Tue, 10 Apr 2018 08:04:25 +0000 (10:04 +0200)]
Merge pull request #4801 from annando/ignore-callstack

Ignore function "call_user_func_array" in the callstack

6 years agoIgnore function "call_user_func_array" in the callstack
Michael [Tue, 10 Apr 2018 05:55:36 +0000 (05:55 +0000)]
Ignore function "call_user_func_array" in the callstack

6 years agoMerge pull request #4800 from tobiasd/20180410-lng
Michael Vogel [Tue, 10 Apr 2018 05:34:53 +0000 (07:34 +0200)]
Merge pull request #4800 from tobiasd/20180410-lng

Updates to the EN-GB, EN-US and FI-FI translations

6 years agoUpdates to the EN-GB, EN-US and FI-FI translations
Tobias Diekershoff [Tue, 10 Apr 2018 05:23:50 +0000 (07:23 +0200)]
Updates to the EN-GB, EN-US and FI-FI translations

6 years agoMerge pull request #4798 from MrPetovan/bug/prevent-empty-uid-in-preloadconfigadapter
Michael Vogel [Tue, 10 Apr 2018 05:07:10 +0000 (07:07 +0200)]
Merge pull request #4798 from MrPetovan/bug/prevent-empty-uid-in-preloadconfigadapter

Prevent empty $uid from messing up the PreloadConfigAdapter

6 years agoMerge pull request #4799 from MrPetovan/task/hide-ignored-unfollowed-contact-posts
Michael Vogel [Tue, 10 Apr 2018 04:58:36 +0000 (06:58 +0200)]
Merge pull request #4799 from MrPetovan/task/hide-ignored-unfollowed-contact-posts

Reintroduce own posts in network list

6 years agoReintroduce own posts in network list
Hypolite Petovan [Tue, 10 Apr 2018 02:50:03 +0000 (22:50 -0400)]
Reintroduce own posts in network list

6 years agoPrevent empty $uid from messing up the PreloadConfigAdapter
Hypolite Petovan [Tue, 10 Apr 2018 01:24:22 +0000 (21:24 -0400)]
Prevent empty $uid from messing up the PreloadConfigAdapter

6 years agoMerge pull request #4796 from Rudloff/feature/travis
Hypolite Petovan [Tue, 10 Apr 2018 00:30:59 +0000 (20:30 -0400)]
Merge pull request #4796 from Rudloff/feature/travis

Enable Travis

6 years agoRegroup old tests in the TextTest class
Pierre Rudloff [Tue, 10 Apr 2018 00:20:20 +0000 (02:20 +0200)]
Regroup old tests in the TextTest class

6 years agoMerge pull request #4797 from annando/dba
Hypolite Petovan [Mon, 9 Apr 2018 23:43:23 +0000 (19:43 -0400)]
Merge pull request #4797 from annando/dba

Old database functions had been replaced in the workers

6 years agoOld database functions had been replaced in the workers
Michael [Mon, 9 Apr 2018 21:34:23 +0000 (21:34 +0000)]
Old database functions had been replaced in the workers

6 years agoRemove old tests
Pierre Rudloff [Mon, 9 Apr 2018 21:03:29 +0000 (23:03 +0200)]
Remove old tests
Add tests for the BaseObject class

6 years agoEnable Travis
Pierre Rudloff [Mon, 9 Apr 2018 19:49:23 +0000 (21:49 +0200)]
Enable Travis

6 years agoVarious small fixes (#4795)
Pierre Rudloff [Mon, 9 Apr 2018 19:34:53 +0000 (21:34 +0200)]
Various small fixes (#4795)

* Use strict comparison to avoid 0 == false
* Avoid unecessary loop
* Avoid undefined variable
* Fix wrong variable name
* Don't try to use the $status_info variable if it does not exist
* Avoid undefined variable
* Check that variable is defined before trying to use it
* Don't cast $data array to boolean
* Fix undefined array
* $reactivate_group variable is not always defined
* Variable $found is not always defined
* Remove unused return statement
* Fix undefined array
* api_unique_id_to_nurl() requires an integer as argument
* Don't try to use $uinfo if it is false
* Don't use the same variable names in inner loop
* Throw an exception if $fileext is not defined

6 years agoMerge pull request #4768 from MrPetovan/task/hide-ignored-unfollowed-contact-posts
Michael Vogel [Mon, 9 Apr 2018 18:08:20 +0000 (20:08 +0200)]
Merge pull request #4768 from MrPetovan/task/hide-ignored-unfollowed-contact-posts

Hide posts from recently ignored/unfollowed contact

6 years agoMerge pull request #4794 from Rudloff/feature/return_type
Hypolite Petovan [Mon, 9 Apr 2018 18:07:27 +0000 (14:07 -0400)]
Merge pull request #4794 from Rudloff/feature/return_type

Return types

6 years agoAdd some missing return types
Pierre Rudloff [Mon, 9 Apr 2018 17:34:02 +0000 (19:34 +0200)]
Add some missing return types

6 years agoapi_format_data() seems to never return an object
Pierre Rudloff [Mon, 9 Apr 2018 17:19:00 +0000 (19:19 +0200)]
api_format_data() seems to never return an object