Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-12-26 | 1 | -0/+56 |
|\ | |||||
| * | [prep-release-3.2.9] Add changelog for 3.2.9-RC1 | Marc Alexander | 2019-12-25 | 1 | -0/+56 |
| | | |||||
* | | [prep-release-3.3.0-RC1] Update changelog for 3.3.0-RC1 | Marc Alexander | 2019-12-21 | 1 | -0/+31 |
| | | |||||
* | | [prep-release-3.3.0-b2] Update changelog for 3.3.0-b2 | Marc Alexander | 2019-11-22 | 1 | -0/+25 |
| | | |||||
* | | [prep-release-3.3.0-b1] Add changelog for 3.3.0-b1 | Marc Alexander | 2019-10-19 | 1 | -0/+109 |
| | | |||||
* | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-09-20 | 1 | -1/+27 |
|\ \ | |/ | |||||
| * | [prep-release-3.2.8] Update changelog for 3.2.8 | Marc Alexander | 2019-09-08 | 1 | -1/+27 |
| | | |||||
* | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-08-17 | 1 | -0/+75 |
|\ \ | |/ | |||||
| * | [prep-release-3.2.8] Update changelog for 3.2.8-RC1 | Marc Alexander | 2019-08-17 | 1 | -0/+75 |
| | | |||||
* | | [ticket/16052] Update version numbers to 3.3 | Marc Alexander | 2019-05-11 | 1 | -3/+3 |
|/ | | | | PHPBB3-16052 | ||||
* | [prep-release-3.2.7] Add changelog for 3.2.7-RC1 | Marc Alexander | 2019-05-02 | 1 | -0/+14 |
| | |||||
* | [prep-release-3.2.6] Update Changelog and add missing preg_match | Marc Alexander | 2019-04-28 | 1 | -1/+1 |
| | |||||
* | [prep-release-3.2.6] Update changelog for 3.2.6 | Marc Alexander | 2019-04-28 | 1 | -0/+18 |
| | |||||
* | [prep-release-3.2.6] Update changelog for 3.2.6-RC1 | Marc Alexander | 2019-04-20 | 1 | -0/+65 |
| | |||||
* | [prep-release-3.2.5] Update changelog for 3.2.5 | Marc Alexander | 2018-12-19 | 1 | -0/+13 |
| | |||||
* | [prep-release-3.2.5] Update changelog for 3.2.5-RC1 | Marc Alexander | 2018-11-29 | 1 | -0/+23 |
| | |||||
* | [prep-release-3.2.4] Update changelog for 3.2.4 release | Marc Alexander | 2018-11-10 | 1 | -0/+11 |
| | |||||
* | [prep-release-3.2.4] Update changelog for 3.2.4-RC1 | Marc Alexander | 2018-10-28 | 1 | -0/+113 |
| | |||||
* | [prep-release-3.2.3] Update changelog with changes after 3.2.3-RC2 | Marc Alexander | 2018-09-09 | 1 | -0/+11 |
| | |||||
* | [prep-release-3.2.3] Update changelog for 3.2.3-RC2 | Marc Alexander | 2018-07-30 | 1 | -0/+24 |
| | |||||
* | [prep-release-3.2.3] Update changelog after merging PR | Marc Alexander | 2018-03-26 | 1 | -0/+1 |
| | |||||
* | [prep-release-3.2.3] Update changelog for 3.2.3-RC1 | Marc Alexander | 2018-02-28 | 1 | -0/+56 |
| | |||||
* | Merge branch 'prep-release-3.1.12' into prep-release-3.2.2 | Marc Alexander | 2018-01-07 | 1 | -0/+4 |
|\ | |||||
| * | [prep-release-3.1.12] Update changelog | Marc Alexander | 2018-01-07 | 1 | -0/+4 |
| | | |||||
* | | [prep-release-3.2.2] Update changelog for 3.2.2 release | Marc Alexander | 2018-01-07 | 1 | -0/+8 |
| | | |||||
* | | Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into ↵ | Marc Alexander | 2018-01-07 | 1 | -0/+44 |
|\ \ | |/ | | | | | prep-release-3.2.2 | ||||
| * | [prep-release-3.1.12] Update changelog for 3.1.12 | Marc Alexander | 2017-12-31 | 1 | -0/+44 |
| | | |||||
* | | [prep-release-3.2.2] Update changelog for 3.2.2-RC1 | Marc Alexander | 2017-12-28 | 1 | -0/+132 |
| | | |||||
* | | [prep-release-3.2.1] Add changelog since 3.2.0 | Marc Alexander | 2017-06-25 | 1 | -0/+108 |
| | | |||||
* | | Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 | Marc Alexander | 2017-06-25 | 1 | -0/+145 |
|\ \ | |/ | |||||
| * | [prep-release-3.1.11] Update changelog | Marc Alexander | 2017-06-25 | 1 | -0/+1 |
| | | |||||
| * | [prep-release-3.1.11] Update changelog for 3.1.11-RC1 | Marc Alexander | 2017-06-25 | 1 | -0/+144 |
| | | |||||
* | | [prep-release-3.2.0-RC2] Update changelog | Marc Alexander | 2016-12-09 | 1 | -0/+4 |
| | | |||||
* | | [prep-release-3.2.0-RC2] Update changelog | Marc Alexander | 2016-12-09 | 1 | -0/+77 |
| | | |||||
* | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-09-24 | 1 | -1/+83 |
|\ \ | |/ | |||||
| * | [prep-release-3.1.10] Add changelog for 3.1.10-RC1 | Marc Alexander | 2016-09-24 | 1 | -1/+83 |
| | | |||||
* | | [prep-release-3.2.0-RC1] Update changelog | Tristan Darricau | 2016-06-19 | 1 | -0/+55 |
| | | |||||
* | | [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea | Crizzo | 2016-05-01 | 1 | -3/+3 |
| | | | | | | | | PHPBB3-14619 | ||||
* | | Merge branch 'prep-release-3.2.0-b2' into 3.2.x | Tristan Darricau | 2016-04-28 | 1 | -1/+33 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.2.0-b2: [prep-release-3.2.0-b2] Add schema.json [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2 [prep-release-3.2.0-b2] Add migration for 3.2.0-b2 [prep-release-3.2.0-b2] Update version to 3.2.0-b2 | ||||
| * | | [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2 | Tristan Darricau | 2016-03-03 | 1 | -1/+33 |
| | | | |||||
* | | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-04-09 | 1 | -0/+63 |
|\ \ \ | | |/ | |/| | |||||
| * | | [prep-release-3.1.9] Add changelog for 3.1.9-RC1 | Joas Schilling | 2016-04-09 | 1 | -1/+64 |
| | | | |||||
* | | | Merge branch 'ticket/14136' into ticket/14136-3.2.x | Marc Alexander | 2016-03-24 | 1 | -0/+1 |
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | Conflicts: phpBB/adm/style/install_update_diff.html phpBB/adm/style/installer_header.html phpBB/install/database_update.php phpBB/install/index.php phpBB/styles/subsilver2/template/overall_header.html phpBB/styles/subsilver2/template/simple_header.html phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html | ||||
| * | [ticket/14136] Add back X-UA-Compatible meta tag | Marc Alexander | 2016-03-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | This was previously removed without needing to. Adding it back to force users to not emulate the page for previous versions of IE. The imagetoolbar http-equiv tag was not restored as IE does not contain that anymore since IE7. Also, the chome=1 has been removed from the X-UA-Compatible content as ChromeFrame does not receive any further updates since 2014 and is potentially broken. PHPBB3-14136 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-02-13 | 1 | -1/+38 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/constants.php phpBB/includes/functions_user.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg | ||||
| * | [prep-release-3.1.8] Update changelog | Joas Schilling | 2016-02-13 | 1 | -0/+2 |
| | | |||||
| * | [prep-release-3.1.8] Add changelog for 3.1.8-RC1 | Joas Schilling | 2016-02-13 | 1 | -1/+36 |
| | | |||||
* | | [prep-release-3.2.0-b1] Add changelog for 3.2.0-b1 | Tristan Darricau | 2016-02-05 | 1 | -1/+49 |
| | | |||||
* | | Merge branch '3.1.x' | Joas Schilling | 2016-01-09 | 1 | -0/+12 |
|\ \ | |/ | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/acp/acp_bbcodes.php | ||||
| * | [prep-release-3.1.7] Add changelog for 3.1.7-pl1 | Joas Schilling | 2016-01-09 | 1 | -0/+12 |
| | |