aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11587Marc Alexander2013-06-043-8/+14
|\
| * 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
| |/
* | [ticket/11587] Pass legend and teampage settings to group_create()Marc Alexander2013-06-041-4/+13
|/
* 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
|\ \ \ \ \ \
| * | | | | | [ticket/11387] Log module added only after it has been addedNathaniel Guse2013-03-021-3/+2
* | | | | | | Merge remote-tracking branch 'Elsensee/ticket/11570' into developJoas Schilling2013-05-311-1/+12
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | |
| * | | | | [ticket/11570] Fix link and make the notice more conspiciuousOliver Schramm2013-05-311-3/+3
| * | | | | [ticket/11570] Add link back to update processOliver Schramm2013-05-301-1/+12
|/ / / / /
* | | | | Merge remote-tracking branch 'Elsensee/ticket/11569' into developJoas Schilling2013-05-291-2/+1
|\ \ \ \ \
| * | | | | [ticket/11569] Add type parameter and fix language variableOliver Schramm2013-05-291-1/+1
| * | | | | [ticket/11569] Add parameter to URL and remove commentOliver Schramm2013-05-291-2/+1
| * | | | | [ticket/11569] Fixing link to continue updateOliver Schramm2013-05-261-1/+1
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/encryptedmind/11516' into ...Andreas Fischer2013-05-281-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/11516] Upgrading the .live jquery function because it is deprecated.Jesús Rafael Cova Huerta2013-05-281-1/+1
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-281-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11580' into develop-olympusAndreas Fischer2013-05-281-1/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [ticket/11580] Enable prefer-source option (should error way less)Joas Schilling2013-05-271-1/+1
| | * | | | | [ticket/11580] Enable --no-interaction option on composer for travisJoas Schilling2013-05-271-1/+1
| |/ / / / /
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'marc1706/ticket/11578' into develop-olympusJoas Schilling2013-05-271-1/+1
| |\ \ \ \
| | * | | | [ticket/11578] Add missing underscore after 'validate' function prefixmarc17062013-05-271-1/+1
| |/ / / /
* | | | | Merge remote-tracking branch 'bantu/ticket/11573' into developJoas Schilling2013-05-272-0/+20
|\ \ \ \ \
| * | | | | [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in phpbb_user_loader_test.Andreas Fischer2013-05-271-0/+16
| * | | | | [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in test_style_select.Andreas Fischer2013-05-271-0/+4
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-0/+14
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'bantu/ticket/11576' into develop-olympusJoas Schilling2013-05-271-0/+14
| |\ \ \ \ \
| | * | | | | [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.Andreas Fischer2013-05-271-0/+14
* | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Merge remote-tracking branch 'bantu/ticket/11575' into develop-olympusJoas Schilling2013-05-271-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |