Marc Alexander
164f0e031d
Merge branch '3.1.x' into 3.2.x
2016-09-24 21:45:17 +02:00
Marc Alexander
7d73d1ff83
[prep-release-3.1.10] Add changelog for 3.1.10-RC1
2016-09-24 14:57:23 +02:00
Tristan Darricau
e8c6a3aa0a
[prep-release-3.2.0-RC1] Update changelog
2016-06-19 18:01:48 +02:00
Crizzo
e9b7cb1324
[ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea
...
PHPBB3-14619
2016-05-01 22:31:39 +02:00
Tristan Darricau
829a8ac15a
Merge branch 'prep-release-3.2.0-b2' into 3.2.x
...
* 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
2016-04-28 21:58:16 +02:00
Joas Schilling
d89b75bd36
Merge branch '3.1.x' into 3.2.x
2016-04-09 19:53:39 +02:00
Joas Schilling
e7043dc044
[prep-release-3.1.9] Add changelog for 3.1.9-RC1
2016-04-09 08:19:34 +02:00
Marc Alexander
2e3f89444a
Merge branch 'ticket/14136' into ticket/14136-3.2.x
...
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
2016-03-24 16:12:56 +01:00
Marc Alexander
244d171cb0
[ticket/14136] Add back X-UA-Compatible meta tag
...
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
2016-03-24 16:07:07 +01:00
Tristan Darricau
97bf5e8a8d
[prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
2016-03-03 22:54:13 +01:00
Joas Schilling
8663edce76
Merge branch '3.1.x' into 3.2.x
...
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
2016-02-13 18:08:01 +01:00
Joas Schilling
cafd165bd0
[prep-release-3.1.8] Update changelog
2016-02-13 16:45:51 +01:00
Joas Schilling
e63493115a
[prep-release-3.1.8] Add changelog for 3.1.8-RC1
2016-02-13 14:57:53 +01:00
Tristan Darricau
3e0aa1b3a4
[prep-release-3.2.0-b1] Add changelog for 3.2.0-b1
2016-02-05 15:56:28 +01:00
Joas Schilling
7f7b09fdeb
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/acp/acp_bbcodes.php
2016-01-09 18:45:32 +01:00
Joas Schilling
85e98a9d70
[prep-release-3.1.7] Add changelog for 3.1.7-pl1
2016-01-09 09:46:32 +01:00
Tristan Darricau
7381e99517
[prep-release-3.2.0-a2] Add changelog for 3.2.0-a2
2015-12-19 17:17:01 +01:00
Joas Schilling
b2a26ab5f4
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
2015-12-12 15:24:29 +01:00
Joas Schilling
099a1b5f75
[prep-release-3.1.7] Add changelog for 3.1.7-RC1
2015-12-12 01:37:56 +01:00
Tristan Darricau
67f43b1a06
[prep-release-3.2.0-a1] Add changelog for 3.2.0-a1
2015-11-09 20:24:46 +01:00
Joas Schilling
5be06ec66a
[prep-release-3.1.6] Add changelog for 3.1.6-RC1
2015-08-23 17:20:22 +02:00
Matt Friedman
6294c45bd3
[ticket/13995] Remove invalid name element from anchors in Docs
...
PHPBB3-13995
2015-07-07 20:09:47 -07:00
Matt Friedman
498a516017
[ticket/13995] Remove deprecated projection media type
...
PHPBB3-13995
2015-07-07 20:09:01 -07:00
Joas Schilling
38a1442d40
[prep-release-3.1.5] Update version for final 3.1.5 release
2015-06-14 16:11:22 +02:00
Joas Schilling
790f7ded5b
[prep-release-3.1.5] Add changelog for 3.1.5-RC1
2015-06-09 20:45:37 +02:00
Joas Schilling
005c27e73d
[prep-release-3.1.4] Add security issue to changelog
2015-05-03 17:14:55 +02:00
Andreas Fischer
dde72c58b0
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* prep-release-3.0.14:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-05-03 16:39:51 +02:00
Andreas Fischer
11242dd07d
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
2015-05-03 16:22:28 +02:00
Andreas Fischer
969718fc91
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* prep-release-3.0.14:
[3.0.x] Add changelog for 3.0.14 release.
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
2015-04-28 21:40:23 +02:00
Andreas Fischer
d833f29069
[3.0.x] Add changelog for 3.0.14 release.
2015-04-28 18:57:03 +02:00
Joas Schilling
073f3e4470
[prep-release-3.1.4] Add changelog for 3.1.4-RC1
2015-04-09 21:11:08 +02:00
Cesar G
a07b29c1df
[ticket/12599] Place standalone text in a box.
...
PHPBB3-12599
2015-02-25 20:08:03 -08:00
Cesar G
14fecb2f02
[ticket/12599] Move images to assets/ and update the phpBB logo.
...
PHPBB3-12599
2015-02-25 20:02:06 -08:00
Cesar G
4565cac049
[ticket/12599] Move documentation stylesheet to assets directory.
...
PHPBB3-12599
2015-02-25 20:01:53 -08:00
Cesar G
e29e0e5018
[ticket/12599] Remove corner images from documentation style.
...
PHPBB3-12599
2015-02-25 20:01:25 -08:00
Joas Schilling
be30d8251a
[prep-release-3.1.3] Add changelog for 3.1.3-RC2
2015-01-31 01:08:29 +01:00
Andreas Fischer
b6786f8ba1
Merge branch 'prep-release-3.0.13' into prep-release-3.1.3
...
* prep-release-3.0.13:
[prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
[prep-release-3.0.13] Also update version in references to files.
[prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
[prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
[prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
[ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
[ticket/12933] Handle case when * is last character of word
[ticket/13554] Show feature release upgrades in blue rather than red.
Conflicts:
build/build.xml
phpBB/adm/style/acp_update.html
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/includes/startup.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
tests/security/trailing_path_test.php
2015-01-30 13:34:40 +01:00
Andreas Fischer
5f237a0426
[prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
2015-01-30 01:32:34 +01:00
Andreas Fischer
5fea945b5b
[prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
2015-01-29 23:27:12 +01:00
Andreas Fischer
208923563e
[prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
2015-01-29 23:16:34 +01:00
Joas Schilling
b2b5addd09
[prep-release-3.1.3] Add changelog for 3.1.3-RC1
2015-01-26 20:09:46 +01:00
Joas Schilling
513b2f8296
[prep-release-3.1.3] Prepare Changelog
2015-01-26 20:00:11 +01:00
Nils Adermann
1c6ebcf02b
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[prep-release-3.0.13] Bump version numbers for 3.0.13 release
[prep-release-3.0.13] Highlight security relevant changes
Conflicts:
build/build.xml
phpBB/install/database_update.php
2015-01-26 19:01:34 +01:00
Nils Adermann
4b42589cfa
[prep-release-3.0.13] Highlight security relevant changes
2015-01-26 17:53:43 +01:00
Andreas Fischer
7ed065a630
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[develop-olympus] Increment version number to 3.0.14-dev.
[develop-olympus] Add changelog for 3.0.13 release.
[develop-olympus] Bump version numbers for 3.0.13-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.13 releases.
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
2015-01-21 16:07:12 +01:00
Andreas Fischer
2c9e178a42
[develop-olympus] Add changelog for 3.0.13 release.
2015-01-21 01:45:23 +01:00
Joas Schilling
9264d7c758
[prep-release-3.1.2] Update Changelog with 13376
2014-11-25 15:44:39 +01:00
Joas Schilling
5f3dffa820
[prep-release-3.1.2] Add changelog for 3.1.2-RC1
2014-11-22 19:35:24 +01:00
Joas Schilling
18d5ca9ce5
[prep-release-3.1.2] Prepare Changelog
2014-11-22 19:32:36 +01:00
Nils Adermann
aede89d408
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
2014-11-02 00:20:44 +01:00
