Merge pull request #8834 from MrPetovan/task/introduce-stable-branch
Introduce stable branchpull/8837/head
Michael Vogel
GitHub
commit
06a18abf5a
|
|
@ -65,17 +65,17 @@ table.bbcodes > * > tr > th {
|
|||
<td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>[img]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]</td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg" alt="Immagine/foto"></td>
|
||||
<td>[img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]</td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="Immagine/foto"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>[img=https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg]The Friendica Logo[/img]</td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg" alt="The Friendica Logo"></td>
|
||||
<td>[img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]The Friendica Logo[/img]</td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="The Friendica Logo"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]<br>
|
||||
<td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]<br>
|
||||
<br>Note: provided height is simply discarded.</td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg" style="width: 64px;"></td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" style="width: 64px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>[size=xx-small]small text[/size]</td>
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ At first you have to get the current version. You can either pull it from [Githu
|
|||
|
||||
$> cd /var/www/virtual/YOURSPACE/html/addon; git pull
|
||||
|
||||
Or you can download a tar archive here: [jappixmini.tgz](https://github.com/friendica/friendica-addons/blob/master/jappixmini.tgz) (click at „view raw“).
|
||||
Or you can download a tar archive here: [jappixmini.tgz](https://github.com/friendica/friendica-addons/blob/stable/jappixmini.tgz) (click at „view raw“).
|
||||
|
||||
Just unpack the file and rename the directory to „jappixmini“.
|
||||
Next, upload this directory and the .tgz-file into your addon directory of your friendica installation.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ Our Git Branches
|
|||
|
||||
There are two relevant branches in the main repo on GitHub:
|
||||
|
||||
1. master: This branch contains stable releases only.
|
||||
1. stable: This branch contains stable releases only.
|
||||
2. develop: This branch contains the latest code.
|
||||
This is what you want to work with.
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ Release branches
|
|||
A release branch is created when the develop branch contains all features it should have.
|
||||
A release branch is used for a few things.
|
||||
|
||||
1. It allows last-minute bug fixing before the release goes to master branch.
|
||||
1. It allows last-minute bug fixing before the release goes to stable branch.
|
||||
2. It allows meta-data changes (README, CHANGELOG, etc.) for version bumps and documentation changes.
|
||||
3. It makes sure the develop branch can receive new features that are **not** part of this release.
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ This makes the software much easier to update.
|
|||
|
||||
The Linux commands to clone the repository into a directory "mywebsite" would be
|
||||
|
||||
git clone https://github.com/friendica/friendica.git -b master mywebsite
|
||||
git clone https://github.com/friendica/friendica.git -b stable mywebsite
|
||||
cd mywebsite
|
||||
bin/composer.phar install --no-dev
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ Get the addons by going into your website folder.
|
|||
|
||||
Clone the addon repository (separately):
|
||||
|
||||
git clone https://github.com/friendica/friendica-addons.git -b master addon
|
||||
git clone https://github.com/friendica/friendica-addons.git -b stable addon
|
||||
|
||||
If you want to use the development version of Friendica you can switch to the develop branch in the repository by running
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ Friendica Message Flow
|
|||
This page documents some of the details of how messages get from one person to another in the Friendica network.
|
||||
There are multiple paths, using multiple protocols and message formats.
|
||||
|
||||
Those attempting to understand these message flows should become familiar with (at the minimum) the [DFRN protocol document](https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf) and the message passing elements of the OStatus stack (salmon and Pubsubhubbub).
|
||||
Those attempting to understand these message flows should become familiar with (at the minimum) the [DFRN protocol document](https://github.com/friendica/friendica/blob/stable/spec/dfrn2.pdf) and the message passing elements of the OStatus stack (salmon and Pubsubhubbub).
|
||||
|
||||
Most message passing involves the file include/items.php, which has functions for several feed-related import/export activities.
|
||||
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@ The addon tree has to be updated separately like so:
|
|||
git pull
|
||||
|
||||
For both repositories:
|
||||
The default branch to use is the ``master`` branch, which is the stable version of Friendica.
|
||||
The default branch to use is the ``stable`` branch, which is the stable version of Friendica.
|
||||
It is updated about four times a year on a fixed schedule.
|
||||
|
||||
If you want to use and test bleeding edge code please checkout the ``develop`` branch.
|
||||
The new features and fixes will be merged from ``develop`` into ``master`` after a release candidate period before each release.
|
||||
The new features and fixes will be merged from ``develop`` into ``stable`` after a release candidate period before each release.
|
||||
|
||||
Warning: The ``develop`` branch is unstable, and breaks on average once a month for at most 24 hours until a patch is submitted and merged.
|
||||
Be sure to pull frequently if you choose the ``develop`` branch.
|
||||
|
|
|
|||
|
|
@ -65,17 +65,17 @@ table.bbcodes > * > tr > th {
|
|||
<td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>[img]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]</td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg" alt="Immagine/foto"></td>
|
||||
<td>[img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]</td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="Immagine/foto"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>[img=https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg]Das Friendica Logo[/img]</td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg" alt="Das Friendica Logo"></td>
|
||||
<td>[img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]Das Friendica Logo[/img]</td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" alt="Das Friendica Logo"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]<br>
|
||||
<td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]<br>
|
||||
<br>Note: provided height is simply discarded.</td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg" style="width: 64px;"></td>
|
||||
<td><img src="https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg" style="width: 64px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>[size=xx-small]kleiner Text[/size]</td>
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ Per Git:
|
|||
cd /var/www/<Pfad zu Deiner friendica-Installation>/addon; git pull
|
||||
</p>
|
||||
|
||||
oder als normaler Download von hier: https://github.com/friendica/friendica-addons/blob/master/jappixmini.tgz (auf „view raw“ klicken)
|
||||
oder als normaler Download von hier: https://github.com/friendica/friendica-addons/blob/stable/jappixmini.tgz (auf „view raw“ klicken)
|
||||
|
||||
Entpacke diese Datei (ggf. den entpackten Ordner in „jappixmini“ umbenennen) und lade sowohl den entpackten Ordner komplett als auch die .tgz Datei in den Addon Ordner Deiner Friendica Installation hoch.
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ Wenn du die Möglichkeit hierzu hast, empfehlen wir dir "git" zu nutzen, um die
|
|||
Das macht die Aktualisierung wesentlich einfacher.
|
||||
Der Linux-Code, mit dem man die Dateien direkt in ein Verzeichnis wie "meinewebseite" kopiert, ist
|
||||
|
||||
git clone https://github.com/friendica/friendica.git -b master mywebsite
|
||||
git clone https://github.com/friendica/friendica.git -b stable mywebsite
|
||||
cd mywebsite
|
||||
bin/composer.phar install
|
||||
|
||||
|
|
@ -70,7 +70,7 @@ Falls Addons installiert werden sollen: Gehe in den Friendica-Ordner
|
|||
|
||||
Und die Addon Repository klonst:
|
||||
|
||||
git clone https://github.com/friendica/friendica-addons.git -b master addon
|
||||
git clone https://github.com/friendica/friendica-addons.git -b stable addon
|
||||
|
||||
Um das Addon-Verzeichnis aktuell zu halten, solltest du in diesem Pfad ein "git pull"-Befehl eintragen
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ Friendica Nachrichtenfluss
|
|||
Diese Seite soll einige Infos darüber dokumentieren, wie Nachrichten innerhalb von Friendica von einer Person zur anderen übertragen werden.
|
||||
Es gibt verschiedene Pfade, die verschiedene Protokolle und Nachrichtenformate nutzen.
|
||||
|
||||
Diejenigen, die den Nachrichtenfluss genauer verstehen wollen, sollten sich mindestens mit dem DFRN-Protokoll ([Dokument mit den DFRN Spezifikationen](https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf)) und den Elementen zur Nachrichtenverarbeitung des OStatus Stack informieren (salmon und Pubsubhubbub).
|
||||
Diejenigen, die den Nachrichtenfluss genauer verstehen wollen, sollten sich mindestens mit dem DFRN-Protokoll ([Dokument mit den DFRN Spezifikationen](https://github.com/friendica/friendica/blob/stable/spec/dfrn2.pdf)) und den Elementen zur Nachrichtenverarbeitung des OStatus Stack informieren (salmon und Pubsubhubbub).
|
||||
|
||||
Der Großteil der Nachrichtenverarbeitung nutzt die Datei include/items.php, welche Funktionen für verschiedene Feed-bezogene Import-/Exportaktivitäten liefert.
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* [Home](help)
|
||||
|
||||
To change the look of friendica you have to touch the themes.
|
||||
The current default theme is [Vier](https://github.com/friendica/friendica/tree/master/view/theme/vier) but there are numerous others.
|
||||
The current default theme is [Vier](https://github.com/friendica/friendica/tree/stable/view/theme/vier) but there are numerous others.
|
||||
Have a look at [friendica-themes.com](http://friendica-themes.com) for an overview of the existing themes.
|
||||
In case none of them suits your needs, there are several ways to change a theme.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ Friendica translations
|
|||
The Friendica translation process is based on `gettext` PO files.
|
||||
|
||||
Basic worflow:
|
||||
1. `xgettext` is used to collect translation strings across the project in the master PO file located in `view/lang/C/messages.po`.
|
||||
1. `xgettext` is used to collect translation strings across the project in the authoritative PO file located in `view/lang/C/messages.po`.
|
||||
2. This file makes translations strings available at [the Transifex Friendica page](https://www.transifex.com/Friendica/friendica/dashboard/).
|
||||
3. The translation itself is done at Transifex by volunteers.
|
||||
4. The resulting PO files by languages are manually updated in `view/lang/<language>/messages.po`.
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@
|
|||
* 2. We may be the target or other side of the conversation to scenario 1, and will
|
||||
* interact with that process on our own user's behalf.
|
||||
*
|
||||
* @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
|
||||
* @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/stable/spec/dfrn2.pdf
|
||||
* You also find a graphic which describes the confirmation process at
|
||||
* https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_confirmation.png
|
||||
* https://github.com/friendica/friendica/blob/stable/spec/dfrn2_contact_confirmation.png
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
* The dfrn notify endpoint
|
||||
*
|
||||
* @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
|
||||
* @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/stable/spec/dfrn2.pdf
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
*
|
||||
*Handles communication associated with the issuance of friend requests.
|
||||
*
|
||||
* @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
|
||||
* @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/stable/spec/dfrn2.pdf
|
||||
* You also find a graphic which describes the confirmation process at
|
||||
* https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
|
||||
* https://github.com/friendica/friendica/blob/stable/spec/dfrn2_contact_request.png
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ volumes:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -79,7 +79,7 @@ volumes:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -122,7 +122,7 @@ volumes:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -169,7 +169,7 @@ volumes:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -211,7 +211,7 @@ volumes:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -253,7 +253,7 @@ volumes:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -282,7 +282,7 @@ services:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -306,7 +306,7 @@ services:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -330,7 +330,7 @@ services:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -360,7 +360,7 @@ services:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -384,7 +384,7 @@ services:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -408,7 +408,7 @@ services:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -439,7 +439,7 @@ services:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -463,7 +463,7 @@ services:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
@ -487,7 +487,7 @@ services:
|
|||
|
||||
trigger:
|
||||
branch:
|
||||
# - master
|
||||
# - stable
|
||||
- develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ class Installer
|
|||
$help = "";
|
||||
if (!$passed) {
|
||||
$help .= DI::l10n()->t('Could not find a command line version of PHP in the web server PATH.') . EOL;
|
||||
$help .= DI::l10n()->t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;
|
||||
$help .= DI::l10n()->t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/stable/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;
|
||||
$help .= EOL . EOL;
|
||||
$tpl = Renderer::getMarkupTemplate('field_input.tpl');
|
||||
/// @todo Separate backend Installer class and presentation layer/view
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ class Search
|
|||
/**
|
||||
* Search in the global directory for occurrences of the search string
|
||||
*
|
||||
* @see https://github.com/friendica/friendica-directory/blob/master/docs/Protocol.md#search
|
||||
* @see https://github.com/friendica/friendica-directory/blob/stable/docs/Protocol.md#search
|
||||
*
|
||||
* @param string $search
|
||||
* @param int $type specific type of searching
|
||||
|
|
|
|||
|
|
@ -548,7 +548,7 @@ class Site extends BaseAdmin
|
|||
|
||||
$check_git_version_choices = [
|
||||
'none' => DI::l10n()->t('Don\'t check'),
|
||||
'master' => DI::l10n()->t('check the stable version'),
|
||||
'stable' => DI::l10n()->t('check the stable version'),
|
||||
'develop' => DI::l10n()->t('check the development version')
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -75,8 +75,8 @@ class Summary extends BaseAdmin
|
|||
}
|
||||
}
|
||||
|
||||
// Check if github.com/friendica/master/VERSION is higher then
|
||||
// the local version of Friendica. Check is opt-in, source may be master or devel branch
|
||||
// Check if github.com/friendica/stable/VERSION is higher then
|
||||
// the local version of Friendica. Check is opt-in, source may be stable or develop branch
|
||||
if (DI::config()->get('system', 'check_new_version_url', 'none') != 'none') {
|
||||
$gitversion = DI::config()->get('system', 'git_friendica_version');
|
||||
if (version_compare(FRIENDICA_VERSION, $gitversion) < 0) {
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ abstract class BaseAdmin extends BaseModule
|
|||
}
|
||||
|
||||
if (!empty($_SESSION['submanage'])) {
|
||||
throw new ForbiddenException(DI::l10n()->t('Submanaged account can\'t access the administation pages. Please log back in as the master account.'));
|
||||
throw new ForbiddenException(DI::l10n()->t('Submanaged account can\'t access the administation pages. Please log back in as the main account.'));
|
||||
}
|
||||
|
||||
// Header stuff
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ use Friendica\Util\Network;
|
|||
* Check the git repository VERSION file and save the version to the DB
|
||||
*
|
||||
* Checking the upstream version is optional (opt-in) and can be done to either
|
||||
* the master or the develop branch in the repository.
|
||||
* the stable or the develop branch in the repository.
|
||||
*/
|
||||
class CheckVersion
|
||||
{
|
||||
|
|
@ -42,7 +42,8 @@ class CheckVersion
|
|||
|
||||
switch ($checkurl) {
|
||||
case 'master':
|
||||
$checked_url = 'https://raw.githubusercontent.com/friendica/friendica/master/VERSION';
|
||||
case 'stable':
|
||||
$checked_url = 'https://raw.githubusercontent.com/friendica/friendica/stable/VERSION';
|
||||
break;
|
||||
case 'develop':
|
||||
$checked_url = 'https://raw.githubusercontent.com/friendica/friendica/develop/VERSION';
|
||||
|
|
|
|||
|
|
@ -29,23 +29,23 @@ Don't blame me too much for ugly code and hacks. Fix it ;-)
|
|||
|
||||
#### Screenshots
|
||||
**Default**
|
||||
|
||||
|
||||
|
||||
**Modals**
|
||||
|
||||
|
||||
|
||||
**Theme - Settings**
|
||||
|
||||
|
||||
|
||||
**Red scheme**
|
||||
|
||||
|
||||
|
||||
**Love Music scheme**
|
||||
|
||||
|
||||
|
||||
**frio on mobile**
|
||||
|
||||
|
||||
|
||||
|
||||
#### Credits:
|
||||
HumHub - Social Network Kit - <https://github.com/humhub/humhub>
|
||||
|
|
|
|||
Loading…
Reference in New Issue