aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12993] Fix includes of functions_displayTristan Darricau2014-08-194-4/+10
* [ticket/12993] Rename to phpbb_get_user_rankTristan Darricau2014-08-187-12/+29
* [ticket/12993] Fix user_loader and memberlistTristan Darricau2014-08-182-2/+2
* [ticket/12993] Improve get_user_ranksForumhulp.com2014-08-185-15/+31
* Merge pull request #2886 from Oyabun1/ticket/12984Andreas Fischer2014-08-171-2/+2
|\
| * [ticket/12984] Remove blank line when no forum description shownOyabun12014-08-171-2/+2
* | Merge pull request #2881 from rxu/ticket/12986Andreas Fischer2014-08-171-3/+2
|\ \
| * | [ticket/12986] Fix detection of common words in searchrxu2014-08-171-3/+2
* | | Merge pull request #2872 from Nicofuma/ticket/12975Andreas Fischer2014-08-162-2/+12
|\ \ \ | |_|/ |/| |
| * | [ticket/12975] Fix the construction of phpbb\auth\provider\db for OauthTristan Darricau2014-08-122-2/+12
* | | Merge pull request #2876 from PayBas/ticket/12900Marc Alexander2014-08-143-1/+8
|\ \ \
| * | | [ticket/12900] Fix potential avatar size box overflowPayBas2014-08-133-1/+8
| | |/ | |/|
* | | Merge remote-tracking branch 'PayBas/ticket/12856' into develop-ascraeusCesar G2014-08-134-3/+3
|\ \ \ | |/ / |/| |
| * | [ticket/12856] Remove images from assets/plupload/img/PayBas2014-08-133-0/+0
| * | [ticket/12856] Copy plupload images to prosilver dirPayBas2014-08-134-3/+3
|/ /
* | Merge pull request #2853 from callumacrae/ticket/12951Dhruv Goel2014-08-121-0/+18
|\ \ | |/ |/|
| * [ticket/12951] Made editorconfig file comments betterCallum Macrae2014-08-101-1/+2
| * [ticket/12951] Added editorconfigCallum Macrae2014-08-091-0/+17
* | Merge branch 'prep-release-3.1.0-RC3' into develop-ascraeusJoas Schilling2014-08-128-42/+202
|\ \
| * | [prep-release-3.1.0-RC3] Update phpBB Version for RC4 developmentJoas Schilling2014-08-123-5/+5
| * | [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3Joas Schilling2014-08-111-0/+122
| * | [prep-release-3.1.0-RC3] Prepare ChangelogJoas Schilling2014-08-111-32/+35
| * | [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3Joas Schilling2014-08-111-0/+35
| * | [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3Joas Schilling2014-08-116-8/+8
|/ /
* | Merge pull request #2870 from nickvergessen/ticket/12970Tristan Darricau2014-08-111-14/+14
|\ \
| * | [ticket/12970] Regenerate schema.json with new dependenciesJoas Schilling2014-08-111-14/+14
|/ /
* | Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascr...Nils Adermann2014-08-111-1/+1
|\ \
| * | [ticket/12822] Correctly call \phpbb\user in avatar manager testMarc Alexander2014-08-111-1/+1
|/ /
* | Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascr...Nils Adermann2014-08-1122-113/+238
|\ \
| * | [ticket/12822] Fix test runs of avatar manager_testMarc Alexander2014-08-081-4/+11
| * | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-0714-93/+224
| * | [ticket/12822] Remove "None" option from avatar select boxesMarc Alexander2014-08-0710-18/+5
* | | Merge pull request #2842 from Nicofuma/ticket/11854Marc Alexander2014-08-1132-1223/+1272
|\ \ \
| * | | [ticket/11854] Don't override get service name in nogdTristan Darricau2014-08-112-9/+1
| * | | [ticket/11854] Update testsTristan Darricau2014-08-111-1/+3
| * | | [ticket/11854] Use a set_name method instead of overriding get_service_nameTristan Darricau2014-08-116-27/+46
| * | | [ticket/11854] Change the error message in reCaptchaTristan Darricau2014-08-111-1/+1
| * | | [ticket/11854] Fix commentsTristan Darricau2014-08-111-4/+5
| * | | [ticket/11854] Base the migration on rc2Tristan Darricau2014-08-111-1/+1
| * | | [ticket/11854] Fix the factory in \phpbb\auth\provider\dbTristan Darricau2014-08-112-2/+13
| * | | [ticket/11854] Remove unused globalsTristan Darricau2014-08-111-12/+12
| * | | [ticket/11854] Remove constants and use DI for QA tablesTristan Darricau2014-08-112-36/+63
| * | | [ticket/11854] Fix coding styleTristan Darricau2014-08-113-812/+30
| * | | [ticket/11854] Update the default captcha choosen during the installationTristan Darricau2014-08-111-1/+1
| * | | [ticket/11854] Rename captchas.plugins.service_collection serviceTristan Darricau2014-08-111-2/+2
| * | | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-1110-11/+11
| * | | [ticket/11854] Fix various commentsTristan Darricau2014-08-112-3/+7
| * | | [ticket/11854] Split phpbb\captcha\gd.phpTristan Darricau2014-08-112-0/+804
| * | | [ticket/11854] Migrate all old php4 constructorTristan Darricau2014-08-112-3/+3
| * | | [ticket/11854] Update unit testsTristan Darricau2014-08-111-1/+15