]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoFix formatting in frio_boot.php
Hypolite Petovan [Sat, 28 Apr 2018 22:33:52 +0000 (18:33 -0400)]
Fix formatting in frio_boot.php

6 years agoAdd new methods to src
Hypolite Petovan [Sat, 28 Apr 2018 22:30:13 +0000 (18:30 -0400)]
Add new methods to src

- Add App::getCurrentTheme()
- Add App::getCurrentThemeStylesheetPath()
- Add Theme::getStylesheetPath()

6 years agoFix formatting in Core\Theme
Hypolite Petovan [Sat, 28 Apr 2018 22:28:23 +0000 (18:28 -0400)]
Fix formatting in Core\Theme

6 years agoMerge pull request #4939 from astifter/better_curl_error_during_install
Hypolite Petovan [Fri, 27 Apr 2018 20:57:01 +0000 (16:57 -0400)]
Merge pull request #4939 from astifter/better_curl_error_during_install

Better curl error during install.

6 years agoMerge pull request #4940 from astifter/fix_login_when_openid_disabled
Hypolite Petovan [Fri, 27 Apr 2018 20:49:38 +0000 (16:49 -0400)]
Merge pull request #4940 from astifter/fix_login_when_openid_disabled

frio: Fix login page layout without OpenId.

6 years agoChanges requested by @MrPetovan.
Andreas Neustifter [Fri, 27 Apr 2018 20:22:17 +0000 (20:22 +0000)]
Changes requested by @MrPetovan.

6 years agoFix login page layout without OpenId.
Andreas Neustifter [Fri, 27 Apr 2018 20:00:46 +0000 (20:00 +0000)]
Fix login page layout without OpenId.

When OpenId is disabled and the input therefore is missing from the login the page looks
weird. Fix that.

6 years agoExclude editor backups from Git.
Andreas Neustifter [Fri, 27 Apr 2018 19:28:22 +0000 (21:28 +0200)]
Exclude editor backups from Git.

6 years agoProper error when rewrite fails during install.
Andreas Neustifter [Fri, 27 Apr 2018 19:27:55 +0000 (21:27 +0200)]
Proper error when rewrite fails during install.

When Curl tries to fetch the rewrite test URL and something goes wrong the user
has no clue what was the problem. This problems can include:
- The rewriting not working at all.
- HTTPS redirects do not work.
- Curl does not accept the presented SSL cert.

This commit fixes this by providing the Curl error message to the user to further
debug the problem.

Fixes #3629.~

6 years agoMerge pull request #4937 from astifter/install_theme_when_set
Hypolite Petovan [Fri, 27 Apr 2018 18:59:52 +0000 (14:59 -0400)]
Merge pull request #4937 from astifter/install_theme_when_set

Install selected theme during settings persistence.

6 years agoInstall selected theme during settings persistence.
Andreas Neustifter [Fri, 27 Apr 2018 18:45:34 +0000 (20:45 +0200)]
Install selected theme during settings persistence.

Themes have to be installed to be usable by the system. This is not done
automatically which lead to the problems with the site when themes where
switched right after the install and before the "Reload themes" button
was pressed in the admin page.

This patch makes sure that the selected them is always installed when
it is selected by the user either in the admin or settings page.

Fixes #4921.

6 years agoMerge pull request #4890 from astifter/reorganize_login
rabuzarus [Fri, 27 Apr 2018 17:56:25 +0000 (19:56 +0200)]
Merge pull request #4890 from astifter/reorganize_login

Reorganize Login to Fix #4878

6 years agoMerge pull request #4930 from MrPetovan/task/improve-frio-bg-image
rabuzarus [Fri, 27 Apr 2018 17:55:47 +0000 (19:55 +0200)]
Merge pull request #4930 from MrPetovan/task/improve-frio-bg-image

[frio] Improve background image settings

6 years agoMerge pull request #4936 from annando/fix-reshare
Hypolite Petovan [Fri, 27 Apr 2018 14:38:51 +0000 (10:38 -0400)]
Merge pull request #4936 from annando/fix-reshare

Diaspora reshares should now always reshare the correct content

6 years agoPossibly not so important change ;-)
Michael [Fri, 27 Apr 2018 14:21:12 +0000 (14:21 +0000)]
Possibly not so important change ;-)

6 years agoDiaspora reshares should now always reshare the correct content
Michael [Fri, 27 Apr 2018 14:03:10 +0000 (14:03 +0000)]
Diaspora reshares should now always reshare the correct content

