aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1701 from EXreaction/ticket/11831David King2013-09-123-155/+299
|\
| * [ticket/11831] getAttribute was replaced with attrNathan2013-09-061-1/+1
| * [ticket/11831] Update fabpot/goutte to 1.0.*Nathan2013-09-062-154/+298
* | Merge pull request #1698 from rechosen/ticket/11829Nathan Guse2013-09-124-3/+5
|\ \
| * | [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-044-3/+5
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-101-1/+0
|\ \ \ | |_|/ |/| |
| * | [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.Andreas Fischer2013-09-101-1/+0
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-053-2/+11
|\ \ \ | |/ / | | / | |/ |/|
| * [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.Andreas Fischer2013-09-021-0/+3
| * [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-024-5/+11
* | Merge remote-tracking branch 'imkingdavid/ticket/11823' into develop-olympusAndreas Fischer2013-09-021-1/+1
|\ \
| * | [ticket/11823] Set up nginx server to match PHP files with characters after .phpDavid King2013-09-021-1/+1
|/ /
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-025-5/+14
|\ \ | |/
| * Merge remote-tracking branch 'nickvergessen/ticket/11769' into prep-release-3...Andreas Fischer2013-09-025-5/+14
| |\
| | * [ticket/11769] Allow using 0 as poster nameJoas Schilling2013-09-021-1/+1
| | * [ticket/11769] Allow '0' as usernameJoas Schilling2013-09-021-1/+1
| | * [ticket/11769] Allow '0' as username in notification mailsJoas Schilling2013-08-233-3/+3
| | * [ticket/11769] Fix language issues in the doc blocksJoas Schilling2013-08-232-6/+7
| | * [ticket/11769] Correctly supply the post author's username in posting.phpJoas Schilling2013-08-232-2/+10
| |/
* | Merge remote-tracking branch 'bantu/ticket/11821' into develop-olympusJoas Schilling2013-09-023-3/+3
|\ \
| * | [ticket/11821] Fix comma usage next to "You are receiving this notification".Andreas Fischer2013-09-023-3/+3
|/ /
* | Merge remote-tracking branch 'bantu/ticket/11799' into develop-olympusJoas Schilling2013-08-261-0/+2
|\ \
| * | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
|/ /
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-201-1/+1
|\ \ | |/
| * Merge remote-tracking branch 'dhruvgoel92/ticket/11802' into prep-release-3.0.12Andreas Fischer2013-08-201-1/+1
| |\
| | * [ticket/11802] replace $browser with $user->browserDhruv2013-08-201-1/+1
| |/
* | Merge remote-tracking branch 'Prosk8er/ticket/11801' into develop-olympusAndreas Fischer2013-08-192-18/+18
|\ \
| * | [ticket/11801] removed some whitespace and added missing semi colon's in cssProsk8er2013-08-192-18/+18
|/ /
* | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympusAndreas Fischer2013-08-182-2/+2
|\ \
| * | [ticket/11789] Remove inline color in memberlist_viewVjacheslav Trushkin2013-08-182-2/+2
* | | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympusAndreas Fischer2013-08-184-5/+13
|\ \ \ | |/ /
| * | [ticket/11789] Remove colors from HTML codeVjacheslav Trushkin2013-08-144-5/+13
* | | Merge remote-tracking branch 'rechosen/ticket/11794' into develop-olympusAndreas Fischer2013-08-161-10/+10
|\ \ \
| * | | [ticket/11794] Add missing array element commas to docs/coding-guidelines.htmlrechosen2013-08-161-10/+10
|/ / /
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-154-103/+200
|\ \ \ | |/ / |/| / | |/
| * Merge remote-tracking branch 'nickvergessen/ticket/11775' into prep-release-3...Andreas Fischer2013-08-154-103/+200
| |\
| | * [ticket/11775] Fix doc blocks syntaxJoas Schilling2013-08-151-1/+1
| | * [ticket/11775] Remove spaces at line endsJoas Schilling2013-08-151-4/+4
| | * [ticket/11775] Split test into multiple stepsJoas Schilling2013-08-121-1/+25
| | * [ticket/11775] Add functional test for moving the last postJoas Schilling2013-08-091-0/+43
| | * [ticket/11775] Backport moving of the posting functions to 3.0Joas Schilling2013-08-082-101/+131
| | * [ticket/11775] Fix error when moving the last post to another topicJoas Schilling2013-08-081-2/+2
| |/
* | Merge remote-tracking branch 's9e/ticket/11762' into develop-olympusJoas Schilling2013-08-032-2/+40
|\ \
| * | [ticket/11762] Added call to test class's parent::setUp().s9e2013-08-031-1/+3
| * | [ticket/11762] Fixed test's filenames9e2013-08-031-0/+0
| * | [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-032-2/+38
|/ /
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-010-0/+0
|\ \ | |/
| * Merge branch 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3 into prep...Andreas Fischer2013-08-012-4/+22
| |\
* | \ Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-013-2/+13
|\ \ \ | |/ /
| * | [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.Andreas Fischer2013-08-011-0/+5