aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | [ticket/11753] Remove ?> from MySQL Upgrader.Andreas Fischer2013-07-301-2/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11753
| | * | | [ticket/11753] Update MySQL upgrader schema data.Andreas Fischer2013-07-301-0/+19
| | | |/ | | |/| | | | | | | | | PHPBB3-11753
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
| * | | Merge remote-tracking branch 'bantu/ticket/11524' into prep-release-3.0.12Joas Schilling2013-07-301-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11524: [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
| | * | | [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"Andreas Fischer2013-07-301-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | ... on PHP 5.4 or higher. PHPBB3-11524
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11752] HTTP -> HTTPs in email/installed.txt
| * | | [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| |/ / | | | | | | | | | PHPBB3-11752
* | | [ticket/10917] Variable used only once so delete itOliver Schramm2013-07-281-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable $this->unequal_version was only used once and only to display the version the package updates to. To display the version it updates to makes no sense when the update files just aren't meant to update from the current version. (It's already shown in an error message) So I deleted the variable from there. Furthermore the use of version_compare makes the variable useless in that context which is why I deleted the variable from the whole file and replaced it in the relevant if statement with the old comparison. PHPBB3-10917
* | | [ticket/10917] Revert use of phpbb wrapperOliver Schramm2013-07-271-1/+1
| | | | | | | | | | | | PHPBB3-10917
* | | Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into ↵Nathaniel Guse2013-07-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Oliver Schramm # Via Oliver Schramm * remotes/Elsensee/ticket/10917: [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
| * | | [ticket/10917] Using phpbb wrapperOliver Schramm2013-07-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10917
| * | | [ticket/10917] Fixed notice that files are out of date when updating to an ↵Oliver Schramm2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | unreleased version PHPBB3-10917
* | | | Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into ↵Nathaniel Guse2013-07-251-1/+8
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Oliver Schramm # Via Oliver Schramm * remotes/Elsensee/ticket/11062: [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided
| * | | [ticket/11062] If user's language is english there is no further work neededOliver Schramm2013-07-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11062
| * | | [ticket/11062] Load new strings from user's language file if providedOliver Schramm2013-07-251-0/+7
| |/ / | | | | | | | | | PHPBB3-11062
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-251-1/+1
|\ \ \ | |/ / |/| / | |/ | | * prep-release-3.0.12: [ticket/11740] Update FAQ to include Ideas Centre
| * [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
| | | | | | | | PHPBB3-11740
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-221-3/+6
|\ \ | |/ | | | | | | | | * prep-release-3.0.12: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| * Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into ↵Andreas Fischer2013-07-221-3/+6
| |\ | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * marc1706/ticket/11720-prep-release: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| | * [ticket/11720] Do not call $captcha->validate if $captcha is not setMarc Alexander2013-07-211-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11566 changed big parts of code. Unfortunately, a call to $captcha->validate was added that is being called even if $captcha hasn't been initialized. This change will fix this issue. PHPBB3-11720
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-131-0/+3
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] More changelog items for the 3.0.12 release.
| * | [prep-release-3.0.12] More changelog items for the 3.0.12 release.Andreas Fischer2013-07-131-0/+3
| | |
* | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-1315-44/+44
|\ \ \ | |/ / | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
| * | Merge remote-tracking branch 'github-marc1706/ticket/11112' into ↵Nils Adermann2013-07-1315-44/+44
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * github-marc1706/ticket/11112: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
| | * | [ticket/11112] Do not change opensource.org link to httpsMarc Alexander2013-07-121-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11112
| | * | [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-1215-44/+44
| | |/ | | | | | | | | | PHPBB3-11112
* | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.0.12: [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
| * | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
| | | | | | | | | | | | PHPBB3-11670
* | | Merge branch 'prep-release-3.0.12' into develop-olympusNathaniel Guse2013-07-132-54/+115
|\ \ \ | |/ / | | | | | | | | | | | | | | | # By Nathaniel Guse (1) and Nils Adermann (1) * prep-release-3.0.12: [ticket/11671] Update composer.lock [ticket/11671] Add phing as a dependency and upgrade deps
| * | [ticket/11671] Update composer.lockNathaniel Guse2013-07-131-0/+4
| | | | | | | | | | | | PHPBB3-11671
| * | [ticket/11671] Add phing as a dependency and upgrade depsNils Adermann2013-07-122-58/+115
| |/ | | | | | | PHPBB3-11671
* | [develop-olympus] Increment version number to 3.0.13-dev.Andreas Fischer2013-07-123-3/+3
|/
* [develop-olympus] Add changelog for 3.0.12 release.Andreas Fischer2013-07-121-20/+165
|
* [develop-olympus] Bump version numbers for 3.0.12-RC1 release.Andreas Fischer2013-07-123-5/+5
|
* [develop-olympus] Bumping version numbers to final for 3.0.12 releases.Andreas Fischer2013-07-1210-12/+12
|
* [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-121-1/+2
| | | | | | | | The array_map was only ran on small parts of the actual error array instead of the whole one. This resulted in the output of the language variables' names rather than their actual value. PHPBB3-11548
* [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-124-6/+6
| | | | PHPBB3-11662
* Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-07-1120-104/+248
|\ | | | | | | ticket/11548
| * Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into ↵Nathaniel Guse2013-07-111-1/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/10772: [ticket/10772] Remove unnecessary comment [ticket/10772] Functional tests for forum style [ticket/10772] Use forum specific style for trigger_error
| | * [ticket/10772] Remove unnecessary commentVjacheslav Trushkin2013-05-161-1/+0
| | | | | | | | | | | | PHPBB3-10772
| | * [ticket/10772] Use forum specific style for trigger_errorVjacheslav Trushkin2013-05-111-1/+9
| | | | | | | | | | | | PHPBB3-10772
| * | Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-113-4/+43
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/8319: [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
| | * | [ticket/8319] Do not repeat the replacementJoas Schilling2013-07-101-9/+5
| | | | | | | | | | | | | | | | PHPBB3-8319
| | * | [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-032-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | The explanation now states that links are prefixed with the board URL. PHPBB3-8319
| | * | [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on updateJoas Schilling2013-06-031-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To fix http://tracker.phpbb.com/browse/PHPBB3-8319 we changed the second_pass_replace value, so that needs updating for existing ones. PHPBB3-8319
| | * | [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL partsJoas Schilling2013-06-031-0/+4
| | | | | | | | | | | | | | | | PHPBB3-8319
| | * | [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuseJoas Schilling2013-06-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The description says: "The URL must be relative to the topic page and cannot contain a server name or protocol." We now enforce this and will add a new token with the current behaviour back. PHPBB3-8319
| * | | [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.Andreas Fischer2013-07-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11619
| * | | [ticket/11617] Remove spaces and tabs from empty linesMatt Friedman2013-07-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11617
| * | | [ticket/11617] Missing U_ACTION in acp_captcha.phpMatt Friedman2013-07-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-11617 PHPBB3-11617