Andreas Neustifter
9bf58e46f6
Changes requested by @MrPetovan.
2018-04-27 20:22:17 +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
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
Hypolite Petovan
801a13aa10
Merge pull request #4915 from M-arcus/patch-4
...
[DOCS] Docs: Minor improvements
2018-04-25 08:06:04 -04:00
Marcus Müller
ce52f40bdc
[DOCS] Fix intendation
2018-04-25 11:29:56 +02:00
Hypolite Petovan
86e4690b5f
[frio] Add background-repeat attribute to background image options
...
- Update background image options names and labels
- Add background image option label tag
2018-04-24 20:42:23 -04:00
Hypolite Petovan
4307a87d6a
[frio] Rename "Default" color scheme as "Custom"
...
- Capitalize scheme name
2018-04-24 20:40:29 -04:00
Hypolite Petovan
0f82c3348d
[frio] Rename bgcolor to background-color
2018-04-24 20:39:34 -04:00
Hypolite Petovan
3bfa6facfc
[frio] Fix typo schema -> scheme
2018-04-24 20:26:14 -04:00
Hypolite Petovan
eb9b832c3a
[frio] Normalize quoting style in PHP files
2018-04-24 20:12:43 -04:00
Hypolite Petovan
b65c8c55a4
[frio] Fix formatting in PHP files
2018-04-24 20:05:20 -04:00
Andreas Neustifter
d06a174f0c
Make register-link less obtrusive.
2018-04-24 21:18:31 +00:00
Andreas Neustifter
1a69265da4
Fix missing background tiles.
2018-04-24 21:16:15 +00:00
Hypolite Petovan
d49df631fb
Merge pull request #4929 from annando/diaspora-rework
...
Improvements for the Diaspora protocol
2018-04-24 14:56:35 -04:00
Michael
ad45a73bf3
Improvements for the Diaspora protocol
2018-04-24 18:34:35 +00:00
Hypolite Petovan
c8cc8e57c2
Merge pull request #4925 from rabuzarus/20180424_-_frio_invite_template
...
frio - provide a template for invite page
2018-04-24 11:37:10 -04:00
rabuzarus
ac753e3320
frio - provide a template for invite page
2018-04-24 17:33:48 +02:00
Hypolite Petovan
8d8aef5624
Merge pull request #4924 from annando/item-distribution
...
Item distribution is now done via the public post
2018-04-24 11:00:14 -04:00
