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
d071a5cdad
Merge remote-tracking branch 'upstream/develop' into develop
2018-04-26 20:42:30 +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
rabuzarus
3fb993f37b
frio - fix help toc aside
2018-04-25 23:30:56 +02: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
Michael
5019d46071
We only need the uid
2018-04-24 14:58:39 +00:00
Michael
5cf745af44
Item distribution is now done via the public post
2018-04-24 13:21:25 +00:00
Marcus Müller
008f2a2ec7
[DOCS] Hooks: Add hooks intendation to german docs
2018-04-24 13:25:06 +02:00
Marcus Müller
7ac4b17c80
[DOCS] Hooks: Add empty line
2018-04-24 13:21:16 +02:00
Marcus Müller
81d636d05d
[DOCS] Titles: Fix spaces
2018-04-24 13:20:44 +02:00
Michael Vogel
1f48373c51
Merge pull request #4922 from tobiasd/20180424-lng
...
update FI translations THX Kris
2018-04-24 10:03:04 +02:00
Tobias Diekershoff
c458a12135
update FI translations THX Kris
2018-04-24 07:58:31 +02:00
Michael
7230cc0bed
Merge remote-tracking branch 'upstream/develop' into item-distribution
2018-04-24 04:23:38 +00:00
Philipp Holzer
6973aaefc2
Add Install Mode
...
- Added $install_mode in Class App instead
- Extracted the install business logic to a new Class Install
- Replaced all $a->module == 'install' with $a->install_mode
2018-04-23 22:56:59 +02:00
Andreas Neustifter
6a1ce9c9c0
Fix login dialog layout for frio.
...
Rearrange login dialog distinguish better between logging und registering.
2018-04-23 20:29:55 +00:00
Andreas Neustifter
e5ed2fdede
Remove complete section when registering disabled.
...
Move out the check so that the complete div containing the register-link is removed.
2018-04-23 20:29:55 +00:00
Andreas Neustifter
fe74a3d697
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.
2018-04-23 20:29:55 +00:00
Andreas Neustifter
2d8a4a923f
Fix login dialog layout.
...
Rearrange login dialog distinguish better between logging und registering.
2018-04-23 20:29:55 +00:00
Andreas Neustifter
5d1d0d1a9f
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.
2018-04-23 20:29:55 +00:00
