aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.1.0-RC2' into develop-ascraeusJoas Schilling2014-07-118-39/+142
|\
| * [prep-release-3.1.0-RC2] Update phpBB Version for RC3 developmentJoas Schilling2014-07-113-5/+5
| * [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2Joas Schilling2014-07-111-0/+69
| * [prep-release-3.1.0-RC2] Prepare ChangelogJoas Schilling2014-07-111-29/+32
| * [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2Joas Schilling2014-07-111-0/+31
| * [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2Joas Schilling2014-07-116-8/+8
|/
* Merge pull request #2723 from nickvergessen/ticket/12839Tristan Darricau2014-07-111-6/+36
|\
| * [ticket/12839] Include update related templates and assets in the packageJoas Schilling2014-07-111-6/+36
* | Merge pull request #2713 from n-aleha/ticket/12768Andreas Fischer2014-07-115-9/+9
|\ \
| * | [ticket/12768] More fixes in language filesn-aleha2014-07-085-8/+8
| * | [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentationn-aleha2014-07-081-1/+1
* | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-07-111-1/+1
|\ \ \
| * \ \ Merge pull request #2716 from marc1706/ticket/12120Andreas Fischer2014-07-111-2/+2
| |\ \ \
| | * | | [ticket/12120] Remove imkingdavid from active authorsMarc Alexander2014-07-081-2/+2
* | | | | Merge pull request #2701 from Nicofuma/ticket/12818Andreas Fischer2014-07-112-2/+18
|\ \ \ \ \
| * | | | | [ticket/12818] Use assertGreaterThanOrEqual in the testsTristan Darricau2014-07-091-1/+1
| * | | | | [ticket/12818] Don't use the id for i=Tristan Darricau2014-07-071-1/+1
| * | | | | [ticket/12818] Add testsTristan Darricau2014-07-071-0/+16
| * | | | | [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logsTristan Darricau2014-07-061-2/+2
* | | | | | Merge pull request #2671 from Nicofuma/ticket/12775Andreas Fischer2014-07-1128-478/+915
|\ \ \ \ \ \
| * | | | | | [ticket/12775] Set dbal.conn.driver as synthetic during installationTristan Darricau2014-07-071-1/+1
| * | | | | | [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.ymlTristan Darricau2014-07-073-7/+20
| * | | | | | [ticket/12775] Inject the connection when created in the containerTristan Darricau2014-07-071-3/+2
| * | | | | | [ticket/12775] Extract the vars later in install/install_update.phpTristan Darricau2014-07-071-2/+1
| * | | | | | [ticket/12775] Rename config_php_handler to config_php_file container_builderTristan Darricau2014-07-071-9/+9
| * | | | | | [ticket/12775] Set defined_vars as a property of config_php_fileTristan Darricau2014-07-071-1/+2
| * | | | | | [ticket/12775] Fix doc blocks in the container builderTristan Darricau2014-07-071-9/+14
| * | | | | | [ticket/12775] Remove useless includes of config.phpTristan Darricau2014-07-072-7/+1
| * | | | | | [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file classTristan Darricau2014-07-0710-72/+73
| * | | | | | [ticket/12775] Fix commentsTristan Darricau2014-07-072-2/+1
| * | | | | | [ticket/12775] Update doc blocksTristan Darricau2014-07-073-6/+4
| * | | | | | [ticket/12775] Fix container_builderTristan Darricau2014-07-0711-11/+11
| * | | | | | [ticket/12775] Rename config_php to config_php_fileTristan Darricau2014-07-0713-39/+39
| * | | | | | [ticket/12775] Renamed to \phpbb\di\container_builderTristan Darricau2014-07-0711-49/+49
| * | | | | | [ticket/12775] Remove the last include of functions_containerTristan Darricau2014-07-071-1/+0
| * | | | | | [ticket/12775] Fix unit testsTristan Darricau2014-07-072-2/+2
| * | | | | | [ticket/12775] Add tests for \phpbb\config_phpTristan Darricau2014-07-073-0/+36
| * | | | | | [ticket/12775] Add tests for the container factoryTristan Darricau2014-07-079-320/+165
| * | | | | | [ticket/12775] Use a field instead of a local var in load_config_var()Tristan Darricau2014-07-071-3/+3
| * | | | | | [ticket/12775] Update container and config in install/Tristan Darricau2014-07-073-17/+28
| * | | | | | [ticket/12775] Load the config file before constants.phpTristan Darricau2014-07-073-16/+15
| * | | | | | [ticket/12775] Skip the tests related to the containerTristan Darricau2014-07-071-0/+3
| * | | | | | [ticket/12775] Update phpBB/install/index.phpTristan Darricau2014-07-073-7/+45
| * | | | | | [ticket/12775] Update phpBB/install/database_update.phpTristan Darricau2014-07-074-323/+347
| * | | | | | [ticket/12775] Update phpBB/download/file.phpTristan Darricau2014-07-071-3/+5
| * | | | | | [ticket/12775] Update phpBB/bin/phpbbcli.phpTristan Darricau2014-07-072-3/+9
| * | | | | | [ticket/12775] Fix config_php::load_config_file()Tristan Darricau2014-07-071-0/+1
| * | | | | | [ticket/12775] Rename the variables into common.phpTristan Darricau2014-07-071-5/+4
| * | | | | | [ticket/12775] Use the config.php handler in \phpbb\config_phpTristan Darricau2014-07-072-30/+19
| * | | | | | [ticket/12775] Add get() and get_all() into config_phpTristan Darricau2014-07-071-7/+36