aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [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
* | | | | Merge pull request #4245 from JoshyPHP/ticket/14381Tristan Darricau2016-03-251-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14381] Set the mode in message parser to "reparse" * JoshyPHP/ticket/14381: [ticket/14381] Set the mode in message parser to "reparse" [ticket/14495] Updates the version to 3.3.0-a1-dev
| * \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-291-0/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch '3.2.x'Marc Alexander2016-02-271-0/+42
| |\ \ \ \ \
| * | | | | | [ticket/14495] Updates the version to 3.3.0-a1-devTristan Darricau2016-02-241-4/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-14495
* | | | | | Merge branch 'ticket/14136' into ticket/14136-3.2.xMarc Alexander2016-03-246-0/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | [ticket/14136] Add back X-UA-Compatible meta tagMarc Alexander2016-03-246-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #4194 from Nicofuma/ticket/14499Marc Alexander2016-02-291-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | [ticket/14499] Add command to update the board from CLI
| * | | | [ticket/14499] Fix wording and commentsTristan Darricau2016-02-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14499
| * | | | [ticket/14499] Add missing config settingsTristan Darricau2016-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14499
| * | | | [ticket/14499] Add command to update the board from CLITristan Darricau2016-02-251-0/+2
| | |/ / | |/| | | | | | | | | | PHPBB3-14499
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-271-0/+42
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | Conflicts: phpBB/docs/events.md phpBB/styles/subsilver2/template/memberlist_view.html
| * | Merge pull request #4049 from rxu/ticket/14316Marc Alexander2016-02-271-0/+48
| |\ \ | | | | | | | | | | | | [ticket/14316] Add events before/after the custom/zebra fields in pfile view
| | * | [ticket/14316] Add events before/after the custom/zebra fields in profile viewrxu2016-02-271-0/+48
| | | | | | | | | | | | | | | | PHPBB3-14316
* | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-131-1/+38
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | [prep-release-3.1.8] Update changelogJoas Schilling2016-02-131-0/+2
| | | |
| * | | [prep-release-3.1.8] Add changelog for 3.1.8-RC1Joas Schilling2016-02-131-1/+36
| | | |
* | | | Merge branch '3.1.x'Tristan Darricau2016-02-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/14356] Fix viewtopic_body_postrow_back2top_append description
| * | | Merge pull request #4164 from rxu/ticket/14356-fixTristan Darricau2016-02-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14356] Fix viewtopic_body_postrow_back2top_append description * rxu/ticket/14356-fix: [ticket/14356] Fix viewtopic_body_postrow_back2top_append description
| | * | | [ticket/14356] Fix viewtopic_body_postrow_back2top_append descriptionrxu2016-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14356
* | | | | [prep-release-3.2.0-b1] Add changelog for 3.2.0-b1Tristan Darricau2016-02-051-1/+49
| | | | |