aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-111-0/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * | | | Merge pull request #4371 from imkingdavid/ticket/14695Marc Alexander2016-09-111-0/+16
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/14695] Add posting_editor_subject_prepend/append template events
| | * | | [ticket/14695] Add posting_editor_subject_append/prepend subsilver2 to events.mdDavid King2016-08-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | As per request in PR. PHPBB3-14695
| | * | | [ticket/14695] Updated version number in events.mdDavid King2016-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14695
| | * | | [ticket/14695] Add posting_editor_subject_prepend/append template eventsDavid King2016-06-251-0/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-14695
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-281-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4338 from Senky/ticket/14469Marc Alexander2016-08-281-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Add viewforum_body_topicrow_before template event
| | * | | | [ticket/14469] Add viewforum_body_topicrow_before template eventJakub Senko2016-08-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14469
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-281-0/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4389 from kasimi/ticket/14715-3.1.xMarc Alexander2016-08-281-0/+32
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14715] Add template events in posting_topic_review & mcp_topic
| | * | | | | [ticket/14715] Converted tabs to spaceskasimi2016-07-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14715
| | * | | | | [ticket/14715] Fixed typos in events.mdkasimi2016-07-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14715
| | * | | | | [ticket/14715] Add template events in posting_topic_review & mcp_topickasimi2016-07-211-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The events will allow adding content before and after the post details in topic review and topic moderation. PHPBB3-14715
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-031-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_email.html
| * | | | | Merge pull request #4324 from Senky/ticket/14516Marc Alexander2016-08-031-0/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/14516] Add memberlist_email_before event
| | * | | | [ticket/14516] Add memberlist_email_before eventJakub Senko2016-07-171-0/+8
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-14516
* | | | | Merge pull request #4311 from Crizz0/ticket/14620Marc Alexander2016-07-173-31/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14620] Change docs/ and files to 3.2.x
| * | | | | [ticket/14620] Adds link to Translations forumCrizzo2016-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | [ticket/14620] Changes specific update-support to general: <=beta to >=RC1Crizzo2016-06-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | [ticket/14620] Adds section update from 3.0/3.1 to 3.2Crizzo2016-06-081-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | [ticket/14620] Adds2.0 to 3.2. convert; performend convert; still up2dateCrizzo2016-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | [ticket/14620] Updates section 4.i. Full package to 3.2.0Crizzo2016-06-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | [ticket/14620] Section "Patch file"/"Auto update" was updated in INSTALL.htmlCrizzo2016-05-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | [ticket/14620] Changes 3.1 to 3.2 links in FAQ.htmlCrizzo2016-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | [ticket/14620] Readme.html installing phpBB, 2.i, 3.i, 5. and issuesCrizzo2016-05-141-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | [ticket/14620] Start to change install.html to 3.2.0 usage.Crizzo2016-05-021-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
* | | | | | [ticket/14506] Remove subsilver2 from docs/events.mdMarc Alexander2016-07-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14506
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-161-0/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_move.html
| * | | | | Merge pull request #4337 from Senky/ticket/14506Marc Alexander2016-07-161-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add mcp_move_before template event
| | * | | | | [ticket/14506] Add mcp_move_before template eventJakub Senko2016-05-291-0/+8
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-14506
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-071-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php
| * | | | | Merge pull request #4342 from Senky/ticket/14654Marc Alexander2016-07-071-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/14654] Change Imagemagick to ImageMagick
| | * | | | [ticket/14654] Change Imagemagick to ImageMagickJakub Senko2016-06-111-1/+1
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-14654
* | | | | Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.xTristan Darricau2016-06-271-0/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/prep-release-3.2.0-RC1: [prep-release-3.2.0-RC1] Update changelog [prep-release-3.2.0-RC1] Add migration [prep-release-3.2.0-RC1] Update schema.json [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
| * | | | | [prep-release-3.2.0-RC1] Update changelogTristan Darricau2016-06-191-0/+55
| | | | | |
* | | | | | Merge pull request #4233 from VSEphpbb/ticket/14547Marc Alexander2016-06-201-0/+123
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14547] Add Vagrant support to phpBB
| * | | | | | [ticket/14547] Fix Docs and increase PHP memory limitMatt Friedman2016-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547
| * | | | | | [ticket/14547] Use package compatible with phpBB requirementsMatt Friedman2016-04-281-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547
| * | | | | | [ticket/14547] Add Vagrant to phpBBMatt Friedman2016-04-281-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html phpBB/styles/subsilver2/template/mcp_forum.html phpBB/styles/subsilver2/template/search_results.html phpBB/styles/subsilver2/template/viewforum_body.html
| * | | | | [ticket/14672] Change event name add to events.mdRichard McGirr2016-06-131-0/+12
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-14672
* | | | | [ticket/14595] Added smtp_port where places where smtp_host exists.Derek Held2016-05-141-0/+1
| |_|/ / |/| | | | | | | | | | | PHPBB3-14595
* | | | [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rheaCrizzo2016-05-014-23/+23
| | | | | | | | | | | | | | | | PHPBB3-14619
* | | | Merge branch 'prep-release-3.2.0-b2' into 3.2.xTristan Darricau2016-04-281-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-b2Tristan Darricau2016-03-031-1/+33
| | | |
* | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-04-091-0/+63
|\ \ \ \ | | |/ / | |/| |
| * | | [prep-release-3.1.9] Add changelog for 3.1.9-RC1Joas Schilling2016-04-091-1/+64
| | | |
* | | | [ticket/14495] Specify correct version numbers in 3.2.xMarc Alexander2016-04-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT apply these changes into master when merging it. This means that you'll have to checkout the latest files from upstream after merging this into master (possibly while resolving likely merge conflicts). PHPBB3-14495
* | | | Merge pull request #4193 from marc1706/ticket/14497Tristan Darricau2016-03-251-1/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14497] Support second app.php script in install folder * marc1706/ticket/14497: [ticket/14497] Do not check for doctype on index and use correct return [ticket/14497] Add test for visiting installer [ticket/14497] Use nginx sample config in travis tests [ticket/14497] Support second app.php script in install folder
| * | | | [ticket/14497] Support second app.php script in install folderMarc Alexander2016-02-251-1/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-14497