| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'upstream/develop' into ticket/11215 | David King | 2013-09-02 | 6 | -36/+17 |
|\ |
|
| * | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-09-02 | 5 | -4/+15 |
| |\ |
|
| | * | Merge branch 'prep-release-3.0.12' into develop-olympus | Andreas Fischer | 2013-09-02 | 5 | -5/+14 |
| | |\ |
|
| | | * | Merge remote-tracking branch 'nickvergessen/ticket/11769' into prep-release-3... | Andreas Fischer | 2013-09-02 | 5 | -5/+14 |
| | | |\ |
|
| | | | * | [ticket/11769] Allow using 0 as poster name | Joas Schilling | 2013-09-02 | 1 | -1/+1 |
| | | | * | [ticket/11769] Allow '0' as username | Joas Schilling | 2013-09-02 | 1 | -1/+1 |
| | | | * | [ticket/11769] Allow '0' as username in notification mails | Joas Schilling | 2013-08-23 | 3 | -3/+3 |
| | | | * | [ticket/11769] Fix language issues in the doc blocks | Joas Schilling | 2013-08-23 | 2 | -6/+7 |
| | | | * | [ticket/11769] Correctly supply the post author's username in posting.php | Joas Schilling | 2013-08-23 | 2 | -2/+10 |
| | | |/ |
|
| * | | | Merge branch 'develop-olympus' into develop | Joas Schilling | 2013-09-02 | 0 | -0/+0 |
| |\ \ \
| | |/ / |
|
| | * | | Merge remote-tracking branch 'bantu/ticket/11821' into develop-olympus | Joas Schilling | 2013-09-02 | 3 | -3/+3 |
| | |\ \ |
|
| | | * | | [ticket/11821] Fix comma usage next to "You are receiving this notification". | Andreas Fischer | 2013-09-02 | 3 | -3/+3 |
| | |/ / |
|
| * | | | Merge remote-tracking branch 'Hardolaf/ticket/11813' into develop | Andreas Fischer | 2013-09-01 | 1 | -32/+2 |
| |\ \ \ |
|
| | * | | | [ticket/11813] Change mock auth provider to implement base provider | Joseph Warner | 2013-08-27 | 1 | -32/+2 |
* | | | | | [ticket/11215] Use new URL structure for controllers | David King | 2013-08-31 | 1 | -5/+5 |
* | | | | | [ticket/11215] Everything appears to be working... | David King | 2013-08-31 | 1 | -19/+9 |
* | | | | | Merge branch 'develop' into ticket/11215 | David King | 2013-08-31 | 448 | -2841/+3693 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge remote-tracking branch 'EXreaction/ticket/11724' into develop | Joas Schilling | 2013-08-30 | 3 | -3/+15 |
| |\ \ \ \ |
|
| | * | | | | [ticket/11724] Handle ELSE IF separately | Nathan Guse | 2013-08-28 | 1 | -5/+7 |
| | * | | | | [ticket/11724] Replace spaces with tabs | Nathan Guse | 2013-07-28 | 1 | -1/+1 |
| | * | | | | [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way | Nathan Guse | 2013-07-27 | 3 | -1/+11 |
| * | | | | | Merge remote-tracking branch 'EXreaction/ticket/11628' into develop | David King | 2013-08-29 | 28 | -1373/+275 |
| |\ \ \ \ \ |
|
| | * | | | | | [ticket/11628] Create base template class with common functions | Nathan Guse | 2013-08-28 | 2 | -179/+149 |
| | * | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628 | Nathan Guse | 2013-08-28 | 152 | -646/+1036 |
| | |\ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Merge remote-tracking branch 'remotes/brunoais/ticket/11803' into develop | Nathan Guse | 2013-08-28 | 1 | -1/+1 |
| |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| | * | | | | | [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 | brunoais | 2013-08-26 | 1 | -1/+1 |
| * | | | | | | Merge branch 'develop-olympus' into develop | Joas Schilling | 2013-08-26 | 1 | -0/+2 |
| |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | | |
|
| | * | | | | | Merge remote-tracking branch 'bantu/ticket/11799' into develop-olympus | Joas Schilling | 2013-08-26 | 1 | -0/+2 |
| | |\ \ \ \ \ |
|
| | | * | | | | | [ticket/11799] Send anti abuse headers in "new password" emails. | Andreas Fischer | 2013-08-23 | 1 | -0/+2 |
| | |/ / / / / |
|
| * | | | | | | Merge remote-tracking branch 'rechosen/ticket/11792' into develop | Joas Schilling | 2013-08-22 | 4 | -1/+127 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | [ticket/11792] Add functional test for var lang_set_ext of core.user_setup | rechosen | 2013-08-22 | 3 | -0/+111 |
| | * | | | | | | [ticket/11792] Add performance remark to core.user_setup event PHPDoc | rechosen | 2013-08-19 | 1 | -0/+3 |
| | * | | | | | | [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup | rechosen | 2013-08-19 | 1 | -1/+13 |
| | | |/ / / /
| | |/| | | | |
|
| * | | | | | | Merge remote-tracking branch 'mvinny/ticket/11804' into develop | Andreas Fischer | 2013-08-20 | 1 | -1/+0 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | [ticket/11804] Remove </li> from overall_header which was not open | Marcus Vinny | 2013-08-20 | 1 | -1/+0 |
| |/ / / / / / |
|
| * | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-08-20 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Andreas Fischer | 2013-08-20 | 1 | -1/+1 |
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| | | * | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11802' into prep-release-3.0.12 | Andreas Fischer | 2013-08-20 | 1 | -1/+1 |
| | | |\ \ \ \ |
|
| | | | * | | | | [ticket/11802] replace $browser with $user->browser | Dhruv | 2013-08-20 | 1 | -1/+1 |
| | | |/ / / / |
|
| * | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-08-19 | 1 | -5/+5 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Merge remote-tracking branch 'Prosk8er/ticket/11801' into develop-olympus | Andreas Fischer | 2013-08-19 | 2 | -18/+18 |
| | |\ \ \ \ \ |
|
| | | * | | | | | [ticket/11801] removed some whitespace and added missing semi colon's in css | Prosk8er | 2013-08-19 | 2 | -18/+18 |
| | |/ / / / / |
|
| * | | | | | | Merge remote-tracking branch 'Elsensee/ticket/11760' into develop | Dhruv | 2013-08-19 | 36 | -36/+36 |
| |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| | * | | | | | [ticket/11760] Use phpbb_version_compare() wrapper | Oliver Schramm | 2013-08-02 | 36 | -36/+36 |
| * | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-08-18 | 2 | -2/+2 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympus | Andreas Fischer | 2013-08-18 | 2 | -2/+2 |
| | |\ \ \ \ \ |
|
| | | * | | | | | [ticket/11789] Remove inline color in memberlist_view | Vjacheslav Trushkin | 2013-08-18 | 2 | -2/+2 |
| * | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-08-18 | 4 | -5/+13 |
| |\ \ \ \ \ \ \
| | |/ / / / / / |
|
| | * | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympus | Andreas Fischer | 2013-08-18 | 4 | -5/+13 |
| | |\ \ \ \ \ \
| | | |/ / / / / |
|
| | | * | | | | | [ticket/11789] Remove colors from HTML code | Vjacheslav Trushkin | 2013-08-14 | 4 | -5/+13 |