| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop-ascraeus' into develop | Dhruv | 2014-08-12 | 1 | -0/+18 |
| |\ | | | | | | | | | | | | | | | # By Callum Macrae # Via Callum Macrae (1) and Dhruv Goel (1) * develop-ascraeus: [ticket/12951] Made editorconfig file comments better [ticket/12951] Added editorconfig | ||||
| | * | Merge pull request #2853 from callumacrae/ticket/12951 | Dhruv Goel | 2014-08-12 | 1 | -0/+18 |
| | |\ | | | | | | | [ticket/12951] Added editorconfig | ||||
| | | * | [ticket/12951] Made editorconfig file comments better | Callum Macrae | 2014-08-10 | 1 | -1/+2 |
| | | | | | | | | | | PHPBB3-12951 | ||||
| | | * | [ticket/12951] Added editorconfig | Callum Macrae | 2014-08-09 | 1 | -0/+17 |
| | | | | | | | | | | | | | PHPBB3-12951 | ||||
| * | | | Merge pull request #2871 from nickvergessen/ticket/12974 | Tristan Darricau | 2014-08-12 | 4 | -5/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12974] Update nightly build version to 3.2.0-a1-dev * nickvergessen/ticket/12974: [ticket/12974] Update nightly build version to 3.2.0-a1-dev | ||||
| | * | | | [ticket/12974] Update nightly build version to 3.2.0-a1-dev | Joas Schilling | 2014-08-12 | 4 | -5/+5 |
| |/ / / | | | | | | | | | | PHPBB3-12974 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-08-12 | 7 | -40/+200 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | * | | Merge branch 'prep-release-3.1.0-RC3' into develop-ascraeus | Joas Schilling | 2014-08-12 | 8 | -42/+202 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0-RC3: [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 | ||||
| | | * | | [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development | Joas Schilling | 2014-08-12 | 3 | -5/+5 |
| | | | | | |||||
| | | * | | [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 | Joas Schilling | 2014-08-11 | 1 | -0/+122 |
| | | | | | |||||
| | | * | | [prep-release-3.1.0-RC3] Prepare Changelog | Joas Schilling | 2014-08-11 | 1 | -32/+35 |
| | | | | | |||||
| | | * | | [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 | Joas Schilling | 2014-08-11 | 1 | -0/+35 |
| | | | | | |||||
| | | * | | [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 | Joas Schilling | 2014-08-11 | 6 | -8/+8 |
| | |/ / | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-08-11 | 1 | -14/+14 |
| |\ \ \ | |/ / | | | | | | | | | | * develop-ascraeus: [ticket/12970] Regenerate schema.json with new dependencies | ||||
| | * | | Merge pull request #2870 from nickvergessen/ticket/12970 | Tristan Darricau | 2014-08-11 | 1 | -14/+14 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12970] Regenerate schema.json with new dependencies * nickvergessen/ticket/12970: [ticket/12970] Regenerate schema.json with new dependencies | ||||
| | | * | | [ticket/12970] Regenerate schema.json with new dependencies | Joas Schilling | 2014-08-11 | 1 | -14/+14 |
| | |/ / | | | | | | | | | | PHPBB3-12970 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-08-11 | 1 | -1/+1 |
| |\ \ \ | |/ / | | | | | | | | | | * develop-ascraeus: [ticket/12822] Correctly call \phpbb\user in avatar manager test | ||||
| | * | | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵ | Nils Adermann | 2014-08-11 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Correctly call \phpbb\user in avatar manager test | ||||
| | | * | | [ticket/12822] Correctly call \phpbb\user in avatar manager test | Marc Alexander | 2014-08-11 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | PHPBB3-12822 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-08-11 | 20 | -111/+238 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Adermann | 2014-08-11 | 22 | -113/+238 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Fix test runs of avatar manager_test | Marc Alexander | 2014-08-08 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | | PHPBB3-12822 | ||||
| | | * | | [ticket/12822] Add method for deleting avatars and use confirm_box | Marc Alexander | 2014-08-07 | 14 | -93/+224 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 boxes | Marc Alexander | 2014-08-07 | 10 | -18/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822 | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-08-11 | 32 | -1223/+1272 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml | ||||
| | * | | | Merge pull request #2842 from Nicofuma/ticket/11854 | Marc Alexander | 2014-08-11 | 32 | -1223/+1272 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/11854] Move captchas to phpbb/ and use DI for plugins | ||||
| | | * | | | [ticket/11854] Don't override get service name in nogd | Tristan Darricau | 2014-08-11 | 2 | -9/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Update tests | Tristan Darricau | 2014-08-11 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Use a set_name method instead of overriding get_service_name | Tristan Darricau | 2014-08-11 | 6 | -27/+46 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Change the error message in reCaptcha | Tristan Darricau | 2014-08-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Fix comments | Tristan Darricau | 2014-08-11 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Base the migration on rc2 | Tristan Darricau | 2014-08-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Fix the factory in \phpbb\auth\provider\db | Tristan Darricau | 2014-08-11 | 2 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Remove unused globals | Tristan Darricau | 2014-08-11 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Remove constants and use DI for QA tables | Tristan Darricau | 2014-08-11 | 2 | -36/+63 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Fix coding style | Tristan Darricau | 2014-08-11 | 3 | -812/+30 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Update the default captcha choosen during the installation | Tristan Darricau | 2014-08-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Rename captchas.plugins.service_collection service | Tristan Darricau | 2014-08-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Rename captchas.factory service to captcha.factory | Tristan Darricau | 2014-08-11 | 10 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Fix various comments | Tristan Darricau | 2014-08-11 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Split phpbb\captcha\gd.php | Tristan Darricau | 2014-08-11 | 2 | -0/+804 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Migrate all old php4 constructor | Tristan Darricau | 2014-08-11 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Update unit tests | Tristan Darricau | 2014-08-11 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Fix migration | Tristan Darricau | 2014-08-11 | 2 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Add missing dot in the migration file | Tristan Darricau | 2014-08-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Add a migration to update the captcha_plugin setting | Tristan Darricau | 2014-08-11 | 2 | -1/+44 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| | | * | | | [ticket/11854] Move captcha stuff to phpbb/ and use DI for plugins | Tristan Darricau | 2014-08-11 | 24 | -400/+313 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-08-11 | 1 | -1/+22 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #2845 from rxu/ticket/12942 | Marc Alexander | 2014-08-11 | 1 | -1/+22 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/12942] Add core.add_form_key core event | ||||
| | | * | | | | [ticket/12942] Add core.add_form_key core event | rxu | 2014-08-11 | 1 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.add_form_key core event to allow extensions modifying form key. PHPBB3-12942 | ||||
 |
index : forums | |
| The forums.mageia.org Website | Maat [maat] |
| aboutsummaryrefslogtreecommitdiffstats |