aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Tristan Darricau2015-12-050-0/+0
|\ | | | | | | | | * 3.1.x: [ticket/14334] Use phpbb_get_avatar() in user_loader
| * Merge pull request #4057 from marc1706/ticket/14334Tristan Darricau2015-12-051-6/+1
| |\ | | | | | | | | | | | | | | | | | | [ticket/14334] Use phpbb_get_avatar() in user_loader * marc1706/ticket/14334: [ticket/14334] Use phpbb_get_avatar() in user_loader
| | * [ticket/14334] Use phpbb_get_avatar() in user_loaderMarc Alexander2015-12-031-6/+1
| |/ | | | | | | PHPBB3-14334
* | Merge pull request #4050 from nickvergessen/ticket/14317Tristan Darricau2015-12-052-13/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | Ticket/14317 Update language help files * nickvergessen/ticket/14317: [ticket/14317] Make it easier to change the language iso tag [ticket/14317] Run the script again
| * | [ticket/14317] Make it easier to change the language iso tagJoas Schilling2015-11-281-11/+6
| | | | | | | | | | | | PHPBB3-14317
| * | [ticket/14317] Run the script againJoas Schilling2015-11-281-2/+2
| | | | | | | | | | | | PHPBB3-14317
* | | Merge pull request #4060 from rxu/ticket/14340Tristan Darricau2015-12-051-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14340] Revert fix for segmentation fault error on phpBB 3.2 PHP7 tests * rxu/ticket/14340: [ticket/14340] Revert fix for segmentation fault error on phpBB 3.2 PHP7 tests
| * | | [ticket/14340] Revert fix for segmentation fault error on phpBB 3.2 PHP7 testsrxu2015-12-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix was introduces with #3826, now the PHP core bug has been fixed: https://bugs.php.net/bug.php?id=70249 PHPBB3-14340
* | | | Merge pull request #4061 from JoshyPHP/ticket/9791Tristan Darricau2015-12-052-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9791] Added regression test * JoshyPHP/ticket/9791: [ticket/9791] Added regression test
| * | | | [ticket/9791] Added regression testJoshyPHP2015-12-052-0/+2
| |/ / / | | | | | | | | | | | | PHPBB3-9791
* | | | Merge pull request #4062 from JoshyPHP/ticket/13451Tristan Darricau2015-12-052-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | [ticket/13451] Added regression test * JoshyPHP/ticket/13451: [ticket/13451] Added regression test
| * | | [ticket/13451] Added regression testJoshyPHP2015-12-052-0/+2
|/ / / | | | | | | | | | PHPBB3-13451
* | | Merge pull request #4051 from CHItA/ticket/14311Marc Alexander2015-12-031-1/+43
|\ \ \ | | | | | | | | | | | | [ticket/14311] Show errors in installer invoked by trigger_error
| * | | [ticket/14311] Use the iohandler for notices and warnings if possibleMate Bartus2015-12-011-1/+13
| | | | | | | | | | | | | | | | PHPBB3-14311
| * | | [ticket/14311] Show errors in installer invoked by trigger_errorMate Bartus2015-11-301-1/+31
| |/ / | | | | | | | | | PHPBB3-14311
* | | Merge pull request #4055 from CHItA/ticket/14326Marc Alexander2015-12-032-6/+6
|\ \ \ | | | | | | | | | | | | [ticket/14326] Decode diffed file's content during update
| * | | [ticket/14326] Decode diffed file's content during updateMate Bartus2015-12-022-6/+6
| |/ / | | | | | | | | | PHPBB3-14326
* | | Merge pull request #4053 from CHItA/ticket/14320Marc Alexander2015-12-011-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/14320] Fix language selector in the installer
| * | | [ticket/14320] Fix language selector in the installerMate Bartus2015-11-291-1/+1
| |/ / | | | | | | | | | PHPBB3-14320
* | | Merge pull request #4054 from CHItA/ticket/14325Marc Alexander2015-12-018-437/+423
|\ \ \ | |/ / |/| | | | | [ticket/14325] Preserve event variable BC
| * | [ticket/14325] Fix variable names in docblocksMate Bartus2015-11-302-3/+3
| | | | | | | | | | | | PHPBB3-14325
| * | [ticket/14325] Preserve event variable BCMate Bartus2015-11-308-434/+420
|/ / | | | | | | PHPBB3-14325
* | Merge branch '3.1.x'Marc Alexander2015-11-263-2/+26
|\ \ | |/ | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_group.html
| * Merge pull request #4030 from RMcGirr83/ticket_14283Marc Alexander2015-11-264-3/+27
| |\ | | | | | | | | | [ticket/14283] Add a Manage Group link on a group page
| | * [ticket/14283] Check for user being group leaderRichard McGirr2015-11-251-2/+2
| | | | | | | | | | | | PHPBB3-14283
| | * [ticket/14283] Remove group founder and free up memoryRichard McGirr2015-11-181-9/+13
| | | | | | | | | | | | PHPBB3-14283
| | * [ticket/14283] Fix spelling of the word moduleRichard McGirr2015-11-141-1/+1
| | | | | | | | | | | | PHPBB3-14283
| | * [ticket/14283] Add a Manage Group link on a group pageRichard McGirr2015-11-144-3/+23
| | | | | | | | | | | | PHPBB3-14283
* | | Merge branch '3.1.x'Marc Alexander2015-11-261-1/+1
|\ \ \ | |/ /
| * | Merge pull request #4045 from RMcGirr83/ticket_14313Marc Alexander2015-11-261-1/+1
| |\ \ | | | | | | | | | | | | [ticket/14313] Check for item approved explicitly
| | * | [ticket/14313] Check for item approved explicitlyRichard McGirr2015-11-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14313
* | | | Merge branch '3.1.x'Marc Alexander2015-11-251-0/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #4044 from RMcGirr83/ticket_14313Marc Alexander2015-11-251-0/+3
| |\ \ \ | | |/ / | | | | | | | | [ticket/14313] Don't display quote button on unapproved posts
| | * | [ticket/14313] Don't display quote button on unapproved postsRMcGirr832015-11-251-0/+3
| |/ / | | | | | | | | | PHPBB3-14313
* | | Merge pull request #4034 from hanakin/ticket/14295Marc Alexander2015-11-255-18/+5
|\ \ \ | | | | | | | | | | | | [ticket/14295]Add approval icon
| * | | [ticket/14295]fix report icon as wellMichael Miday2015-11-243-3/+3
| | | | | | | | | | | | | | | | PHPBB3-14295
| * | | [ticket/14295]fix bidiMichael Miday2015-11-241-1/+0
| | | | | | | | | | | | | | | | PHPBB3-14295
| * | | [ticket/14295]missed oneMichael Miday2015-11-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14295
| * | | [ticket/14295]Fix spacingMichael Miday2015-11-241-13/+0
| | | | | | | | | | | | | | | | PHPBB3-14295
| * | | [ticket/14295]Add approval iconMichael Miday2015-11-161-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14295
* | | | Merge pull request #4043 from RMcGirr83/ticket_12649Marc Alexander2015-11-251-12/+0
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/12649] Remove duplicated code from viewforum_body
| * | | | [ticket/12649] Remove duplicated code from viewforum_bodyRMcGirr832015-11-251-12/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12649
* | | | | Merge pull request #4015 from RMcGirr83/ticket_12649Marc Alexander2015-11-2515-118/+100
|\ \ \ \ \ | |/ / / / | | | | | | | | | | [ticket/12649] Change sort & display options in footers to dropdown menu
| * | | | [ticket/12649] Fix buttons css fileRMcGirr832015-11-041-45/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12649
| * | | | [ticket/12649] Restore missing css and fix html fileRMcGirr832015-11-043-1/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-12649
| * | | | Merge remote-tracking branch 'origin/ticket_12649' into ticket_12649RMcGirr832015-11-041-0/+6
| |\ \ \ \
| | * | | | [ticket/12649] Change sort & display options in footers to dropdown menuRichard McGirr2015-11-0117-125/+88
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12649
| * | | | | Merge remote-tracking branch 'origin/ticket_12649' into ticket_12649RMcGirr832015-11-0413-20/+59
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12649
| * | | | | [ticket/12649] Fix bidi.cssRMcGirr832015-11-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12649
| * | | | | [ticket/12649] Change sort & display options in footers to dropdown menuRMcGirr832015-11-0316-121/+85
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12649