]>
git.mxchange.org Git - friendica.git/log
Andreas Neustifter [Mon, 30 Apr 2018 21:22:59 +0000 (21:22 +0000)]
Fix layout issue introduced with PR #4873.
The find button in the find-people widget was badly layouted on Firefox under Debian.
Remove the width constraint and float: left so the button gracely drops to the next
line when necessary.
Hypolite Petovan [Mon, 30 Apr 2018 18:06:35 +0000 (14:06 -0400)]
Merge pull request #4961 from annando/direct-dfrn
Direct Relay is now working with DFRN as well
Michael [Mon, 30 Apr 2018 16:52:44 +0000 (16:52 +0000)]
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
Michael [Mon, 30 Apr 2018 16:46:49 +0000 (16:46 +0000)]
Improved logging, avoiding PHP warning
Michael [Mon, 30 Apr 2018 16:45:00 +0000 (16:45 +0000)]
Bugfix: Contact wasn't added on probing
Hypolite Petovan [Mon, 30 Apr 2018 14:30:01 +0000 (10:30 -0400)]
Merge pull request #4959 from koyuawsmbrtn/develop
Added dark scheme to frio
Koyu Berteon [Mon, 30 Apr 2018 13:38:46 +0000 (15:38 +0200)]
Renamed files as requested
Koyu Berteon [Mon, 30 Apr 2018 13:34:23 +0000 (15:34 +0200)]
Corrected time
Koyu Berteon [Mon, 30 Apr 2018 13:27:40 +0000 (15:27 +0200)]
Fixed identation in dark.php
Koyu Berteon [Mon, 30 Apr 2018 13:25:31 +0000 (15:25 +0200)]
Added dark scheme to frio
Hypolite Petovan [Mon, 30 Apr 2018 13:20:43 +0000 (09:20 -0400)]
Merge pull request #4958 from rabuzarus/20180425_-_fix_help_aside
The add widget class to the left aside for /help
Michael [Mon, 30 Apr 2018 13:09:11 +0000 (13:09 +0000)]
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
Michael [Mon, 30 Apr 2018 13:08:48 +0000 (13:08 +0000)]
Improved logging
Michael [Mon, 30 Apr 2018 13:07:40 +0000 (13:07 +0000)]
Deliver with the new function when delivering to a "uid=0" contact
rabuzarus [Mon, 30 Apr 2018 12:56:25 +0000 (14:56 +0200)]
Merge develop into 20180425_-_fix_help_aside
Michael [Mon, 30 Apr 2018 12:41:56 +0000 (12:41 +0000)]
Additional logging
Hypolite Petovan [Mon, 30 Apr 2018 10:51:52 +0000 (06:51 -0400)]
Merge pull request #4955 from tobiasd/
20180430 -fi
update FI translations THX Kris
Tobias Diekershoff [Mon, 30 Apr 2018 06:34:47 +0000 (08:34 +0200)]
update FI translations THX Kris
Michael [Mon, 30 Apr 2018 05:56:40 +0000 (05:56 +0000)]
Don't spool relay deliveries
Michael [Mon, 30 Apr 2018 05:33:47 +0000 (05:33 +0000)]
Update or create relay contact from discovery / process new protocol values
Michael [Mon, 30 Apr 2018 04:01:04 +0000 (04:01 +0000)]
"x-social-relay" now exposes all supported protocols
Hypolite Petovan [Sun, 29 Apr 2018 18:31:13 +0000 (14:31 -0400)]
Merge pull request #4920 from nupplaphil/install_mode
Add Application Mode (Install, Maintenance, Normal)
Philipp Holzer [Sun, 29 Apr 2018 18:15:12 +0000 (20:15 +0200)]
Add Install Mode
- merge `friendica/develop` to `nupplaphil/install_mode`
Michael Vogel [Sun, 29 Apr 2018 17:11:49 +0000 (19:11 +0200)]
Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app
Move current_theme() to App
Tobias Diekershoff [Sun, 29 Apr 2018 16:40:01 +0000 (18:40 +0200)]
Merge pull request #4954 from annando/hide-contacts
Fix PR 4942: Fixed item query
Michael [Sun, 29 Apr 2018 16:32:46 +0000 (16:32 +0000)]
Fix PR 4942: Fixed item query
Philipp Holzer [Sun, 29 Apr 2018 16:13:24 +0000 (18:13 +0200)]
Add Install Mode
- increased code quality
Philipp Holzer [Sun, 29 Apr 2018 16:11:24 +0000 (18:11 +0200)]
Add Install Mode
- added PHP docBlock to methods
- increased code quality
Hypolite Petovan [Sun, 29 Apr 2018 11:05:02 +0000 (07:05 -0400)]
Merge pull request #4953 from tobiasd/
20180429 -msg
regenerated master messages.po file
Tobias Diekershoff [Sun, 29 Apr 2018 05:19:20 +0000 (07:19 +0200)]
regenerated master messages.po file
Tobias Diekershoff [Sun, 29 Apr 2018 04:41:55 +0000 (06:41 +0200)]
Merge pull request #4952 from MrPetovan/bug/4947-fix-content-filter-self
Fix own post check for content filter
Hypolite Petovan [Sun, 29 Apr 2018 00:37:47 +0000 (20:37 -0400)]
Merge pull request #4948 from annando/hash-ignored
Corrected query to don't show hash tag posts from blocked or ignored contacts
Hypolite Petovan [Sat, 28 Apr 2018 23:11:11 +0000 (19:11 -0400)]
Fix own post check for content filter
Hypolite Petovan [Sat, 28 Apr 2018 22:37:41 +0000 (18:37 -0400)]
Remove current_theme() and current_theme_url() functions
Hypolite Petovan [Sat, 28 Apr 2018 22:37:04 +0000 (18:37 -0400)]
Replace current_theme() and current_theme_url() calls
Hypolite Petovan [Sat, 28 Apr 2018 22:33:52 +0000 (18:33 -0400)]
Fix formatting in frio_boot.php
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()
Hypolite Petovan [Sat, 28 Apr 2018 22:28:23 +0000 (18:28 -0400)]
Fix formatting in Core\Theme
Michael Vogel [Sat, 28 Apr 2018 16:16:30 +0000 (18:16 +0200)]
Merge pull request #4942 from MrPetovan/task/import-post-ignored-contact
Import posts from ignored contacts
Michael [Sat, 28 Apr 2018 16:12:45 +0000 (16:12 +0000)]
Corrected query to don't show hash tag posts from blocked or ignored contacts
Hypolite Petovan [Sat, 28 Apr 2018 15:38:01 +0000 (11:38 -0400)]
Add exception for self-contact in item_joins()
Philipp Holzer [Sat, 28 Apr 2018 15:06:08 +0000 (17:06 +0200)]
Add Install Mode
- fixed mistake
Philipp Holzer [Sat, 28 Apr 2018 13:15:54 +0000 (15:15 +0200)]
Add Install Mode
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
Philipp Holzer [Sat, 28 Apr 2018 13:11:01 +0000 (15:11 +0200)]
Add Install Mode
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
Hypolite Petovan [Sat, 28 Apr 2018 11:47:02 +0000 (07:47 -0400)]
Add missing readonly check for displaying items in item_joins
Philipp Holzer [Sat, 28 Apr 2018 10:36:40 +0000 (12:36 +0200)]
Add Install Mode (Part 2)
- Added constants to class `App`
- Added global App-Mode to `dba:connect()` instead parameter `$install`
Michael Vogel [Sat, 28 Apr 2018 09:03:28 +0000 (11:03 +0200)]
Merge pull request #4945 from tobiasd/
20180428 -pl
update PL translations THX waldis
Michael [Sat, 28 Apr 2018 08:57:52 +0000 (08:57 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop
Tobias Diekershoff [Sat, 28 Apr 2018 08:08:52 +0000 (10:08 +0200)]
update PL translations THX waldis
Tobias Diekershoff [Sat, 28 Apr 2018 07:42:06 +0000 (09:42 +0200)]
Merge pull request #4941 from MrPetovan/task/4938-update-dir-url-protocol
Update directory URL protocol
Tobias Diekershoff [Sat, 28 Apr 2018 06:58:45 +0000 (08:58 +0200)]
Merge pull request #4944 from astifter/fix_better_curl_error_during_install
Fix #4943.
Andreas Neustifter [Sat, 28 Apr 2018 06:46:46 +0000 (06:46 +0000)]
Fix #4943.
PR #4939 introduced a bug that only surfaces when using Network from extern.
Use proper self reference to fix that.
Hypolite Petovan [Sat, 28 Apr 2018 01:08:19 +0000 (21:08 -0400)]
Import posts from ignored contacts
Hypolite Petovan [Sat, 28 Apr 2018 00:56:34 +0000 (20:56 -0400)]
Update directory URL protocol
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.
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.
Andreas Neustifter [Fri, 27 Apr 2018 20:22:17 +0000 (20:22 +0000)]
Changes requested by @MrPetovan.
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.
Andreas Neustifter [Fri, 27 Apr 2018 19:28:22 +0000 (21:28 +0200)]
Exclude editor backups from Git.
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.~
Philipp Holzer [Fri, 27 Apr 2018 19:07:04 +0000 (21:07 +0200)]
Add a App-Mode with defined constants
- Normal Mode = 0
- Install Mode = 1
- Maintenance Mode = 2
Moved Install-Mode check to class `App`
Replaced all maintenance and install checks with $a->mode checks
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.
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.
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
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
Michael [Fri, 27 Apr 2018 15:04:11 +0000 (15:04 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop
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
Michael [Fri, 27 Apr 2018 14:21:12 +0000 (14:21 +0000)]
Possibly not so important change ;-)
Michael [Fri, 27 Apr 2018 14:03:10 +0000 (14:03 +0000)]
Diaspora reshares should now always reshare the correct content
Hypolite Petovan [Fri, 27 Apr 2018 13:00:58 +0000 (09:00 -0400)]
Merge pull request #4935 from annando/reworked-delivery
Reworked delivery worker
Michael [Fri, 27 Apr 2018 12:40:52 +0000 (12:40 +0000)]
Standard stuff
Michael [Fri, 27 Apr 2018 05:11:52 +0000 (05:11 +0000)]
Preparation for relay posts with DFRN
Michael [Fri, 27 Apr 2018 04:55:46 +0000 (04:55 +0000)]
Better fallback on values > 299 as well
Michael [Fri, 27 Apr 2018 04:11:33 +0000 (04:11 +0000)]
Ensure local delivery of Diaspora comments
Michael [Fri, 27 Apr 2018 03:08:13 +0000 (03:08 +0000)]
Added header
Michael [Fri, 27 Apr 2018 02:52:12 +0000 (02:52 +0000)]
Constants moved
Michael [Thu, 26 Apr 2018 22:30:43 +0000 (22:30 +0000)]
Improvements
Michael [Thu, 26 Apr 2018 21:16:16 +0000 (21:16 +0000)]
Added some explanation, beautified code
Michael [Thu, 26 Apr 2018 20:42:57 +0000 (20:42 +0000)]
Merge remote-tracking branch 'upstream/develop' into reworked-delivery
Michael [Thu, 26 Apr 2018 20:42:30 +0000 (20:42 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop
Michael [Thu, 26 Apr 2018 20:41:06 +0000 (20:41 +0000)]
Avoid PHP warning with a missing key
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
Michael [Thu, 26 Apr 2018 20:11:29 +0000 (20:11 +0000)]
Item distribution: Better don't store these values
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
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,
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
Hypolite Petovan [Thu, 26 Apr 2018 11:50:05 +0000 (07:50 -0400)]
[frio] Improve background styles' description
Hypolite Petovan [Thu, 26 Apr 2018 11:46:59 +0000 (07:46 -0400)]
[frio] Fix quoting style in php/Image
Hypolite Petovan [Thu, 26 Apr 2018 08:56:42 +0000 (04:56 -0400)]
Fix PHP 7.2 warning in Model\Profile
Hypolite Petovan [Thu, 26 Apr 2018 08:22:04 +0000 (04:22 -0400)]
Add backward-compatibility for config variables after schema rename
Michael [Thu, 26 Apr 2018 07:11:18 +0000 (07:11 +0000)]
Better way to fetch items
Michael [Thu, 26 Apr 2018 06:23:01 +0000 (06:23 +0000)]
Unneeded stuff removed, only fetch needed records
Michael [Thu, 26 Apr 2018 05:45:05 +0000 (05:45 +0000)]
Cleaned up
Michael [Wed, 25 Apr 2018 21:55:24 +0000 (21:55 +0000)]
Delivery to non followers
rabuzarus [Wed, 25 Apr 2018 21:30:56 +0000 (23:30 +0200)]
frio - fix help toc aside
Michael [Wed, 25 Apr 2018 21:18:21 +0000 (21:18 +0000)]
Reworked delivery
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
Michael [Wed, 25 Apr 2018 16:00:21 +0000 (16:00 +0000)]
Don't distribute for ignored contacts
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
Marcus Müller [Wed, 25 Apr 2018 09:29:56 +0000 (11:29 +0200)]
[DOCS] Fix intendation