Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'prototech/ticket/11814' into develop-olympus | Joas Schilling | 2013-11-19 | 1 | -2/+1 |
|\ | | | | | | | | | * prototech/ticket/11814: [ticket/11814] Remove redundant text from the topic reply email notification. | ||||
| * | [ticket/11814] Remove redundant text from the topic reply email notification. | Cesar G | 2013-11-19 | 1 | -2/+1 |
|/ | | | | PHPBB3-11814 | ||||
* | Merge remote-tracking branch 'github-bantu/ticket/11970' into develop-olympus | Nils Adermann | 2013-10-26 | 2 | -7/+9 |
|\ | | | | | | | | | | | * github-bantu/ticket/11970: [ticket/11970] Make apt-get less quiet. [ticket/11970] Add set -x to Travis setup scripts. | ||||
| * | [ticket/11970] Make apt-get less quiet. | Andreas Fischer | 2013-10-26 | 2 | -7/+7 |
| | | | | | | | | PHPBB3-11970 | ||||
| * | [ticket/11970] Add set -x to Travis setup scripts. | Andreas Fischer | 2013-10-26 | 2 | -0/+2 |
|/ | | | | | | Output is hidden by Travis by default and this will allow easier debugging. PHPBB3-11970 | ||||
* | Merge remote-tracking branch 'bantu/ticket/11920' into develop-olympus | Andreas Fischer | 2013-10-25 | 1 | -1/+11 |
|\ | | | | | | | | | * bantu/ticket/11920: [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL. | ||||
| * | [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL. | Andreas Fischer | 2013-10-25 | 1 | -1/+11 |
| | | | | | | | | PHPBB3-11920 | ||||
* | | Merge branch 'task/github-readme/travis' into develop-olympus | Nils Adermann | 2013-10-24 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | * task/github-readme/travis: [task/github-readme/travis] Fix Travis-Badge and link | ||||
| * | | [task/github-readme/travis] Fix Travis-Badge and link | Falk Seidel | 2013-10-24 | 1 | -2/+2 |
|/ / | | | | | | | PHPBB3-11968 | ||||
* | | Merge remote-tracking branch 'github-bantu/ticket/11951' into develop-olympus | Nils Adermann | 2013-10-20 | 2 | -1/+2 |
|\ \ | | | | | | | | | | | | | | | | * github-bantu/ticket/11951: [ticket/11951] Add MariaDB to platforms we test on. [ticket/11951] Add MariaDB to supported DBMSes in requirement section. | ||||
| * | | [ticket/11951] Add MariaDB to platforms we test on. | Andreas Fischer | 2013-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-11951 | ||||
| * | | [ticket/11951] Add MariaDB to supported DBMSes in requirement section. | Andreas Fischer | 2013-10-19 | 1 | -0/+1 |
|/ / | | | | | | | PHPBB3-11951 | ||||
* | | Merge pull request #1782 from bantu/ticket/11920 | Nils Adermann | 2013-10-15 | 2 | -0/+6 |
|\ \ | |/ | | | [ticket/11920] Actually call travis/setup-mariadb.sh. | ||||
| * | [ticket/11920] Print MariaDB version after successful setup. | Andreas Fischer | 2013-10-16 | 1 | -0/+2 |
| | | | | | | | | PHPBB3-11920 | ||||
| * | [ticket/11920] Manually purge mysql-common. | Andreas Fischer | 2013-10-16 | 1 | -0/+3 |
| | | | | | | | | PHPBB3-11920 | ||||
| * | [ticket/11920] Actually call travis/setup-mariadb.sh. | Andreas Fischer | 2013-10-15 | 1 | -0/+1 |
| | | | | | | | | PHPBB3-11920 | ||||
* | | Merge pull request #1780 from bantu/ticket/11920 | Nils Adermann | 2013-10-15 | 3 | -1/+76 |
|\ \ | |/ | | | [ticket/11920] Add MariaDB environment to Travis-CI. | ||||
| * | [ticket/11920] Have to use empty root password otherwise db creation fails. | Andreas Fischer | 2013-10-15 | 2 | -1/+8 |
| | | | | | | | | PHPBB3-11920 | ||||
| * | [ticket/11920] Add MariaDB environment to Travis-CI. | Andreas Fischer | 2013-10-15 | 3 | -1/+69 |
|/ | | | | PHPBB3-11920 | ||||
* | Merge remote-tracking branch 'remotes/bantu/ticket/11877' into develop-olympus | Nathan Guse | 2013-10-03 | 2 | -0/+110 |
|\ | | | | | | | | | * remotes/bantu/ticket/11877: [ticket/11877] Create package links and checksums for announcement via script. | ||||
| * | [ticket/11877] Create package links and checksums for announcement via script. | Andreas Fischer | 2013-10-01 | 2 | -0/+110 |
| | | | | | | | | PHPBB3-11877 | ||||
* | | Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympus | Andreas Fischer | 2013-10-02 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | * cyberalien/ticket/11879: [ticket/11879] Replace .live() with .on() | ||||
| * | [ticket/11879] Replace .live() with .on() | Vjacheslav Trushkin | 2013-10-02 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-11879 | ||||
* | | [ticket/11876] Replace MD5 with SHA256. | Andreas Fischer | 2013-09-30 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-11876 | ||||
* | | [ticket/11876] Move checksum generation from build PHP files to phing build.xml | Andreas Fischer | 2013-09-30 | 3 | -15/+18 |
| | | | | | | | | | | | | This also removes paths from the checksum files. PHPBB3-11876 | ||||
* | | [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. | Andreas Fischer | 2013-09-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'prep-release-3.0.12' into develop-olympus | Andreas Fischer | 2013-09-28 | 3 | -0/+16 |
|\ \ | |/ |/| | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources. | ||||
| * | [prep-release-3.0.12] Update changelog for 3.0.12 release. | Andreas Fischer | 2013-09-28 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'ticket/11873' into prep-release-3.0.12 | Andreas Fischer | 2013-09-28 | 2 | -0/+15 |
| |\ | | | | | | | | | | | | | | | | * ticket/11873: [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources. | ||||
| | * | [ticket/11873] Add unit test for large password input. | Joas Schilling | 2013-09-28 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | The password should be rejected quite fast. PHPBB3-11873 | ||||
| | * | [ticket/11873] Do not hash very large passwords in order to safe resources. | Joas Schilling | 2013-09-28 | 1 | -0/+7 |
| |/ | | | | | | | PHPBB3-11873 | ||||
* | | [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. | Andreas Fischer | 2013-09-27 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'prep-release-3.0.12' into develop-olympus | Andreas Fischer | 2013-09-27 | 2 | -2/+8 |
|\ \ | |/ | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Bumping version number for 3.0.12 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql | ||||
| * | [prep-release-3.0.12] Bumping version number for 3.0.12 final. | Andreas Fischer | 2013-09-27 | 4 | -5/+11 |
| | | |||||
* | | Merge remote-tracking branch 'marc1706/ticket/11864' into develop-olympus | Andreas Fischer | 2013-09-26 | 1 | -1/+0 |
|\ \ | | | | | | | | | | | | | * marc1706/ticket/11864: [ticket/11864] Do not call exit after display_progress_bar in acp_forums | ||||
| * | | [ticket/11864] Do not call exit after display_progress_bar in acp_forums | Marc Alexander | 2013-09-25 | 1 | -1/+0 |
|/ / | | | | | | | | | | | | | | | | | | | The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864 | ||||
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11811' into ↵ | Nathan Guse | 2013-09-13 | 3 | -0/+23 |
|\ \ | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/cyberalien/ticket/11811: [ticket/11811] Remove outline on :focus | ||||
| * | | [ticket/11811] Remove outline on :focus | Vjacheslav Trushkin | 2013-09-13 | 3 | -0/+23 |
|/ / | | | | | | | PHPBB3-11811 | ||||
* | | Merge pull request #1701 from EXreaction/ticket/11831 | David King | 2013-09-12 | 3 | -155/+299 |
|\ \ | | | | | | | Update fabpot/goutte | ||||
| * | | [ticket/11831] getAttribute was replaced with attr | Nathan | 2013-09-06 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-11831 | ||||
| * | | [ticket/11831] Update fabpot/goutte to 1.0.* | Nathan | 2013-09-06 | 2 | -154/+298 |
| | | | | | | | | | | | | PHPBB3-11831 | ||||
* | | | Merge pull request #1698 from rechosen/ticket/11829 | Nathan Guse | 2013-09-12 | 4 | -3/+5 |
|\ \ \ | | | | | | | | | [ticket/11829] Use report_closed to determine status in MCP report_details | ||||
| * | | | [ticket/11829] Use report_closed to determine status in MCP report_details | rechosen | 2013-09-04 | 4 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using post_reported of the post or message_reported of the pm, use report_closed of the report itself to reliably determine whether this particular report is closed or not in the report_details view of the MCP. This fixes a bug where the report_details view would not show that the report shown was closed and display a "Close report" button that had no effect. PHPBB3-11829 | ||||
* | | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Andreas Fischer | 2013-09-10 | 1 | -1/+0 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | * prep-release-3.0.12: [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. | ||||
| * | | [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. | Andreas Fischer | 2013-09-10 | 1 | -1/+0 |
| | | | | | | | | | | | | A wrong fix version was assigned to PHPBB3-11288. | ||||
* | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Andreas Fischer | 2013-09-05 | 3 | -2/+11 |
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql | ||||
| * | [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. | Andreas Fischer | 2013-09-02 | 1 | -0/+3 |
| | | |||||
| * | [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. | Andreas Fischer | 2013-09-02 | 4 | -5/+11 |
| | | |||||
* | | Merge remote-tracking branch 'imkingdavid/ticket/11823' into develop-olympus | Andreas Fischer | 2013-09-02 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | * imkingdavid/ticket/11823: [ticket/11823] Set up nginx server to match PHP files with characters after .php | ||||
| * | | [ticket/11823] Set up nginx server to match PHP files with characters after .php | David King | 2013-09-02 | 1 | -1/+1 |
|/ / | | | | | | | PHPBB3-11823 |