aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Merge pull request #2868 from rxu/ticket/12969Marc Alexander2014-09-051-0/+16
| |\ \ | | | | | | | | | | | | [ticket/12969] Add template events around username link on composing pm
| | * | [ticket/12969] Add template events around username link on composing pmrxu2014-09-021-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template event before/after find username link on composing pm to allow extensions perform additional actions on user finding. PHPBB3-12969
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-011-0/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_warn_post.html phpBB/styles/subsilver2/template/mcp_warn_user.html
| * | | Merge pull request #2887 from Pico/ticket/12991Marc Alexander2014-09-011-0/+32
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12991] Have events after/before "add warning" field - user and post
| | * | | [ticket/12991] Correct language mistakesPico2014-08-301-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12991
| | * | | [ticket/12991] Have events after/before "add warning" field - user and postPico882014-08-171-0/+32
| | | | | | | | | | | | | | | | | | | | PHPBB3-12991
* | | | | [ticket/13024] Fix event file (remove subsilver references)Tristan Darricau2014-09-011-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13024
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-311-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | | [ticket/13024] Add template event viewtopic_body_postrow_post_content_footerTristan Darricau2014-08-301-0/+8
| |/ / / | | | | | | | | | | | | PHPBB3-13024
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-121-32/+157
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 [prep-release-3.1.0-RC3] Prepare Changelog [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 Conflicts: phpBB/styles/subsilver2/style.cfg
| * | | [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3Joas Schilling2014-08-111-0/+122
| | | |
| * | | [prep-release-3.1.0-RC3] Prepare ChangelogJoas Schilling2014-08-111-32/+35
| |/ /
* | | [ticket/12958] Remove more references of subsilver2Joas Schilling2014-08-102-119/+2
|/ / | | | | | | PHPBB3-12958
* | [ticket/12535] Update events.md to RC3PayBas2014-08-071-4/+4
| | | | | | | | PHPBB3-12535
* | [ticket/12535] Make <a> adjust to the image widthPayBas2014-08-071-0/+30
| | | | | | | | PHPBB3-12535
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12776' into ↵Nils Adermann2014-08-071-4/+39
|\ \ | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12776: [ticket/12776] Add section about 3.0.x to 3.1.x update to INSTALL.html
| * | [ticket/12776] Add section about 3.0.x to 3.1.x update to INSTALL.htmlJoas Schilling2014-08-071-4/+39
| | | | | | | | | | | | PHPBB3-12776
* | | Merge pull request #2720 from PayBas/ticket/12838Joas Schilling2014-08-071-0/+44
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12838] Add ACP events to acp_ranks * PayBas/ticket/12838: [ticket/12838] Simplify normal special rank array creation [ticket/12838] Update RC2 to RC3 [ticket/12838] Update events.md to RC3 [ticket/12838] Allow for extra columns in cache obtain_ranks() [ticket/12838] Add raw row-data to acp_ranks core event [ticket/12838] Simplify special rank template conditional [ticket/12838] Add core events to acp_ranks.php [ticket/12838] Update events.md [ticket/12838] Add _before versions [ticket/12838] Add template events to acp_ranks.html