diff --git a/doc/BBCode.md b/doc/BBCode.md index 08c43636f..47e45b7ac 100644 --- a/doc/BBCode.md +++ b/doc/BBCode.md @@ -65,17 +65,17 @@ table.bbcodes > * > tr > th { Friendica - [img]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img] - Immagine/foto + [img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img] + Immagine/foto - [img=https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg]The Friendica Logo[/img] - The Friendica Logo + [img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]The Friendica Logo[/img] + The Friendica Logo - [img=64x32]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]
+ [img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]

Note: provided height is simply discarded. - + [size=xx-small]small text[/size] diff --git a/doc/Github.md b/doc/Github.md index ca467e525..5fbc3788e 100644 --- a/doc/Github.md +++ b/doc/Github.md @@ -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. diff --git a/doc/Install.md b/doc/Install.md index d0daa5f11..3f2071401 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -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 diff --git a/doc/Message-Flow.md b/doc/Message-Flow.md index 9692ae88c..69a10b232 100644 --- a/doc/Message-Flow.md +++ b/doc/Message-Flow.md @@ -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. diff --git a/doc/Update.md b/doc/Update.md index 7f8a0fcae..c4fe16186 100644 --- a/doc/Update.md +++ b/doc/Update.md @@ -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. diff --git a/doc/de/BBCode.md b/doc/de/BBCode.md index 1db798427..5786e2275 100644 --- a/doc/de/BBCode.md +++ b/doc/de/BBCode.md @@ -65,17 +65,17 @@ table.bbcodes > * > tr > th { Friendica - [img]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img] - Immagine/foto + [img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img] + Immagine/foto - [img=https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg]Das Friendica Logo[/img] - Das Friendica Logo + [img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]Das Friendica Logo[/img] + Das Friendica Logo - [img=64x32]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]
+ [img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]

Note: provided height is simply discarded. - + [size=xx-small]kleiner Text[/size] diff --git a/doc/de/Install.md b/doc/de/Install.md index 8225993e4..03dd21798 100644 --- a/doc/de/Install.md +++ b/doc/de/Install.md @@ -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 diff --git a/doc/de/Message-Flow.md b/doc/de/Message-Flow.md index 8ef8704d1..0a78d6917 100644 --- a/doc/de/Message-Flow.md +++ b/doc/de/Message-Flow.md @@ -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. diff --git a/doc/themes.md b/doc/themes.md index 94dc47da1..b7bb2e226 100644 --- a/doc/themes.md +++ b/doc/themes.md @@ -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. diff --git a/doc/translations.md b/doc/translations.md index a29b0d63b..23ac4a62d 100644 --- a/doc/translations.md +++ b/doc/translations.md @@ -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//messages.po`. diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index cf6bd4a78..8b87bae5d 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -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; diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 2e1f51a11..8b14fe49b 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -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; diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 06c81a084..f5716e8ff 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -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; diff --git a/mods/.drone.yml b/mods/.drone.yml index 21754ef06..696bbfa80 100644 --- a/mods/.drone.yml +++ b/mods/.drone.yml @@ -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: diff --git a/src/Core/Installer.php b/src/Core/Installer.php index 31cdb26b9..37b51d2ed 100644 --- a/src/Core/Installer.php +++ b/src/Core/Installer.php @@ -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 'Setup the worker'") . 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 'Setup the worker'") . EOL; $help .= EOL . EOL; $tpl = Renderer::getMarkupTemplate('field_input.tpl'); /// @todo Separate backend Installer class and presentation layer/view diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 3592ed837..2e16cc657 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -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') ]; diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index 4c94b6e26..c19b7f7f8 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -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) { diff --git a/src/Module/BaseAdmin.php b/src/Module/BaseAdmin.php index 300aeb45b..a7b38a503 100644 --- a/src/Module/BaseAdmin.php +++ b/src/Module/BaseAdmin.php @@ -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 diff --git a/src/Worker/CheckVersion.php b/src/Worker/CheckVersion.php index ae23b40c0..9572342c3 100644 --- a/src/Worker/CheckVersion.php +++ b/src/Worker/CheckVersion.php @@ -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'; diff --git a/view/theme/frio/README.md b/view/theme/frio/README.md index 0100baa1d..b326bf783 100644 --- a/view/theme/frio/README.md +++ b/view/theme/frio/README.md @@ -29,23 +29,23 @@ Don't blame me too much for ugly code and hacks. Fix it ;-) #### Screenshots **Default** -![Default - Stream](https://git.friendi.ca/friendica/friendica/raw/branch/master/view/theme/frio/img/screenshots/screenshot.png) +![Default - Stream](https://git.friendi.ca/friendica/friendica/raw/branch/stable/view/theme/frio/img/screenshots/screenshot.png) **Modals** -![Modals](https://git.friendi.ca/friendica/friendica/raw/branch/master/view/theme/frio/img/screenshots/screenshot-jot-modal.png) +![Modals](https://git.friendi.ca/friendica/friendica/raw/branch/stable/view/theme/frio/img/screenshots/screenshot-jot-modal.png) **Theme - Settings** -![Theme - Settings](https://git.friendi.ca/friendica/friendica/raw/branch/master/view/theme/frio/img/screenshots/screenshot-settings.png) +![Theme - Settings](https://git.friendi.ca/friendica/friendica/raw/branch/stable/view/theme/frio/img/screenshots/screenshot-settings.png) **Red scheme** -![Red scheme](https://git.friendi.ca/friendica/friendica/raw/branch/master/view/theme/frio/img/screenshots/screenshot-scheme-red.png) +![Red scheme](https://git.friendi.ca/friendica/friendica/raw/branch/stable/view/theme/frio/img/screenshots/screenshot-scheme-red.png) **Love Music scheme** -![Love Music scheme](https://git.friendi.ca/friendica/friendica/raw/branch/master/view/theme/frio/img/screenshots/screenshot-scheme-love-music.png) +![Love Music scheme](https://git.friendi.ca/friendica/friendica/raw/branch/stable/view/theme/frio/img/screenshots/screenshot-scheme-love-music.png) **frio on mobile** -![frio on mobile](https://git.friendi.ca/friendica/friendica/raw/branch/master/view/theme/frio/img/screenshots/screenshot-mobile.png) +![frio on mobile](https://git.friendi.ca/friendica/friendica/raw/branch/stable/view/theme/frio/img/screenshots/screenshot-mobile.png) #### Credits: HumHub - Social Network Kit -