Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816 | Nathan Guse | 2013-09-06 | 53 | -4437/+2436 |
|\ | |||||
| * | Merge pull request #1618 from VSEphpbb/ticket/11747 | Nathan Guse | 2013-09-05 | 8 | -1/+152 |
| |\ | |||||
| | * | [ticket/11747] Tweak some of the wording in the events doc | Matt Friedman | 2013-07-27 | 1 | -8/+8 |
| | * | [ticket/11747] Use _prepend and _append for template events | Matt Friedman | 2013-07-26 | 7 | -24/+24 |
| | * | [ticket/11747] ucp_prefs_post template events | Matt Friedman | 2013-07-26 | 3 | -0/+18 |
| | * | [ticket/11747] ucp_prefs_post core events | Matt Friedman | 2013-07-26 | 1 | -0/+25 |
| | * | [ticket/11747] ucp_prefs_view template events | Matt Friedman | 2013-07-26 | 3 | -0/+40 |
| | * | [ticket/11747] ucp_prefs_view core events | Matt Friedman | 2013-07-26 | 1 | -0/+25 |
| | * | [ticket/11747] ucp_prefs_personal template events | Matt Friedman | 2013-07-26 | 3 | -0/+18 |
| | * | [ticket/11747] ucp_prefs_personal core events | Matt Friedman | 2013-07-26 | 1 | -0/+25 |
| | * | [ticket/11747] Add $phpbb_dispatcher to global | Matt Friedman | 2013-07-26 | 1 | -1/+1 |
| * | | Merge pull request #1435 from cyberalien/ticket/11562 | Nathan Guse | 2013-09-05 | 1 | -121/+8 |
| |\ \ | |||||
| | * | | [ticket/11562] Use jQuery in subPanels | Vjacheslav Trushkin | 2013-08-30 | 1 | -17/+3 |
| | * | | [ticket/11562] Remove submit_default_button from forum_fn | Vjacheslav Trushkin | 2013-08-30 | 1 | -92/+0 |
| | * | | [ticket/11562] Convert marklist() to jQuery | Vjacheslav Trushkin | 2013-08-30 | 1 | -12/+5 |
| * | | | Merge pull request #1695 from dhruvgoel92/ticket/11825 | Nathan Guse | 2013-09-05 | 3 | -2/+2 |
| |\ \ \ | |||||
| | * | | | [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ | Dhruv | 2013-09-03 | 3 | -2/+2 |
| * | | | | Merge pull request #1651 from cyberalien/ticket/11782 | Nathan Guse | 2013-09-05 | 7 | -43/+81 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/11782] Apply line-height correctly | Vjacheslav Trushkin | 2013-08-11 | 1 | -1/+1 |
| | * | | | | [ticket/11782] RTL support for post notices | Vjacheslav Trushkin | 2013-08-11 | 1 | -0/+7 |
| | * | | | | [ticket/11782] Change p.rules to p.post-notice in CSS | Vjacheslav Trushkin | 2013-08-11 | 2 | -13/+31 |
| | * | | | | [ticket/11782] Change p.rules to p.post-notice in templates | Vjacheslav Trushkin | 2013-08-11 | 4 | -30/+43 |
| * | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-09-05 | 1 | -0/+3 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Andreas Fischer | 2013-09-05 | 2 | -0/+9 |
| | |\ \ \ \ | |||||
| | | * | | | | [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. | Andreas Fischer | 2013-09-02 | 1 | -0/+3 |
| | | * | | | | [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. | Andreas Fischer | 2013-09-02 | 3 | -3/+9 |
| * | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11791' into develop | David King | 2013-09-02 | 5 | -5/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/11791] Load adm/ events from styles/adm/event/ | Nathan Guse | 2013-09-02 | 5 | -5/+5 |
| * | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11818' into develop | David King | 2013-09-02 | 2 | -160/+349 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/11818] Update Symfony dependencies to 2.3.* | Nathan Guse | 2013-09-02 | 2 | -160/+349 |
| * | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11755' into develop | David King | 2013-09-02 | 4 | -2786/+1456 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | [ticket/11755] MySQL upgrader out of date | Nathan Guse | 2013-09-02 | 4 | -2786/+1456 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #1102 from imkingdavid/ticket/11215 | Nathan Guse | 2013-09-02 | 6 | -34/+95 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | [ticket/11215] Remove unnecessary comment | David King | 2013-09-02 | 1 | -4/+0 |
| | * | | | | | | | | [ticket/11215] Fix helper_url_test.php tests | David King | 2013-09-02 | 1 | -1/+1 |
| | * | | | | | | | | [ticket/11215] Add newline back to .htaccess, fix wording | David King | 2013-09-02 | 1 | -3/+3 |
| | * | | | | | | | | [ticket/11215] Update comment in .htaccess | David King | 2013-09-02 | 1 | -4/+4 |
| | * | | | | | | | | [ticket/11215] Uncomment rewrite rules in .htaccess | David King | 2013-09-02 | 1 | -4/+4 |
| | * | | | | | | | | [ticket/11215] Make controller helper url() method use correct format | David King | 2013-09-02 | 2 | -16/+18 |
| | * | | | | | | | | [ticket/11215] Add commented-out URL rewrite capability to .htaccess | David King | 2013-09-02 | 2 | -4/+34 |
| | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into ticket/11215 | David King | 2013-09-02 | 5 | -4/+15 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | * | | | | | | | | [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 | 350 | -2426/+1904 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' into ticket/11215 | David King | 2013-07-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'develop' into ticket/11215 | David King | 2013-07-13 | 11 | -38/+120 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into ticket/11215 | David King | 2013-07-13 | 111 | -1580/+3615 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into ticket/11215 | David King | 2013-07-13 | 2 | -14/+191 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | [ticket/11215] Don't try to use when it isn't there | David King | 2013-07-13 | 1 | -2/+2 |
| | * | | | | | | | | | | | | Merge branch 'develop' into ticket/11215 | David King | 2013-07-13 | 27 | -252/+577 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | [ticket/11215] Don't try to correct paths during tests | David King | 2013-07-12 | 1 | -1/+1 |