Michael Vogel
833fe0e0dc
Merge pull request #4942 from MrPetovan/task/import-post-ignored-contact
...
Import posts from ignored contacts
2018-04-28 18:16:30 +02:00
Hypolite Petovan
9edff6cc5c
Add exception for self-contact in item_joins()
2018-04-28 11:38:01 -04:00
Hypolite Petovan
c417f779c4
Add missing readonly check for displaying items in item_joins
2018-04-28 07:47:02 -04:00
Michael Vogel
5dc47e5815
Merge pull request #4945 from tobiasd/20180428-pl
...
update PL translations THX waldis
2018-04-28 11:03:28 +02:00
Tobias Diekershoff
24da379c06
update PL translations THX waldis
2018-04-28 10:08:52 +02:00
Tobias Diekershoff
2c2d4e5869
Merge pull request #4941 from MrPetovan/task/4938-update-dir-url-protocol
...
Update directory URL protocol
2018-04-28 09:42:06 +02:00
Tobias Diekershoff
02c046e630
Merge pull request #4944 from astifter/fix_better_curl_error_during_install
...
Fix #4943 .
2018-04-28 08:58:45 +02:00
Andreas Neustifter
91e0a9227e
Fix #4943 .
...
PR #4939 introduced a bug that only surfaces when using Network from extern.
Use proper self reference to fix that.
2018-04-28 06:46:46 +00:00
Hypolite Petovan
bd21fc3751
Import posts from ignored contacts
2018-04-27 21:08:19 -04:00
Hypolite Petovan
5bb35756dc
Update directory URL protocol
2018-04-27 20:56:34 -04:00
Hypolite Petovan
66e5586d21
Merge pull request #4939 from astifter/better_curl_error_during_install
...
Better curl error during install.
2018-04-27 16:57:01 -04:00
Hypolite Petovan
e2612514e8
Merge pull request #4940 from astifter/fix_login_when_openid_disabled
...
frio: Fix login page layout without OpenId.
2018-04-27 16:49:38 -04:00
Andreas Neustifter
9bf58e46f6
Changes requested by @MrPetovan .
2018-04-27 20:22:17 +00:00
Andreas Neustifter
babb45efd8
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.
2018-04-27 20:00:46 +00:00
Andreas Neustifter
5b4dce5983
Exclude editor backups from Git.
2018-04-27 21:28:22 +02:00
Andreas Neustifter
70a781fa5a
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.~
2018-04-27 21:27:55 +02:00
Hypolite Petovan
8a7c9d6666
Merge pull request #4937 from astifter/install_theme_when_set
...
Install selected theme during settings persistence.
2018-04-27 14:59:52 -04:00
Andreas Neustifter
846f8becae
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 .
2018-04-27 20:45:34 +02:00
rabuzarus
a19784d209
Merge pull request #4890 from astifter/reorganize_login
...
Reorganize Login to Fix #4878
2018-04-27 19:56:25 +02:00
rabuzarus
e2b4690d6f
Merge pull request #4930 from MrPetovan/task/improve-frio-bg-image
...
[frio] Improve background image settings
2018-04-27 19:55:47 +02:00
Hypolite Petovan
99f288446b
Merge pull request #4936 from annando/fix-reshare
...
Diaspora reshares should now always reshare the correct content
2018-04-27 10:38:51 -04:00
Michael
6879be5168
Possibly not so important change ;-)
2018-04-27 14:21:12 +00:00
Michael
98415e0e34
Diaspora reshares should now always reshare the correct content
2018-04-27 14:03:10 +00:00
Hypolite Petovan
dae838842e
Merge pull request #4935 from annando/reworked-delivery
...
Reworked delivery worker
2018-04-27 09:00:58 -04:00
Michael
84909d9711
Standard stuff
2018-04-27 12:40:52 +00:00
Michael
9f5a6c05fb
Preparation for relay posts with DFRN
2018-04-27 05:11:52 +00:00
Michael
4904be0d6f
Better fallback on values > 299 as well
2018-04-27 04:55:46 +00:00
Michael
1e2bc1e6cf
Ensure local delivery of Diaspora comments
2018-04-27 04:11:33 +00:00
Michael
e3c9d31088
Added header
2018-04-27 03:08:13 +00:00
Michael
488c6c9b68
Constants moved
2018-04-27 02:52:12 +00:00
Michael
66e34b9357
Improvements
2018-04-26 22:30:43 +00:00
Michael
8c23fea1df
Added some explanation, beautified code
2018-04-26 21:16:16 +00:00
Michael
a785d8c2f9
Merge remote-tracking branch 'upstream/develop' into reworked-delivery
2018-04-26 20:42:57 +00:00
Michael
4957ab8fbb
Avoid PHP warning with a missing key
2018-04-26 20:41:06 +00:00
Hypolite Petovan
33a551235e
Merge pull request #4934 from annando/distribute-precaution
...
Item distribution: Better don't store these values
2018-04-26 16:26:23 -04:00
Michael
4a792761d1
Item distribution: Better don't store these values
2018-04-26 20:11:29 +00:00
Hypolite Petovan
9e700ba6ea
Merge pull request #4933 from annando/bugfix-distribute
...
Bugfix: The Distribition of public items failed with comments
2018-04-26 16:02:56 -04:00
Michael
da3658c80d
Bugfix: The Distribition of public items failed with comments# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
2018-04-26 19:47:12 +00:00
Tobias Diekershoff
eae86951f5
Merge pull request #4932 from MrPetovan/bug/4928-fix-php-72-warning-profile
...
Fix PHP 7.2 warning in Model\Profile
2018-04-26 16:36:19 +02:00
Hypolite Petovan
2d6dafc057
[frio] Improve background styles' description
2018-04-26 07:50:05 -04:00
Hypolite Petovan
1ce999a4ab
[frio] Fix quoting style in php/Image
2018-04-26 07:46:59 -04:00
Hypolite Petovan
f7f640175a
Fix PHP 7.2 warning in Model\Profile
2018-04-26 04:56:42 -04:00
Hypolite Petovan
7feeb0af78
Add backward-compatibility for config variables after schema rename
2018-04-26 04:22:04 -04:00
Michael
a0c5a84ce8
Better way to fetch items
2018-04-26 07:11:18 +00:00
Michael
b70b020490
Unneeded stuff removed, only fetch needed records
2018-04-26 06:23:01 +00:00
Michael
71d4c6e4a0
Cleaned up
2018-04-26 05:45:05 +00:00
Michael
c437dac3a0
Delivery to non followers
2018-04-25 21:55:24 +00:00
Michael
3abd0b54cc
Reworked delivery
2018-04-25 21:18:21 +00:00
Hypolite Petovan
a9f1f47be2
Merge pull request #4931 from annando/no-ignored
...
Don't distribute for ignored contacts
2018-04-25 12:07:00 -04:00
Michael
66547e5107
Don't distribute for ignored contacts
2018-04-25 16:00:21 +00:00
Tobias Diekershoff
Michael