aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympusAndreas Fischer2013-08-182-2/+2
|\ | | | | | | | | * cyberalien/ticket/11789: [ticket/11789] Remove inline color in memberlist_view
| * [ticket/11789] Remove inline color in memberlist_viewVjacheslav Trushkin2013-08-182-2/+2
| | | | | | | | PHPBB3-11789
* | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympusAndreas Fischer2013-08-184-5/+13
|\ \ | |/ | | | | | | * cyberalien/ticket/11789: [ticket/11789] Remove colors from HTML code
| * [ticket/11789] Remove colors from HTML codeVjacheslav Trushkin2013-08-144-5/+13
| | | | | | | | PHPBB3-11789
* | [ticket/11794] Add missing array element commas to docs/coding-guidelines.htmlrechosen2013-08-161-10/+10
| | | | | | | | | | | | | | | | Even though the coding guidelines document prescribes "commas after every array element", it contains several example code fragments with array elements not terminated by a comma. This commit fixes that. PHPBB3-11794
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-151-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic
| * [ticket/11775] Fix error when moving the last post to another topicJoas Schilling2013-08-081-2/+2
| | | | | | | | PHPBB3-11775
| * Merge branch 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3 into ↵Andreas Fischer2013-08-012-4/+22
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data. [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'" [ticket/11752] HTTP -> HTTPs in email/installed.txt
* | | [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-031-2/+2
| | | | | | | | | | | | PHPBB3-11762
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-012-0/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.Andreas Fischer2013-08-011-0/+5
| | |
| * | [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.Andreas Fischer2013-08-013-3/+9
| | |
* | | Merge remote-tracking branch 'Elsensee/ticket/10037' into develop-olympusJoas Schilling2013-07-314-12/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/10037: [ticket/10037] Fix table in subsilver2 [ticket/10037] Apply attached patch with a few changes
| * | | [ticket/10037] Fix table in subsilver2Oliver Schramm2013-07-311-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | Thanks, nickvergessen! ;-) PHPBB3-10037
| * | | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-254-5/+41
| | | | | | | | | | | | | | | | PHPBB3-10037
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-2/+19
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data.
| * | | Merge remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12Joas Schilling2013-07-301-2/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11753: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data.
| | * | | [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
|
generated by cgit v1.2.1 (git 2.21.0) at 2025-05-03 18:44:17 +0000