aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.phpJoas Schilling2013-06-081-1/+4
* Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-06-061-0/+20
|\
| * Merge pull request #1466 from nickvergessen/ticket/11590Nils Adermann2013-06-061-0/+20
| |\
| | * [ticket/11590] Close database connections when tearDown() is calledJoas Schilling2013-06-071-0/+20
| |/
* | Merge branch 'develop-olympus' into developNathaniel Guse2013-06-060-0/+0
|\ \ | |/
| * Merge remote-tracking branch 'remotes/nickv/ticket/11568' into develop-olympusNathaniel Guse2013-06-065-105/+173
| |\
* | \ Merge remote-tracking branch 'remotes/nickv/ticket/11568-develop' into developNathaniel Guse2013-06-0618-183/+219
|\ \ \
| * \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11568-d...Joas Schilling2013-06-0726-145/+640
| |\ \ \ | |/ / / |/| | |
* | | | Merge remote-tracking branch 'remotes/Marc/ticket/11587' into developNathaniel Guse2013-06-064-10/+170
|\ \ \ \
| * | | | [ticket/11587] Add functional tests for group teampage settingsMarc Alexander2013-06-043-6/+157
| * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11587Marc Alexander2013-06-043-8/+14
| |\ \ \ \
| * | | | | [ticket/11587] Pass legend and teampage settings to group_create()Marc Alexander2013-06-041-4/+13
* | | | | | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' in...Nathaniel Guse2013-06-065-78/+165
|\ \ \ \ \ \
| * | | | | | [feature/editor-code-tabs] Make inTag function reusableVjacheslav Trushkin2013-05-221-29/+44
| * | | | | | [feature/editor-code-tabs] Check for browser support in functionVjacheslav Trushkin2013-05-202-3/+4
| * | | | | | [feature/editor-code-tabs] Apply code editor to everythingVjacheslav Trushkin2013-05-205-92/+146
| * | | | | | [feature/editor-code-tabs] Correctly count indentation on first lineVjacheslav Trushkin2013-05-201-4/+21
* | | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11564' into developNathaniel Guse2013-06-062-5/+33
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11564] Missing new line in tweaks.cssVjacheslav Trushkin2013-05-231-1/+1
| * | | | | | | [ticket/11564] Notifications popup fixesVjacheslav Trushkin2013-05-232-5/+33
* | | | | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-06-061-1/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'remotes/bantu/ticket/11588' into develop-olympusNathaniel Guse2013-06-061-1/+3
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11588] Also use version.phpbb.com in install_update.php.Andreas Fischer2013-06-061-1/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'develop-olympus' into developDhruv2013-06-052-3/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympusDhruv2013-06-052-3/+10
| |\ \ \ \ \ \
| | * | | | | | [ticket/11583] Use a new lang key instead of giving the old one a new meaning.Andreas Fischer2013-06-032-2/+2
| | * | | | | | [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.Andreas Fischer2013-06-012-2/+9
* | | | | | | | Merge remote-tracking branch 'marc1706/ticket/11538' into developAndreas Fischer2013-06-043-8/+14
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | [ticket/11538] Add admin as admins leader and moderator in memberlist_testMarc Alexander2013-06-043-8/+14
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'bantu/ticket/11586' into developJoas Schilling2013-06-031-23/+16
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.Andreas Fischer2013-06-031-3/+3
| * | | | | | | [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.Andreas Fischer2013-06-031-8/+1
| * | | | | | | [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.Andreas Fischer2013-06-031-8/+8
| * | | | | | | [ticket/11586] Combine administrator/moderator checks together.Andreas Fischer2013-06-031-7/+7
|/ / / / / / /
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-10/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympusAndreas Fischer2013-06-031-10/+10
| |\ \ \ \ \ \
| | * | | | | | [ticket/11145] Wrong error thrown when uploading a bigger image.erangamapa2013-05-251-10/+10
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10840' into develop-olympusAndreas Fischer2013-06-031-0/+10
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/10840] Add check_form_key to acp_groups.phpJoas Schilling2013-06-031-0/+10
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11122-2' into develop-olympusAndreas Fischer2013-06-031-2/+3
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | [ticket/11122] Add dhruv to active authorsJoas Schilling2013-06-031-0/+1
| | * | | | | | | [ticket/11122] Remove Oleg and igorw from active authorsJoas Schilling2013-06-031-2/+2
| | |/ / / / / /
* | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11549' into developDavid King2013-05-315-1/+193
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11549] Add functional test for ACP Extension Module with TemplateJoas Schilling2013-05-314-0/+193
| * | | | | | | | [ticket/11549] Do not set extension dir path for style in adm/index.phpJoas Schilling2013-05-311-1/+0
* | | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/11409' into developJoas Schilling2013-05-311-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/11409] Add success message after updating group position settingsOliver Schramm2013-05-311-0/+2
* | | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11387' into developJoas Schilling2013-05-311-3/+2
|\ \ \ \ \ \ \ \ \ \