6 years agoMerge pull request #4935 from annando/reworked-delivery
Hypolite Petovan [Fri, 27 Apr 2018 13:00:58 +0000 (09:00 -0400)]
Merge pull request #4935 from annando/reworked-delivery

Reworked delivery worker

6 years agoStandard stuff
Michael [Fri, 27 Apr 2018 12:40:52 +0000 (12:40 +0000)]
Standard stuff

6 years agoPreparation for relay posts with DFRN
Michael [Fri, 27 Apr 2018 05:11:52 +0000 (05:11 +0000)]
Preparation for relay posts with DFRN

6 years agoBetter fallback on values > 299 as well
Michael [Fri, 27 Apr 2018 04:55:46 +0000 (04:55 +0000)]
Better fallback on values > 299 as well

6 years agoEnsure local delivery of Diaspora comments
Michael [Fri, 27 Apr 2018 04:11:33 +0000 (04:11 +0000)]
Ensure local delivery of Diaspora comments

6 years agoAdded header
Michael [Fri, 27 Apr 2018 03:08:13 +0000 (03:08 +0000)]
Added header

6 years agoConstants moved
Michael [Fri, 27 Apr 2018 02:52:12 +0000 (02:52 +0000)]
Constants moved

6 years agoImprovements
Michael [Thu, 26 Apr 2018 22:30:43 +0000 (22:30 +0000)]
Improvements

6 years agoAdded some explanation, beautified code
Michael [Thu, 26 Apr 2018 21:16:16 +0000 (21:16 +0000)]
Added some explanation, beautified code

6 years agoMerge remote-tracking branch 'upstream/develop' into reworked-delivery
Michael [Thu, 26 Apr 2018 20:42:57 +0000 (20:42 +0000)]
Merge remote-tracking branch 'upstream/develop' into reworked-delivery

6 years agoAvoid PHP warning with a missing key
Michael [Thu, 26 Apr 2018 20:41:06 +0000 (20:41 +0000)]
Avoid PHP warning with a missing key

6 years agoMerge pull request #4934 from annando/distribute-precaution
Hypolite Petovan [Thu, 26 Apr 2018 20:26:23 +0000 (16:26 -0400)]
Merge pull request #4934 from annando/distribute-precaution

Item distribution: Better don't store these values

6 years agoItem distribution: Better don't store these values
Michael [Thu, 26 Apr 2018 20:11:29 +0000 (20:11 +0000)]
Item distribution: Better don't store these values

6 years agoMerge pull request #4933 from annando/bugfix-distribute
Hypolite Petovan [Thu, 26 Apr 2018 20:02:56 +0000 (16:02 -0400)]
Merge pull request #4933 from annando/bugfix-distribute

Bugfix: The Distribition of public items failed with comments

6 years agoBugfix: The Distribition of public items failed with comments# Bitte geben Sie eine...
Michael [Thu, 26 Apr 2018 19:47:12 +0000 (19:47 +0000)]
Bugfix: The Distribition of public items failed with comments# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,

6 years agoMerge pull request #4932 from MrPetovan/bug/4928-fix-php-72-warning-profile
Tobias Diekershoff [Thu, 26 Apr 2018 14:36:19 +0000 (16:36 +0200)]
Merge pull request #4932 from MrPetovan/bug/4928-fix-php-72-warning-profile

Fix PHP 7.2 warning in Model\Profile

6 years ago[frio] Improve background styles' description
Hypolite Petovan [Thu, 26 Apr 2018 11:50:05 +0000 (07:50 -0400)]
[frio] Improve background styles' description

6 years ago[frio] Fix quoting style in php/Image
Hypolite Petovan [Thu, 26 Apr 2018 11:46:59 +0000 (07:46 -0400)]
[frio] Fix quoting style in php/Image

6 years agoFix PHP 7.2 warning in Model\Profile
Hypolite Petovan [Thu, 26 Apr 2018 08:56:42 +0000 (04:56 -0400)]
Fix PHP 7.2 warning in Model\Profile

6 years agoAdd backward-compatibility for config variables after schema rename
Hypolite Petovan [Thu, 26 Apr 2018 08:22:04 +0000 (04:22 -0400)]
Add backward-compatibility for config variables after schema rename

6 years agoBetter way to fetch items
Michael [Thu, 26 Apr 2018 07:11:18 +0000 (07:11 +0000)]
Better way to fetch items

6 years agoUnneeded stuff removed, only fetch needed records
Michael [Thu, 26 Apr 2018 06:23:01 +0000 (06:23 +0000)]
Unneeded stuff removed, only fetch needed records

