aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
| | | | PHPBB3-11799
* Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-201-1/+1
|\ | | | | | | | | * prep-release-3.0.12: [ticket/11802] replace $browser with $user->browser
| * Merge remote-tracking branch 'dhruvgoel92/ticket/11802' into prep-release-3.0.12Andreas Fischer2013-08-201-1/+1
| |\ | | | | | | | | | | | | * dhruvgoel92/ticket/11802: [ticket/11802] replace $browser with $user->browser
| | * [ticket/11802] replace $browser with $user->browserDhruv2013-08-201-1/+1
| |/ | | | | | | PHPBB3-11802
* | Merge remote-tracking branch 'Prosk8er/ticket/11801' into develop-olympusAndreas Fischer2013-08-192-18/+18
|\ \ | | | | | | | | | | | | * Prosk8er/ticket/11801: [ticket/11801] removed some whitespace and added missing semi colon's in css
| * | [ticket/11801] removed some whitespace and added missing semi colon's in cssProsk8er2013-08-192-18/+18
|/ / | | | | | | PHPBB3-11801
* | 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
* | | Merge remote-tracking branch 'rechosen/ticket/11794' into develop-olympusAndreas Fischer2013-08-161-10/+10
|\ \ \ | | | | | | | | | | | | | | | | * rechosen/ticket/11794: [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
| * | | [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-154-103/+200
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | * 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
| * Merge remote-tracking branch 'nickvergessen/ticket/11775' into ↵Andreas Fischer2013-08-154-103/+200
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * nickvergessen/ticket/11775: [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 doc blocks syntaxJoas Schilling2013-08-151-1/+1
| | | | | | | | | | | | PHPBB3-11775
| | * [ticket/11775] Remove spaces at line endsJoas Schilling2013-08-151-4/+4
| | | | | | | | | | | | PHPBB3-11775
| | * [ticket/11775] Split test into multiple stepsJoas Schilling2013-08-121-1/+25
| | | | | | | | | | | | PHPBB3-11775
| | * [ticket/11775] Add functional test for moving the last postJoas Schilling2013-08-091-0/+43
| | | | | | | | | | | | PHPBB3-11775
| | * [ticket/11775] Backport moving of the posting functions to 3.0Joas Schilling2013-08-082-101/+131
| | | | | | | | | | | | PHPBB3-11775
| | * [ticket/11775] Fix error when moving the last post to another topicJoas Schilling2013-08-081-2/+2
| |/ | | | | | | PHPBB3-11775
* | Merge remote-tracking branch 's9e/ticket/11762' into develop-olympusJoas Schilling2013-08-032-2/+40
|\ \ | | | | | | | | | | | | | | | | | | * s9e/ticket/11762: [ticket/11762] Added call to test class's parent::setUp(). [ticket/11762] Fixed test's filename [ticket/11762] Use the === operator to distinguish "0" from ""
| * | [ticket/11762] Added call to test class's parent::setUp().s9e2013-08-031-1/+3
| | | | | | | | | | | | | | | | | | Added call to test class's parent::setUp(). Updated copyright year. PHPBB3-11762
| * | [ticket/11762] Fixed test's filenames9e2013-08-031-0/+0
| | | | | | | | | | | | PHPBB3-11762
| * | [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-032-2/+38
|/ / | | | | | | PHPBB3-11762
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-010-0/+0
|\ \ | |/ | | | | * prep-release-3.0.12:
| * 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
* | \ Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-013-2/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-014-5/+11
| | |
* | | 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
| * | | Merge remote-tracking branch 'bantu/ticket/11752' into prep-release-3.0.12Joas Schilling2013-07-301-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | * bantu/ticket/11752: [ticket/11752] HTTP -> HTTPs in email/installed.txt
| | * | [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| |/ / | | | | | | | | | PHPBB3-11752
* | | Merge remote-tracking branch 'Elsensee/ticket/10917-2' into develop-olympusJoas Schilling2013-07-301-8/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/10917-2: [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper
| * | | [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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 05:22:04 +0000