aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-04-031-0/+7
|\ | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/overall_header.html
| * Merge pull request #3467 from dragosvr92/patch-5Marc Alexander2015-04-031-0/+8
| |\ | | | | | | | | | [ticket/13602] Adding a new event overall_header_navbar_before
| | * [ticket/13602] Adding event overall_header_navbar_beforeDragos-Valentin Radulescu2015-03-061-0/+8
| | | | | | | | | | | | PHPBB3-13602
* | | Merge branch '3.1.x'Oliver Schramm2015-03-251-1/+2
|\ \ \ | |/ /
| * | [ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31xNicofuma2015-03-251-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/AUTHORS PHPBB3-13723
| | * | [ticket/13723] Add Elsensee to authors listNicofuma2015-03-251-1/+2
| | | | | | | | | | | | | | | | PHPBB3-13723
* | | | Merge branch '3.1.x'Marc Alexander2015-03-101-0/+7
|\ \ \ \ | |/ / /
| * | | [ticket/13679] Add template event overall_header_searchbox_beforen-aleha2015-03-081-0/+7
| | | | | | | | | | | | | | | | PHPBB3-13679
* | | | Merge branch '3.1.x'Marc Alexander2015-03-061-0/+21
|\ \ \ \ | |/ / /
| * | | Merge pull request #3473 from RMcGirr83/ticket/13675Marc Alexander2015-03-061-0/+21
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13675] Add validate to acp_profile event and add template events
| | * | | [ticket/13675] Add validate to acp_profile event and add template eventsRichard McGirr2015-03-061-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for acp users profile PHPBB3-13675
* | | | | Merge branch '3.1.x'Marc Alexander2015-02-271-0/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | | Merge pull request #3451 from RMcGirr83/ticket/13510Marc Alexander2015-02-271-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13510] Add template even viewtopic_body_pagination_after
| | * | | | [ticket/13510] Add template even viewtopic_body_pagination_afterRMcGirr832015-02-261-0/+8
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13510
* | | | | Merge branch '3.1.x'Joas Schilling2015-02-2615-392/+385
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2992 from prototech/ticket/12599Joas Schilling2015-02-2615-392/+385
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/12599] Update documentation style
| | * | | [ticket/12599] Remove empty line at end of code boxes.Cesar G2015-02-252-200/+199
| | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | [ticket/12599] Place standalone text in a box.Cesar G2015-02-257-9/+33
| | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | [ticket/12599] Get the font sizes under control.Cesar G2015-02-251-3/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | [ticket/12599] Add padding on the sides of the inline code boxes.Cesar G2015-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | [ticket/12599] Use the back to top icon instead of text.Cesar G2015-02-252-3/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | [ticket/12599] Move images to assets/ and update the phpBB logo.Cesar G2015-02-2510-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | [ticket/12599] Move documentation stylesheet to assets directory.Cesar G2015-02-257-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | [ticket/12599] Remove corner images from documentation style.Cesar G2015-02-2511-164/+118
| | | | | | | | | | | | | | | | | | | | PHPBB3-12599
* | | | | Merge branch '3.1.x'Joas Schilling2015-02-201-0/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/search_results.html
| * | | | Merge branch 'Wolfsblvt-ticket/13533' into 3.1.xJoas Schilling2015-02-201-0/+24
| |\ \ \ \
| | * | | | [ticket/13533] Add template core event to search resultsWolfsblvt2015-02-201-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13533
* | | | | | Merge branch '3.1.x'Marc Alexander2015-02-181-0/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_profile_profile_info.html phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
| * | | | | [ticket/13628] Allow ability for extension to add entries to user's profileRMcGirr832015-02-181-0/+32
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-13628
* | | | | [ticket/13407] Bump minimal version to php 5.3.9Nicofuma2015-02-042-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13407
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-021-0/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | | Merge pull request #3302 from rxu/ticket/13512Joas Schilling2015-02-021-0/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13512] Add template events before/after the post details
| | * | | | [ticket/13512] Add template events before/after the post detailsrxu2015-01-171-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template events to viewtopic_body.html to allow extensions adding content before/after the post details. PHPBB3-13512
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-311-0/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | | | [prep-release-3.1.3] Add changelog for 3.1.3-RC2Joas Schilling2015-01-311-0/+15
| | | | | |
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-301-43/+51
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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. Conflicts: build/build.xml
| * | | | | Merge branch 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-301-43/+51
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.Andreas Fischer2015-01-301-2/+2
| | | | | |
| | * | | | [prep-release-3.0.13] Also update version in references to files.Andreas Fischer2015-01-291-3/+3
| | | | | |
| | * | | | [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.Andreas Fischer2015-01-291-0/+10
| | | | | |
| | * | | | [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.Andreas Fischer2015-01-291-24/+24
| | | | | |
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-301-38/+137
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13553] Add a method to the controller helper to display a message [prep-release-3.1.3] Add changelog for 3.1.3-RC1 [prep-release-3.1.3] Prepare Changelog [prep-release-3.1.3] Add migration for 3.1.3-RC1 [prep-release-3.1.3] Update version to 3.1.2-RC1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | | [prep-release-3.1.3] Add changelog for 3.1.3-RC1Joas Schilling2015-01-261-0/+96
| | | | | |
| * | | | | [prep-release-3.1.3] Prepare ChangelogJoas Schilling2015-01-261-38/+41
| | | | | |
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2015-01-261-2/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes
| * | | | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-261-2/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | [prep-release-3.0.13] Highlight security relevant changesNils Adermann2015-01-261-2/+5
| | | | | |
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-212-29/+164
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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.
| * | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-212-29/+164
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | [develop-olympus] Add changelog for 3.0.13 release.Andreas Fischer2015-01-211-28/+162
| | | | |