Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into ticket/11215 | David King | 2013-07-14 | 1 | -1/+1 |
|\ | |||||
| * | [ticket/11694] Do not locate assets with root path | Vjacheslav Trushkin | 2013-07-13 | 1 | -1/+1 |
* | | Merge branch 'develop' into ticket/11215 | David King | 2013-07-13 | 11 | -38/+120 |
|\ \ | |/ | |||||
| * | [ticket/11675] Fix template loop | Nathaniel Guse | 2013-07-13 | 1 | -1/+1 |
| * | Merge pull request #1429 from cyberalien/ticket/11553 | Nathan Guse | 2013-07-13 | 6 | -29/+85 |
| |\ | |||||
| | * | [ticket/11553] Typo | Vjacheslav Trushkin | 2013-07-11 | 1 | -1/+1 |
| | * | [ticket/11553] Replace bullet with unicode | Vjacheslav Trushkin | 2013-07-11 | 1 | -2/+2 |
| | * | [ticket/11553] Move bulletin points to pseudo class | Vjacheslav Trushkin | 2013-07-11 | 6 | -29/+85 |
| * | | [ticket/11690] Old module class names may get autoloaded by class_exists | Nils Adermann | 2013-07-13 | 1 | -5/+12 |
| * | | Merge pull request #1550 from nickvergessen/ticket/9649 | Nathan Guse | 2013-07-13 | 3 | -3/+22 |
| |\ \ | |||||
| | * | | [ticket/9649] Display information on index for moderators on unapproved posts | Joas Schilling | 2013-07-13 | 3 | -3/+22 |
* | | | | Merge branch 'develop' into ticket/11215 | David King | 2013-07-13 | 111 | -1580/+3615 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #1436 from cyberalien/ticket/11563 | Nathan Guse | 2013-07-13 | 5 | -50/+50 |
| |\ \ \ | |||||
| | * | | | [ticket/11563] Remove duplicate code | Vjacheslav Trushkin | 2013-07-11 | 1 | -1/+1 |
| | * | | | [ticket/11563] Dynamically generate panels list | Vjacheslav Trushkin | 2013-07-11 | 3 | -3/+6 |
| | * | | | [ticket/11563] Remove unused JS variables | Vjacheslav Trushkin | 2013-07-11 | 1 | -3/+0 |
| | * | | | [ticket/11563] Fix subPanels() | Vjacheslav Trushkin | 2013-07-11 | 4 | -47/+47 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1541 from nickvergessen/ticket/11684 | Nathan Guse | 2013-07-13 | 1 | -2/+1 |
| |\ \ \ | |||||
| | * | | | [ticket/11684] Remove useless confirmation page after login and admin login | Joas Schilling | 2013-07-13 | 1 | -2/+1 |
| * | | | | Merge pull request #1543 from nickvergessen/ticket/11685 | Nathan Guse | 2013-07-13 | 2 | -10/+7 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/11685] Remove logout confirmation page | Joas Schilling | 2013-07-13 | 2 | -10/+7 |
| | |/ / / | |||||
| * | | | | Merge pull request #1549 from cyberalien/ticket/10999 | Nathan Guse | 2013-07-13 | 2 | -1/+3 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/10999] Fix assets_version in ACP | Vjacheslav Trushkin | 2013-07-13 | 2 | -1/+3 |
| * | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-07-13 | 1 | -0/+3 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Andreas Fischer | 2013-07-13 | 1 | -0/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | [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-phpbb/develop' into develop | Nils Adermann | 2013-07-13 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge pull request #1548 from cyberalien/ticket/11687 | Nathan Guse | 2013-07-13 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | [ticket/11687] Add assets_version to phpbb_config | Vjacheslav Trushkin | 2013-07-13 | 1 | -0/+1 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
| * | | | | | | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2013-07-13 | 15 | -44/+44 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Nils Adermann | 2013-07-13 | 15 | -44/+44 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release... | Nils Adermann | 2013-07-13 | 15 | -44/+44 |
| | | |\ \ \ \ | |||||
| | | | * | | | | [ticket/11112] Do not change opensource.org link to https | Marc Alexander | 2013-07-12 | 1 | -1/+1 |
| | | | * | | | | [ticket/11112] Use https for user-visible links to phpbb.com | Marc Alexander | 2013-07-12 | 15 | -44/+44 |
| * | | | | | | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2013-07-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Nils Adermann | 2013-07-13 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". | Andreas Fischer | 2013-07-13 | 1 | -1/+1 |
| * | | | | | | Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission | Nathan Guse | 2013-07-13 | 92 | -1472/+3505 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/9657] Remove old code | Joas Schilling | 2013-07-13 | 1 | -1/+0 |
| | * | | | | | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657 | Joas Schilling | 2013-07-13 | 77 | -2321/+2951 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/9657] Keep approval state of posts/topics when copying them | Joas Schilling | 2013-07-13 | 1 | -6/+35 |
| | * | | | | | | | [ticket/9657] Fix a little error when moving softdeleted topics | Joas Schilling | 2013-07-12 | 1 | -1/+0 |
| | * | | | | | | | [ticket/9657] Remove last references to m_restore permission | Joas Schilling | 2013-07-12 | 2 | -4/+2 |
| | * | | | | | | | [ticket/9657] Fix english language :( | Joas Schilling | 2013-07-11 | 2 | -2/+2 |
| | * | | | | | | | [ticket/9657] Notifications do not require emails or jabber anymore | Joas Schilling | 2013-07-11 | 1 | -2/+2 |
| | * | | | | | | | [ticket/9657] Add type hints for classes | Joas Schilling | 2013-07-11 | 2 | -2/+2 |
| | * | | | | | | | [ticket/9657] Remove sql_visibility as it is always non-empty | Joas Schilling | 2013-07-11 | 6 | -35/+15 |
| | * | | | | | | | [ticket/9657] Use include instead of include_once | Joas Schilling | 2013-07-11 | 1 | -3/+9 |
| | * | | | | | | | [ticket/9657] Initialise variable outside of the loop | Joas Schilling | 2013-07-11 | 1 | -0/+1 |
| | * | | | | | | | [ticket/9657] Fix variable naming of phpEx to php_ext | Joas Schilling | 2013-07-11 | 1 | -1/+1 |