| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [ticket/11769] Allow '0' as username in notification mails | Joas Schilling | 2013-08-23 | 3 | -3/+3 |
| | | | | | PHPBB3-11769 | ||||
| * | [ticket/11769] Fix language issues in the doc blocks | Joas Schilling | 2013-08-23 | 2 | -6/+7 |
| | | | | | PHPBB3-11769 | ||||
| * | [ticket/11769] Correctly supply the post author's username in posting.php | Joas Schilling | 2013-08-23 | 2 | -2/+10 |
| | | | | | | | | | Only supply the username, when it is a guest posting or we edit and it was supplied, otherwise post_data might hold data of the post we quote, in which case username is the original poster, not the current one. PHPBB3-11769 | ||||
| * | Merge remote-tracking branch 'dhruvgoel92/ticket/11802' into prep-release-3.0.12 | Andreas Fischer | 2013-08-20 | 1 | -1/+1 |
| |\ | | | | | | | | | * dhruvgoel92/ticket/11802: [ticket/11802] replace $browser with $user->browser | ||||
| | * | [ticket/11802] replace $browser with $user->browser | Dhruv | 2013-08-20 | 1 | -1/+1 |
| |/ | | | | PHPBB3-11802 | ||||
| * | Merge remote-tracking branch 'nickvergessen/ticket/11775' into ↵ | Andreas Fischer | 2013-08-15 | 4 | -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 syntax | Joas Schilling | 2013-08-15 | 1 | -1/+1 |
| | | | | | | | | | PHPBB3-11775 | ||||
| | * | [ticket/11775] Remove spaces at line ends | Joas Schilling | 2013-08-15 | 1 | -4/+4 |
| | | | | | | | | | PHPBB3-11775 | ||||
| | * | [ticket/11775] Split test into multiple steps | Joas Schilling | 2013-08-12 | 1 | -1/+25 |
| | | | | | | | | | PHPBB3-11775 | ||||
| | * | [ticket/11775] Add functional test for moving the last post | Joas Schilling | 2013-08-09 | 1 | -0/+43 |
| | | | | | | | | | PHPBB3-11775 | ||||
| | * | [ticket/11775] Backport moving of the posting functions to 3.0 | Joas Schilling | 2013-08-08 | 2 | -101/+131 |
| | | | | | | | | | PHPBB3-11775 | ||||
| | * | [ticket/11775] Fix error when moving the last post to another topic | Joas Schilling | 2013-08-08 | 1 | -2/+2 |
| |/ | | | | PHPBB3-11775 | ||||
| * | Merge branch 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3 into ↵ | Andreas Fischer | 2013-08-01 | 2 | -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 remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12 | Joas Schilling | 2013-07-30 | 1 | -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 Fischer | 2013-07-30 | 1 | -2/+0 |
| | | | | | | | | | | | | | PHPBB3-11753 | ||||
| | | * | [ticket/11753] Update MySQL upgrader schema data. | Andreas Fischer | 2013-07-30 | 1 | -0/+19 |
| | | | | | | | | | | | | | PHPBB3-11753 | ||||
| | * | | Merge remote-tracking branch 'bantu/ticket/11524' into prep-release-3.0.12 | Joas Schilling | 2013-07-30 | 1 | -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 Fischer | 2013-07-30 | 1 | -1/+2 |
| | | |/ | | | | | | | | | | | | | | | | ... on PHP 5.4 or higher. PHPBB3-11524 | ||||
| | * | | Merge remote-tracking branch 'bantu/ticket/11752' into prep-release-3.0.12 | Joas Schilling | 2013-07-30 | 1 | -1/+1 |
| | |\ \ | | |/ | |/| | | | | | | | * bantu/ticket/11752: [ticket/11752] HTTP -> HTTPs in email/installed.txt | ||||
| | | * | [ticket/11752] HTTP -> HTTPs in email/installed.txt | Andreas Fischer | 2013-07-30 | 1 | -1/+1 |
| | |/ | | | | | | | PHPBB3-11752 | ||||
| * | | [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. | Andreas Fischer | 2013-08-01 | 1 | -0/+5 |
| | | | |||||
| * | | [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. | Andreas Fischer | 2013-08-01 | 4 | -5/+11 |
| |/ | |||||
| * | Merge remote-tracking branch 'unknownbliss/ticket/11740' into ↵ | Andreas Fischer | 2013-07-25 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | prep-release-3.0.12 * unknownbliss/ticket/11740: [ticket/11740] Update FAQ to include Ideas Centre | ||||
| | * | [ticket/11740] Update FAQ to include Ideas Centre | MichaelC | 2013-07-25 | 1 | -1/+1 |
| |/ | | | | PHPBB3-11740 | ||||
| * | Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into ↵ | Andreas Fischer | 2013-07-22 | 2 | -10/+18 |
| |\ | | | | | | | | | | | | | | | 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] Add functional test for submitting report as user | Marc Alexander | 2013-07-21 | 1 | -7/+12 |
| | | | | | | | | | | | | | | | The already existing functional tests were not ran as the filename was missing the appended "_test". PHPBB3-11720 | ||||
| | * | [ticket/11720] Do not call $captcha->validate if $captcha is not set | Marc Alexander | 2013-07-21 | 1 | -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 | ||||
| * | | [prep-release-3.0.12] More changelog items for the 3.0.12 release. | Andreas Fischer | 2013-07-13 | 1 | -0/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'github-marc1706/ticket/11112' into ↵ | Nils Adermann | 2013-07-13 | 15 | -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 https | Marc Alexander | 2013-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-11112 | ||||
| | * | | [ticket/11112] Use https for user-visible links to phpbb.com | Marc Alexander | 2013-07-12 | 15 | -44/+44 |
| | |/ | | | | | | | PHPBB3-11112 | ||||
| * | | Merge remote-tracking branch 'github-bantu/ticket/11674' into ↵ | Nils Adermann | 2013-07-13 | 1 | -13/+29 |
| |\ \ | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * github-bantu/ticket/11674: [ticket/11674] Do not include vendor folder if there are no dependencies. | ||||
| | * | | [ticket/11674] Do not include vendor folder if there are no dependencies. | Andreas Fischer | 2013-07-13 | 1 | -13/+29 |
| | | | | | | | | | | | | | PHPBB3-11674 | ||||
| * | | | Merge remote-tracking branch 'github-bantu/ticket/11670' into ↵ | Nils Adermann | 2013-07-13 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | prep-release-3.0.12 * github-bantu/ticket/11670: [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". | ||||
| | * | | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". | Andreas Fischer | 2013-07-13 | 1 | -1/+1 |
| |/ / | | | | | | | PHPBB3-11670 | ||||
| * | | [ticket/11671] Update composer.lock | Nathaniel Guse | 2013-07-13 | 1 | -0/+4 |
| | | | | | | | | | PHPBB3-11671 | ||||
| * | | Merge remote-tracking branch 'remotes/naderman/ticket/11671' into ↵ | Nathaniel Guse | 2013-07-13 | 2 | -58/+115 |
| |\ \ | |/ |/| | | | | | | | | | | | | | prep-release-3.0.12 # By Nils Adermann # Via Nils Adermann * remotes/naderman/ticket/11671: [ticket/11671] Add phing as a dependency and upgrade deps | ||||
| | * | [ticket/11671] Add phing as a dependency and upgrade deps | Nils Adermann | 2013-07-12 | 2 | -58/+115 |
| |/ | | | | PHPBB3-11671 | ||||
| * | [develop-olympus] Add changelog for 3.0.12 release. | Andreas Fischer | 2013-07-12 | 1 | -20/+165 |
| | | |||||
| * | [develop-olympus] Bump version numbers for 3.0.12-RC1 release. | Andreas Fischer | 2013-07-12 | 4 | -6/+6 |
| | | |||||
| * | [develop-olympus] Bumping version numbers to final for 3.0.12 releases. | Andreas Fischer | 2013-07-12 | 10 | -12/+12 |
| | | |||||
| * | Merge remote-tracking branch 'remotes/igorw/ticket/11668' into develop-olympus | Nathaniel Guse | 2013-07-12 | 3 | -0/+12 |
| |\ | | | | | | | | | | | | | # By Igor Wiedler # Via Igor Wiedler * remotes/igorw/ticket/11668: [ticket/11668] Run lint test at the end of the test suite | ||||
| | * | [ticket/11668] Run lint test at the end of the test suite | Igor Wiedler | 2013-07-12 | 3 | -0/+12 |
| |/ | | | | | | The lint test is very slow. Running it at the end should speed up the development cycle. PHPBB3-11668 | ||||
| * | Merge remote-tracking branch 'marc1706/ticket/11548-develop-olympus' into ↵ | Andreas Fischer | 2013-07-12 | 3 | -50/+51 |
| |\ | | | | | | | | | | | | | develop-olympus * marc1706/ticket/11548-develop-olympus: [ticket/11548] Fix incorrect usage of array_map on acp groups page | ||||
| | * | [ticket/11548] Fix incorrect usage of array_map on acp groups page | Marc Alexander | 2013-07-12 | 3 | -50/+51 |
| |/ | | | | | | | | 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 | ||||
| * | Merge remote-tracking branch 'remotes/bantu/ticket/11662' into develop-olympus | Nathaniel Guse | 2013-07-12 | 5 | -7/+7 |
| |\ | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/11662: [ticket/11662] Typos: occured -> occurred | ||||
| | * | [ticket/11662] Typos: occured -> occurred | Andreas Fischer | 2013-07-12 | 5 | -7/+7 |
| |/ | | | | PHPBB3-11662 | ||||
| * | Merge remote-tracking branch 'marc1706/ticket/11548' into develop-olympus | Andreas Fischer | 2013-07-11 | 2 | -1/+51 |
| |\ | | | | | | | | | | | * marc1706/ticket/11548: [ticket/11548] Use new static methods for request and submit [ticket/11548] Run array_map on complete error array and not just colour_error | ||||
| | * | [ticket/11548] Use new static methods for request and submit | Marc Alexander | 2013-07-11 | 1 | -5/+4 |
| | | | | | | | | | PHPBB3-11548 | ||||
| | * | Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵ | Marc Alexander | 2013-07-11 | 53 | -307/+2205 |
| | |\ | |/ |/| | | | ticket/11548 | ||||
