aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1473 from marc1706/ticket/11600Nathan Guse2013-07-131-22/+108
|\
| * [ticket/11600] Remove duplicate test caseMarc Alexander2013-07-041-2/+0
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600Marc Alexander2013-07-0483-1542/+3338
| |\
| * | [ticket/11600] Use lowercase null and remove duplicate test casesMarc Alexander2013-06-251-11/+7
| * | [ticket/11600] Use local variable for $user in test_localize_errorsMarc Alexander2013-06-251-7/+5
| * | [ŧicket/11600] Split get driver tests into tests for all and only enabled onesMarc Alexander2013-06-251-10/+34
| * | [ticket/11600] Increase code test coverage of avatar managerMarc Alexander2013-06-101-22/+92
* | | Merge pull request #1550 from nickvergessen/ticket/9649Nathan Guse2013-07-133-3/+22
|\ \ \
| * | | [ticket/9649] Display information on index for moderators on unapproved postsJoas Schilling2013-07-133-3/+22
* | | | Merge pull request #1436 from cyberalien/ticket/11563Nathan Guse2013-07-135-50/+50
|\ \ \ \
| * | | | [ticket/11563] Remove duplicate codeVjacheslav Trushkin2013-07-111-1/+1
| * | | | [ticket/11563] Dynamically generate panels listVjacheslav Trushkin2013-07-113-3/+6
| * | | | [ticket/11563] Remove unused JS variablesVjacheslav Trushkin2013-07-111-3/+0
| * | | | [ticket/11563] Fix subPanels()Vjacheslav Trushkin2013-07-114-47/+47
* | | | | Merge pull request #1541 from nickvergessen/ticket/11684Nathan Guse2013-07-132-4/+3
|\ \ \ \ \
| * | | | | [ticket/11684] Remove useless confirmation page after login and admin loginJoas Schilling2013-07-132-4/+3
* | | | | | Merge pull request #1543 from nickvergessen/ticket/11685Nathan Guse2013-07-134-12/+8
|\ \ \ \ \ \
| * | | | | | [ticket/11685] Remove logout confirmation pageJoas Schilling2013-07-134-12/+8
| |/ / / / /
* | | | | | Merge pull request #1549 from cyberalien/ticket/10999Nathan Guse2013-07-132-1/+3
|\ \ \ \ \ \
| * | | | | | [ticket/10999] Fix assets_version in ACPVjacheslav Trushkin2013-07-132-1/+3
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-131-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-131-0/+3
| |\ \ \ \ \ \
| | * | | | | | [prep-release-3.0.12] More changelog items for the 3.0.12 release.Andreas Fischer2013-07-131-0/+3
* | | | | | | | Merge remote-tracking branch 'github-phpbb/develop' into developNils Adermann2013-07-131-0/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #1548 from cyberalien/ticket/11687Nathan Guse2013-07-131-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/11687] Add assets_version to phpbb_configVjacheslav Trushkin2013-07-131-0/+1
| | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-07-1315-44/+44
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-1315-44/+44
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release...Nils Adermann2013-07-1315-44/+44
| | |\ \ \ \ \ \
| | | * | | | | | [ticket/11112] Do not change opensource.org link to httpsMarc Alexander2013-07-121-1/+1
| | | * | | | | | [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-1215-44/+44
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-13/+29
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-13/+29
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge remote-tracking branch 'github-bantu/ticket/11674' into prep-release-3....Nils Adermann2013-07-131-13/+29
| | |\ \ \ \ \ \ \
| | | * | | | | | | [ticket/11674] Do not include vendor folder if there are no dependencies.Andreas Fischer2013-07-131-13/+29
* | | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge remote-tracking branch 'github-bantu/ticket/11670' into prep-release-3....Nils Adermann2013-07-131-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
| | |/ / / / / /
* | | | | | | | Merge pull request #1017 from nickvergessen/feature/softdelete-1-permissionNathan Guse2013-07-13107-1481/+5918
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/9657] Define user before injectingJoas Schilling2013-07-135-1/+5
| * | | | | | | | [ticket/9657] Remove old codeJoas Schilling2013-07-131-1/+0
| * | | | | | | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-13122-2824/+3600
| |\ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/9657] Keep approval state of posts/topics when copying themJoas Schilling2013-07-131-6/+35
| * | | | | | | | | [ticket/9657] Add functional tests for forking a copyJoas Schilling2013-07-131-0/+168
| * | | | | | | | | [ticket/9657] Add functional test for splitting topicJoas Schilling2013-07-121-0/+81
| * | | | | | | | | [ticket/9657] Add functional test for restoring a post/topicJoas Schilling2013-07-121-0/+73
| * | | | | | | | | [ticket/9657] Fix a little error when moving softdeleted topicsJoas Schilling2013-07-121-1/+0
| * | | | | | | | | [ticket/9657] Add unit tests for softdeleting and moving posts/topicsJoas Schilling2013-07-122-9/+478
| * | | | | | | | | [ticket/9657] Remove last references to m_restore permissionJoas Schilling2013-07-122-4/+2