aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12974] Update nightly build version to 3.2.0-a1-devJoas Schilling2014-08-123-4/+4
| | | | PHPBB3-12974
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-126-37/+197
|\ | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 [prep-release-3.1.0-RC3] Prepare Changelog [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 Conflicts: phpBB/styles/subsilver2/style.cfg
| * [prep-release-3.1.0-RC3] Update phpBB Version for RC4 developmentJoas Schilling2014-08-122-2/+2
| |
| * [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-115-7/+7
| |
* | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-111-14/+14
|\ \ | |/ | | | | | | * develop-ascraeus: [ticket/12970] Regenerate schema.json with new dependencies
| * [ticket/12970] Regenerate schema.json with new dependenciesJoas Schilling2014-08-111-14/+14
| | | | | | | | PHPBB3-12970
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-1113-85/+129
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes Conflicts: phpBB/styles/subsilver2/template/ucp_groups_manage.html phpBB/styles/subsilver2/template/ucp_profile_avatar.html
| * Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-1115-87/+129
| |\ | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| | * [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-077-79/+124
| | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
| | * [ticket/12822] Remove "None" option from avatar select boxesMarc Alexander2014-08-079-8/+5
| | | | | | | | | | | | | | | | | | | | | This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-1130-1221/+1254
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | Merge pull request #2842 from Nicofuma/ticket/11854Marc Alexander2014-08-1130-1221/+1254
| |\ \ | | | | | | | | | | | | [ticket/11854] Move captchas to phpbb/ and use DI for plugins
| | * | [ticket/11854] Don't override get service name in nogdTristan Darricau2014-08-112-9/+1
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Use a set_name method instead of overriding get_service_nameTristan Darricau2014-08-116-27/+46
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Change the error message in reCaptchaTristan Darricau2014-08-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Fix commentsTristan Darricau2014-08-111-4/+5
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Base the migration on rc2Tristan Darricau2014-08-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Fix the factory in \phpbb\auth\provider\dbTristan Darricau2014-08-112-2/+13
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Remove unused globalsTristan Darricau2014-08-111-12/+12
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Remove constants and use DI for QA tablesTristan Darricau2014-08-112-36/+63
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Fix coding styleTristan Darricau2014-08-113-812/+30
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Update the default captcha choosen during the installationTristan Darricau2014-08-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Rename captchas.plugins.service_collection serviceTristan Darricau2014-08-111-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-119-10/+10
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Fix various commentsTristan Darricau2014-08-112-3/+7
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Split phpbb\captcha\gd.phpTristan Darricau2014-08-112-0/+804
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Migrate all old php4 constructorTristan Darricau2014-08-112-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Fix migrationTristan Darricau2014-08-112-6/+7
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Add missing dot in the migration fileTristan Darricau2014-08-111-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Add a migration to update the captcha_plugin settingTristan Darricau2014-08-112-1/+44
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Move captcha stuff to phpbb/ and use DI for pluginsTristan Darricau2014-08-1124-400/+313
| | | | | | | | | | | | | | | | PHPBB3-11854
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-111-1/+22
|\ \ \ \ | |/ / /
| * | | Merge pull request #2845 from rxu/ticket/12942Marc Alexander2014-08-111-1/+22
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12942] Add core.add_form_key core event
| | * | | [ticket/12942] Add core.add_form_key core eventrxu2014-08-111-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.add_form_key core event to allow extensions modifying form key. PHPBB3-12942
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-111-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2867 from prototech/ticket/12967Marc Alexander2014-08-111-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12967] Fix undefined variable phpbb_dispatcher error.
| | * | | | [ticket/12967] Fix undefined variable phpbb_dispatcher error.Cesar G2014-08-111-0/+1
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-12967
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-111-1/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2863 from rxu/ticket/12944Marc Alexander2014-08-111-1/+12
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/12944] Add core.login_forum_box core event
| | * | | [ticket/12944] Add core.login_forum_box core eventrxu2014-08-111-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.login_forum_box core event to allow extensions performing additional actions on forum login. PHPBB3-12944
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-08-101-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Dhruv Goel (1) * develop-ascraeus: [ticket/12964] Correct use of undefined $row variable.
| * | | | Merge pull request #2866 from bantu/ticket/12964Dhruv Goel2014-08-101-2/+2
| |\ \ \ \ | | | | | | | | | | | | [ticket/12964] Correct use of undefined $row variable.
| | * | | | [ticket/12964] Correct use of undefined $row variable.Andreas Fischer2014-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12964
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-101-10/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2864 from rxu/ticket/12931Marc Alexander2014-08-101-10/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12931] Fix general error on user registration
| | * | | | | [ticket/12931] Fix general error on user registrationrxu2014-08-101-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Illegal use of $_SERVER" general error on user registration when $config['server_name'] is not set. PHPBB3-12931
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-103-24/+19
|\ \ \ \ \ \ \ | |/ / / / / /