aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developCesar G2014-11-181-0/+7
|\ | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13023] Add template event posting_editor_buttons_custom_tags_before Conflicts: phpBB/styles/subsilver2/template/posting_buttons.html
| * Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeusCesar G2014-11-181-0/+8
| |\ | | | | | | | | | | | | * Nicofuma/ticket/13023: [ticket/13023] Add template event posting_editor_buttons_custom_tags_before
| | * [ticket/13023] Add template event posting_editor_buttons_custom_tags_beforeTristan Darricau2014-11-161-0/+8
| | | | | | | | | | | | PHPBB3-13023
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-022-1/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13271] Disable CC sender feature for anonymous users [prep-release-3.1.1] Add 3.1.1 CHANGELOG [prep-release-3.1.1] Add 3.1.1 migration file [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class [ticket/13248] Use functional framework login method in tests [ticket/13248] Correctly pass provider name [ticket/13248] Always use provider collection for getting provider [ticket/13248] Allow specifying different auth provider in provider collection [ticket/13248] Use auth provider collection for getting provider [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 [ticket/13267] Update Automatic Update instructions to include vendor directory [ticket/13268] Properly append ternary result in get_existing_indexes() [prep-release-3.1.1] Update version number to 3.1.1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/memberlist_email.html
| * | [prep-release-3.1.1] Add 3.1.1 CHANGELOGNils Adermann2014-11-021-0/+19
| | |
| * | Merge branch 'ticket/13262' into prep-release-3.1.1Nils Adermann2014-11-011-2/+2
| |\ \ | | | | | | | | | | | | | | | | * ticket/13262: [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
| | * | [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1Matt Friedman2014-11-011-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13262
| * | | [ticket/13267] Update Automatic Update instructions to include vendor directoryPatrick Webster2014-11-011-1/+1
| |/ / | | | | | | | | | PHPBB3-13267
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-011-2/+2
|\ \ \
| * | | [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1Matt Friedman2014-10-311-2/+2
| |/ / | | | | | | | | | PHPBB3-13262
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-281-0/+10
|\ \ \ | |/ /
| * | [prep-release-3.1.0] Update changelog with final changesJoas Schilling2014-10-281-0/+10
| | |
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-261-0/+2
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0] Update CHANGELOG with last minute changes
| * | [prep-release-3.1.0] Update CHANGELOG with last minute changesNils Adermann2014-10-261-0/+2
| | |
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-251-0/+2
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0] Add missing CHANGELOG entries for RC6
| * | [prep-release-3.1.0] Add missing CHANGELOG entries for RC6Nils Adermann2014-10-251-0/+2
| | |
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-251-0/+16
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0] Add CHANGELOG for 3.1.0
| * | [prep-release-3.1.0] Add CHANGELOG for 3.1.0Nils Adermann2014-10-251-0/+16
| | |
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-251-34/+37
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13208] Add security issues to the final changelog [prep-release-3.1.0] Prepare Changelog [prep-release-3.1.0] Update version to 3.1.0 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.0] Prepare ChangelogJoas Schilling2014-10-231-34/+37
| | |
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-231-33/+71
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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.0-RC6] Add changelog for 3.1.0-RC6Joas Schilling2014-10-231-0/+35
| | |
| * | [prep-release-3.1.0-RC6] Prepare ChangelogJoas Schilling2014-10-231-33/+36
| | |
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-211-1/+1
|\ \ \ | |/ /
| * | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2014-10-211-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/AUTHORS
| | * | [ticket/12120] Remove EXreaction from active authorsJoas Schilling2014-10-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12120
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-201-1/+2
|\ \ \ \ | |/ / /
| * | | [ticket/13187] Fix HTML validity of INSTALL.htmlOliver Schramm2014-10-201-1/+2
| | | | | | | | | | | | | | | | PHPBB3-13187
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-204-46/+46
|\ \ \ \ | |/ / /
| * | | [ticket/12568] Fix awkward use of "phpBB Limited."Cesar G2014-10-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12568
| * | | [ticket/12568] The "Purge cache" option in the Customise tab no longer exists.Cesar G2014-10-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12568
| * | | [ticket/12568] Update GitHub link.Cesar G2014-10-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12568
| * | | [ticket/12568] Fix typo - "directorie" -> "directories"Cesar G2014-10-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12568
| * | | [ticket/12568] Remove various unnecessary references to phpBB3.Cesar G2014-10-164-35/+35
| | | | | | | | | | | | | | | | PHPBB3-12568
| * | | [ticket/12568] Update style installation instructions.Cesar G2014-10-161-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12568
| * | | [ticket/12568] Update path to language pack installation page.Cesar G2014-10-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12568
| * | | [ticket/12568] Replace modifications explanation with extensions.Cesar G2014-10-161-6/+6
| | | | | | | | | | | | | | | | PHPBB3-12568
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-071-32/+100
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.0-RC5] Add changelog for 3.1.0-RC5Joas Schilling2014-10-071-0/+65
| | | |
| * | | [prep-release-3.1.0-RC5] Prepare ChangelogJoas Schilling2014-10-071-32/+35
| | | |
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-061-0/+56
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewforum_body.html phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | [ticket/13025] Make RC uppercaseJakub Senko2014-10-041-8/+8
| | | | | | | | | | | | | | | | PHPBB3-13025
| * | | [ticket/13025] rc4 -> rc5Jakub Senko2014-10-031-8/+8
| | | | | | | | | | | | | | | | PHPBB3-13025
| * | | [ticket/13025] Add button template eventsJakub Senko2014-10-031-0/+64
| | | | | | | | | | | | | | | | PHPBB3-13025
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-0/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/forumlist_body.html
| * | | [ticket/13107] Add template events to forum row in forumlist_body.htmlrxu2014-09-271-0/+32
| | | | | | | | | | | | | | | | PHPBB3-13107
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-201-31/+122
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 [prep-release-3.1.0-RC4] Prepare Changelog [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 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.0-RC4] Add changelog for 3.1.0-RC4Joas Schilling2014-09-191-1/+89
| | | |
| * | | [prep-release-3.1.0-RC4] Prepare ChangelogJoas Schilling2014-09-191-31/+34
| | | |
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-051-0/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_header.html