6 years agoCleaned up
Michael [Thu, 26 Apr 2018 05:45:05 +0000 (05:45 +0000)]
Cleaned up

6 years agoDelivery to non followers
Michael [Wed, 25 Apr 2018 21:55:24 +0000 (21:55 +0000)]
Delivery to non followers

6 years agoReworked delivery
Michael [Wed, 25 Apr 2018 21:18:21 +0000 (21:18 +0000)]
Reworked delivery

6 years agoMerge pull request #4931 from annando/no-ignored
Hypolite Petovan [Wed, 25 Apr 2018 16:07:00 +0000 (12:07 -0400)]
Merge pull request #4931 from annando/no-ignored

Don't distribute for ignored contacts

6 years agoDon't distribute for ignored contacts
Michael [Wed, 25 Apr 2018 16:00:21 +0000 (16:00 +0000)]
Don't distribute for ignored contacts

6 years agoMerge pull request #4915 from M-arcus/patch-4
Hypolite Petovan [Wed, 25 Apr 2018 12:06:04 +0000 (08:06 -0400)]
Merge pull request #4915 from M-arcus/patch-4

[DOCS] Docs: Minor improvements

6 years ago[DOCS] Fix intendation
Marcus Müller [Wed, 25 Apr 2018 09:29:56 +0000 (11:29 +0200)]
[DOCS] Fix intendation

6 years ago[frio] Add background-repeat attribute to background image options
Hypolite Petovan [Wed, 25 Apr 2018 00:42:23 +0000 (20:42 -0400)]
[frio] Add background-repeat attribute to background image options

- Update background image options names and labels
- Add background image option label tag

6 years ago[frio] Rename "Default" color scheme as "Custom"
Hypolite Petovan [Wed, 25 Apr 2018 00:40:29 +0000 (20:40 -0400)]
[frio] Rename "Default" color scheme as "Custom"

- Capitalize scheme name

6 years ago[frio] Rename bgcolor to background-color
Hypolite Petovan [Wed, 25 Apr 2018 00:37:04 +0000 (20:37 -0400)]
[frio] Rename bgcolor to background-color

6 years ago[frio] Fix typo schema -> scheme
Hypolite Petovan [Wed, 25 Apr 2018 00:26:14 +0000 (20:26 -0400)]
[frio] Fix typo schema -> scheme

6 years ago[frio] Normalize quoting style in PHP files
Hypolite Petovan [Wed, 25 Apr 2018 00:12:43 +0000 (20:12 -0400)]
[frio] Normalize quoting style in PHP files

6 years ago[frio] Fix formatting in PHP files
Hypolite Petovan [Wed, 25 Apr 2018 00:05:20 +0000 (20:05 -0400)]
[frio] Fix formatting in PHP files

6 years agoMake register-link less obtrusive.
Andreas Neustifter [Tue, 24 Apr 2018 21:18:31 +0000 (21:18 +0000)]
Make register-link less obtrusive.

6 years agoFix missing background tiles.
Andreas Neustifter [Tue, 24 Apr 2018 21:16:15 +0000 (21:16 +0000)]
Fix missing background tiles.

6 years agoMerge pull request #4929 from annando/diaspora-rework
Hypolite Petovan [Tue, 24 Apr 2018 18:56:35 +0000 (14:56 -0400)]
Merge pull request #4929 from annando/diaspora-rework

Improvements for the Diaspora protocol

6 years agoImprovements for the Diaspora protocol
Michael [Tue, 24 Apr 2018 18:34:35 +0000 (18:34 +0000)]
Improvements for the Diaspora protocol

6 years agoMerge pull request #4925 from rabuzarus/20180424_-_frio_invite_template
Hypolite Petovan [Tue, 24 Apr 2018 15:37:10 +0000 (11:37 -0400)]
Merge pull request #4925 from rabuzarus/20180424_-_frio_invite_template

frio - provide a template for invite page

6 years agofrio - provide a template for invite page
rabuzarus [Tue, 24 Apr 2018 15:33:48 +0000 (17:33 +0200)]
frio - provide a template for invite page

6 years agoMerge pull request #4924 from annando/item-distribution
Hypolite Petovan [Tue, 24 Apr 2018 15:00:14 +0000 (11:00 -0400)]
Merge pull request #4924 from annando/item-distribution

Item distribution is now done via the public post

6 years agoWe only need the uid
Michael [Tue, 24 Apr 2018 14:58:39 +0000 (14:58 +0000)]
We only need the uid

