mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-24 03:54:10 +01:00
948bfcbe77
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10780] Use L_COLON on LDAP page.
[ticket/10780] Use L_COLON on search backend ACP pages.
[ticket/10780] Use L_COLON for "download all attachments".
[ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
[ticket/10780] Replace colon usage in adm template output with {L_COLON}
[ticket/10780] Replace colon usage in template output with {L_COLON}
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
[ticket/10172] Show prosilver birthday list even if there are no birthdays.
[ticket/11050] make all properties protected in all search backends
[ticket/11050] get_common_words() returns empty array for sphinx
[ticket/11050] fix tidied search query docblock language
[ticket/11050] fix min/max length docblock language
[ticket/11050] multi sentences separated by period in docblocks
[ticket/11050] fix separated spelling in docblock
[ticket/11050] fix split words doc block language
[ticket/11050] remove class word from docblocks
...
Conflicts:
phpBB/install/database_update.php
phpBB/install/schemas/mssql_schema.sql
phpBB/language/en/acp/permissions_phpbb.php
phpBB/styles/prosilver/template/posting_editor.html
ABOUT
phpBB is a free bulletin board written in PHP.
COMMUNITY
Find support and lots more on phpBB.com! Discuss the development on area51.
INSTALLING DEPENDENCIES
To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies.
cd phpBB
php ../composer.phar install --dev
CONTRIBUTE
- Create an account on phpBB.com
- Create a ticket (unless there already is one)
- Read our Git Contribution Guidelines; if you're new to git, also read the introduction guide
- Send us a pull request
AUTOMATED TESTING
We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration here or check our travis build below.
develop - 
develop-olympus - 