aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'prototech/ticket/11814' into develop-olympusJoas Schilling2013-11-191-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 G2013-11-191-2/+1
|/ | | | PHPBB3-11814
* Merge remote-tracking branch 'github-bantu/ticket/11970' into develop-olympusNils Adermann2013-10-262-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 Fischer2013-10-262-7/+7
| | | | | | | | PHPBB3-11970
| * [ticket/11970] Add set -x to Travis setup scripts.Andreas Fischer2013-10-262-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-olympusAndreas Fischer2013-10-251-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 Fischer2013-10-251-1/+11
| | | | | | | | PHPBB3-11920
* | Merge branch 'task/github-readme/travis' into develop-olympusNils Adermann2013-10-241-2/+2
|\ \ | | | | | | | | | | | | * task/github-readme/travis: [task/github-readme/travis] Fix Travis-Badge and link
| * | [task/github-readme/travis] Fix Travis-Badge and linkFalk Seidel2013-10-241-2/+2
|/ / | | | | | | PHPBB3-11968
* | Merge remote-tracking branch 'github-bantu/ticket/11951' into develop-olympusNils Adermann2013-10-202-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 Fischer2013-10-191-1/+1
| | | | | | | | | | | | PHPBB3-11951
| * | [ticket/11951] Add MariaDB to supported DBMSes in requirement section.Andreas Fischer2013-10-191-0/+1
|/ / | | | | | | PHPBB3-11951
* | Merge pull request #1782 from bantu/ticket/11920Nils Adermann2013-10-152-0/+6
|\ \ | |/ | | [ticket/11920] Actually call travis/setup-mariadb.sh.
| * [ticket/11920] Print MariaDB version after successful setup.Andreas Fischer2013-10-161-0/+2
| | | | | | | | PHPBB3-11920
| * [ticket/11920] Manually purge mysql-common.Andreas Fischer2013-10-161-0/+3
| | | | | | | | PHPBB3-11920
| * [ticket/11920] Actually call travis/setup-mariadb.sh.Andreas Fischer2013-10-151-0/+1
| | | | | | | | PHPBB3-11920
* | Merge pull request #1780 from bantu/ticket/11920Nils Adermann2013-10-153-1/+76
|\ \ | |/ | | [ticket/11920] Add MariaDB environment to Travis-CI.
| * [ticket/11920] Have to use empty root password otherwise db creation fails.Andreas Fischer2013-10-152-1/+8
| | | | | | | | PHPBB3-11920
| * [ticket/11920] Add MariaDB environment to Travis-CI.Andreas Fischer2013-10-153-1/+69
|/ | | | PHPBB3-11920
* Merge remote-tracking branch 'remotes/bantu/ticket/11877' into develop-olympusNathan Guse2013-10-032-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 Fischer2013-10-012-0/+110
| | | | | | | | PHPBB3-11877
* | Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympusAndreas Fischer2013-10-021-1/+1
|\ \ | |/ |/| | | | | * cyberalien/ticket/11879: [ticket/11879] Replace .live() with .on()
| * [ticket/11879] Replace .live() with .on()Vjacheslav Trushkin2013-10-021-1/+1
| | | | | | | | PHPBB3-11879
* | [ticket/11876] Replace MD5 with SHA256.Andreas Fischer2013-09-301-1/+1
| | | | | | | | PHPBB3-11876
* | [ticket/11876] Move checksum generation from build PHP files to phing build.xmlAndreas Fischer2013-09-303-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 Fischer2013-09-301-1/+1
| |
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-283-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 Fischer2013-09-281-0/+1
| |
| * Merge branch 'ticket/11873' into prep-release-3.0.12Andreas Fischer2013-09-282-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 Schilling2013-09-281-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 Schilling2013-09-281-0/+7
| |/ | | | | | | PHPBB3-11873
* | [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.Andreas Fischer2013-09-271-3/+3
| |
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-272-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 Fischer2013-09-274-5/+11
| |
* | Merge remote-tracking branch 'marc1706/ticket/11864' into develop-olympusAndreas Fischer2013-09-261-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_forumsMarc Alexander2013-09-251-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 Guse2013-09-133-0/+23
|\ \ | | | | | | | | | | | | | | | | | | develop-olympus * remotes/cyberalien/ticket/11811: [ticket/11811] Remove outline on :focus
| * | [ticket/11811] Remove outline on :focusVjacheslav Trushkin2013-09-133-0/+23
|/ / | | | | | | PHPBB3-11811
* | Merge pull request #1701 from EXreaction/ticket/11831David King2013-09-123-155/+299
|\ \ | | | | | | Update fabpot/goutte
| * | [ticket/11831] getAttribute was replaced with attrNathan2013-09-061-1/+1
| | | | | | | | | | | | PHPBB3-11831
| * | [ticket/11831] Update fabpot/goutte to 1.0.*Nathan2013-09-062-154/+298
| | | | | | | | | | | | PHPBB3-11831
* | | Merge pull request #1698 from rechosen/ticket/11829Nathan Guse2013-09-124-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_detailsrechosen2013-09-044-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-olympusAndreas Fischer2013-09-101-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 Fischer2013-09-101-1/+0
| | | | | | | | | | | | A wrong fix version was assigned to PHPBB3-11288.
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-053-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 Fischer2013-09-021-0/+3
| |
| * [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-024-5/+11
| |
* | Merge remote-tracking branch 'imkingdavid/ticket/11823' into develop-olympusAndreas Fischer2013-09-021-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 .phpDavid King2013-09-021-1/+1
|/ / | | | | | | PHPBB3-11823