6 years agoItem distribution is now done via the public post
Michael [Tue, 24 Apr 2018 13:21:25 +0000 (13:21 +0000)]
Item distribution is now done via the public post

6 years ago[DOCS] Hooks: Add hooks intendation to german docs
Marcus Müller [Tue, 24 Apr 2018 11:25:06 +0000 (13:25 +0200)]
[DOCS] Hooks: Add hooks intendation to german docs

6 years ago[DOCS] Hooks: Add empty line
Marcus Müller [Tue, 24 Apr 2018 11:21:16 +0000 (13:21 +0200)]
[DOCS] Hooks: Add empty line

6 years ago[DOCS] Titles: Fix spaces
Marcus Müller [Tue, 24 Apr 2018 11:20:44 +0000 (13:20 +0200)]
[DOCS] Titles: Fix spaces

6 years agoMerge pull request #4922 from tobiasd/20180424-lng
Michael Vogel [Tue, 24 Apr 2018 08:03:04 +0000 (10:03 +0200)]
Merge pull request #4922 from tobiasd/20180424-lng

update FI translations THX Kris

6 years agoupdate FI translations THX Kris
Tobias Diekershoff [Tue, 24 Apr 2018 05:58:31 +0000 (07:58 +0200)]
update FI translations THX Kris

6 years agoMerge remote-tracking branch 'upstream/develop' into item-distribution
Michael [Tue, 24 Apr 2018 04:23:38 +0000 (04:23 +0000)]
Merge remote-tracking branch 'upstream/develop' into item-distribution

6 years agoFix login dialog layout for frio.
Andreas Neustifter [Mon, 23 Apr 2018 20:03:29 +0000 (20:03 +0000)]
Fix login dialog layout for frio.

Rearrange login dialog distinguish better between logging und registering.

6 years agoRemove complete section when registering disabled.
Andreas Neustifter [Mon, 23 Apr 2018 19:57:04 +0000 (19:57 +0000)]
Remove complete section when registering disabled.

Move out the check so that the complete div containing the register-link is removed.

6 years agoRemove empty help spans from templates.
Andreas Neustifter [Mon, 23 Apr 2018 19:15:54 +0000 (19:15 +0000)]
Remove empty help spans from templates.

The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.

6 years agoFix login dialog layout.
Andreas Neustifter [Mon, 23 Apr 2018 19:00:47 +0000 (19:00 +0000)]
Fix login dialog layout.

Rearrange login dialog distinguish better between logging und registering.

6 years agoRemove empty help spans from templates.
Andreas Neustifter [Mon, 23 Apr 2018 18:59:08 +0000 (18:59 +0000)]
Remove empty help spans from templates.

The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.

6 years agoMerge pull request #4917 from annando/show-private-forums
Tobias Diekershoff [Mon, 23 Apr 2018 16:47:21 +0000 (18:47 +0200)]
Merge pull request #4917 from annando/show-private-forums

Show private forums in the sidebar

6 years agoShow private forums in the sidebar
Michael [Mon, 23 Apr 2018 16:41:00 +0000 (16:41 +0000)]
Show private forums in the sidebar

6 years ago[DOCS] Addons: Restructure hooks
Marcus Müller [Mon, 23 Apr 2018 15:20:16 +0000 (17:20 +0200)]
[DOCS] Addons: Restructure hooks

6 years agoMerge pull request #4873 from astifter/develop
Hypolite Petovan [Mon, 23 Apr 2018 14:23:21 +0000 (10:23 -0400)]
Merge pull request #4873 from astifter/develop

Remove pagination when empty, move new Member Tips and use common widget to find people.

6 years agoMerge pull request #4913 from tobiasd/20180423-phpunit
Hypolite Petovan [Mon, 23 Apr 2018 12:00:13 +0000 (08:00 -0400)]
Merge pull request #4913 from tobiasd/20180423-phpunit

phpunit compat 5.6 vs 7.x

6 years agoMerge pull request #4916 from M-arcus/patch-5
Tobias Diekershoff [Mon, 23 Apr 2018 11:49:24 +0000 (13:49 +0200)]
Merge pull request #4916 from M-arcus/patch-5

[DOCS] Installation: Fix small errors

6 years agoPublic federated items now always are having an entry with "uid=0"
Michael [Mon, 23 Apr 2018 11:14:25 +0000 (11:14 +0000)]
Public federated items now always are having an entry with "uid=0"

6 years ago[DOCS] Installation: Fix multiple sentences
Marcus Müller [Mon, 23 Apr 2018 10:24:47 +0000 (12:24 +0200)]
[DOCS] Installation: Fix multiple sentences

