Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1473 from marc1706/ticket/11600 | Nathan Guse | 2013-07-13 | 1 | -22/+108 |
|\ | |||||
| * | [ticket/11600] Remove duplicate test case | Marc Alexander | 2013-07-04 | 1 | -2/+0 |
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600 | Marc Alexander | 2013-07-04 | 83 | -1542/+3338 |
| |\ | |||||
| * | | [ticket/11600] Use lowercase null and remove duplicate test cases | Marc Alexander | 2013-06-25 | 1 | -11/+7 |
| * | | [ticket/11600] Use local variable for $user in test_localize_errors | Marc Alexander | 2013-06-25 | 1 | -7/+5 |
| * | | [ŧicket/11600] Split get driver tests into tests for all and only enabled ones | Marc Alexander | 2013-06-25 | 1 | -10/+34 |
| * | | [ticket/11600] Increase code test coverage of avatar manager | Marc Alexander | 2013-06-10 | 1 | -22/+92 |
* | | | 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 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 | 2 | -4/+3 |
|\ \ \ \ \ | |||||
| * | | | | | [ticket/11684] Remove useless confirmation page after login and admin login | Joas Schilling | 2013-07-13 | 2 | -4/+3 |
* | | | | | | Merge pull request #1543 from nickvergessen/ticket/11685 | Nathan Guse | 2013-07-13 | 4 | -12/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [ticket/11685] Remove logout confirmation page | Joas Schilling | 2013-07-13 | 4 | -12/+8 |
| |/ / / / / | |||||
* | | | | | | 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 | -13/+29 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Nils Adermann | 2013-07-13 | 1 | -13/+29 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/11674' into prep-release-3.... | Nils Adermann | 2013-07-13 | 1 | -13/+29 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | [ticket/11674] Do not include vendor folder if there are no dependencies. | Andreas Fischer | 2013-07-13 | 1 | -13/+29 |
* | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/11670' into prep-release-3.... | 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 | 107 | -1481/+5918 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | [ticket/9657] Define user before injecting | Joas Schilling | 2013-07-13 | 5 | -1/+5 |
| * | | | | | | | | [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 | 122 | -2824/+3600 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | [ticket/9657] Keep approval state of posts/topics when copying them | Joas Schilling | 2013-07-13 | 1 | -6/+35 |
| * | | | | | | | | | [ticket/9657] Add functional tests for forking a copy | Joas Schilling | 2013-07-13 | 1 | -0/+168 |
| * | | | | | | | | | [ticket/9657] Add functional test for splitting topic | Joas Schilling | 2013-07-12 | 1 | -0/+81 |
| * | | | | | | | | | [ticket/9657] Add functional test for restoring a post/topic | Joas Schilling | 2013-07-12 | 1 | -0/+73 |
| * | | | | | | | | | [ticket/9657] Fix a little error when moving softdeleted topics | Joas Schilling | 2013-07-12 | 1 | -1/+0 |
| * | | | | | | | | | [ticket/9657] Add unit tests for softdeleting and moving posts/topics | Joas Schilling | 2013-07-12 | 2 | -9/+478 |
| * | | | | | | | | | [ticket/9657] Remove last references to m_restore permission | Joas Schilling | 2013-07-12 | 2 | -4/+2 |