From 89ae1c3221c40b6394aa5da6bfc87d2f19ae4c9a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 11 May 2019 17:30:43 +0200 Subject: [PATCH] [ticket/16052] Update version numbers to 3.3 PHPBB3-16052 --- .github/PULL_REQUEST_TEMPLATE.md | 6 +-- README.md | 2 +- build/build.xml | 2 +- phpBB/adm/style/acp_ext_list.html | 2 +- phpBB/adm/style/acp_language.html | 2 +- phpBB/adm/style/acp_styles.html | 2 +- phpBB/adm/style/admin.css | 2 +- phpBB/composer.json | 2 +- phpBB/docs/CHANGELOG.html | 6 +-- phpBB/docs/FAQ.html | 10 ++--- phpBB/docs/INSTALL.html | 38 +++++++++---------- phpBB/docs/README.html | 22 +++++------ phpBB/docs/coding-guidelines.html | 4 +- phpBB/includes/constants.php | 2 +- phpBB/includes/functions_module.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/language/en/acp/permissions.php | 2 +- phpBB/language/en/install.php | 6 +-- .../task/create_config_file.php | 2 +- phpBB/styles/prosilver/style.cfg | 4 +- phpBB/styles/prosilver/theme/stylesheet.css | 26 ++++++------- 23 files changed, 75 insertions(+), 75 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index cacfcf1118..bf8df273a9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,9 +1,9 @@ Checklist: -- [ ] Correct branch: master for new features; 3.2.x for fixes +- [ ] Correct branch: master for new features; 3.3.x & 3.2.x for fixes - [ ] Tests pass -- [ ] Code follows coding guidelines: [master](https://area51.phpbb.com/docs/dev/master/development/coding_guidelines.html) and [3.2.x](https://area51.phpbb.com/docs/dev/3.2.x/development/coding_guidelines.html) -- [ ] Commit follows commit message [format](https://area51.phpbb.com/docs/dev/3.2.x/development/git.html) +- [ ] Code follows coding guidelines: [master](https://area51.phpbb.com/docs/dev/master/development/coding_guidelines.html), [3.3.x](https://area51.phpbb.com/docs/dev/3.3.x/development/coding_guidelines.html) and [3.2.x](https://area51.phpbb.com/docs/dev/3.2.x/development/coding_guidelines.html) +- [ ] Commit follows commit message [format](https://area51.phpbb.com/docs/dev/3.3.x/development/git.html) Tracker ticket (set the ticket ID to **your ticket ID**): diff --git a/README.md b/README.md index d1854dc74d..aa262d5632 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ Read our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use V We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our travis builds below: * [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=master)](http://travis-ci.org/phpbb/phpbb)[![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/master?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/master) **master** - Latest development version +* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.3.x)](http://travis-ci.org/phpbb/phpbb)[![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/3.3.x?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/3.3.x) **3.3.x** - Development of version 3.3.x * [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.2.x)](http://travis-ci.org/phpbb/phpbb)[![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/3.2.x?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/3.2.x) **3.2.x** - Development of version 3.2.x -* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.1.x)](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x ## LICENSE diff --git a/build/build.xml b/build/build.xml index ff711f435c..9e9b19923f 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index c3c3b3fb66..e5783124c6 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -7,7 +7,7 @@

{L_EXTENSIONS_EXPLAIN}

- {L_BROWSE_EXTENSIONS_DATABASE} • {L_VERSIONCHECK_FORCE_UPDATE_ALL} • {L_SETTINGS} + {L_BROWSE_EXTENSIONS_DATABASE} • {L_VERSIONCHECK_FORCE_UPDATE_ALL} • {L_SETTINGS}