6 years ago[DOCS] Installation: Fix title
Marcus Müller [Mon, 23 Apr 2018 10:22:39 +0000 (12:22 +0200)]
[DOCS] Installation: Fix title

6 years agoMerge pull request #4914 from AndyHee/doc20180423
Tobias Diekershoff [Mon, 23 Apr 2018 10:03:28 +0000 (12:03 +0200)]
Merge pull request #4914 from AndyHee/doc20180423

Update Profiles.md

6 years ago[DOCS] Account docs: Fix titles
Marcus Müller [Mon, 23 Apr 2018 09:45:44 +0000 (11:45 +0200)]
[DOCS] Account docs: Fix titles

6 years agoUpdate Profiles.md
Andy H3 [Mon, 23 Apr 2018 09:43:52 +0000 (16:43 +0700)]
Update Profiles.md

6 years agouse strlen instead of count(php7.2 fails)
Tobias Diekershoff [Mon, 23 Apr 2018 07:37:56 +0000 (09:37 +0200)]
use strlen instead of count(php7.2 fails)

6 years agoremove comment
Tobias Diekershoff [Mon, 23 Apr 2018 07:37:06 +0000 (09:37 +0200)]
remove comment

6 years agouse strlen instead of count as above (php7.2 fails)
Tobias Diekershoff [Mon, 23 Apr 2018 07:35:12 +0000 (09:35 +0200)]
use strlen instead of count as above (php7.2 fails)

6 years agothere are more then 1 test ATM
Tobias Diekershoff [Mon, 23 Apr 2018 06:53:46 +0000 (08:53 +0200)]
there are more then 1 test ATM

6 years agocomment out use clause
Tobias Diekershoff [Mon, 23 Apr 2018 06:47:42 +0000 (08:47 +0200)]
comment out use clause

6 years agophpunit compat 5.6 vs 7.x
Tobias Diekershoff [Mon, 23 Apr 2018 06:42:13 +0000 (08:42 +0200)]
phpunit compat 5.6 vs 7.x

6 years agoMerge pull request #4912 from annando/archivecontacts
Hypolite Petovan [Mon, 23 Apr 2018 06:07:53 +0000 (02:07 -0400)]
Merge pull request #4912 from annando/archivecontacts

Added console command to manually archive contacts

6 years agoDFRN: mark for archival at different places
Michael [Mon, 23 Apr 2018 06:03:55 +0000 (06:03 +0000)]
DFRN: mark for archival at different places

6 years agoMerge pull request #4911 from tobiasd/20180423-travis
Hypolite Petovan [Mon, 23 Apr 2018 05:49:16 +0000 (01:49 -0400)]
Merge pull request #4911 from tobiasd/20180423-travis

travis indentation

6 years agotravix indentation
Tobias Diekershoff [Mon, 23 Apr 2018 05:42:48 +0000 (07:42 +0200)]
travix indentation

6 years agoAdded console command to manually archive contacts
Michael [Mon, 23 Apr 2018 05:33:47 +0000 (05:33 +0000)]
Added console command to manually archive contacts

6 years agoMerge pull request #4910 from tobiasd/20180423-lng
Hypolite Petovan [Mon, 23 Apr 2018 05:32:15 +0000 (01:32 -0400)]
Merge pull request #4910 from tobiasd/20180423-lng

translation updates DE and FI

6 years agoupdate DE translations
Tobias Diekershoff [Mon, 23 Apr 2018 05:13:10 +0000 (07:13 +0200)]
update DE translations

6 years agoupdate FI translations THX Kris
Tobias Diekershoff [Mon, 23 Apr 2018 05:13:02 +0000 (07:13 +0200)]
update FI translations THX Kris

6 years agoMerge pull request #4909 from MrPetovan/bug/4898-fix-php-72-warnings
Michael Vogel [Mon, 23 Apr 2018 04:50:21 +0000 (06:50 +0200)]
Merge pull request #4909 from MrPetovan/bug/4898-fix-php-72-warnings

Fix PHP 7.2 warnings

6 years agoFix self warning in Util\Temporal
Hypolite Petovan [Mon, 23 Apr 2018 04:03:27 +0000 (00:03 -0400)]
Fix self warning in Util\Temporal

6 years agoFix count() warning in Object\Post
Hypolite Petovan [Mon, 23 Apr 2018 04:02:18 +0000 (00:02 -0400)]
Fix count() warning in Object\Post