aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-221-4/+4
|\ | | | | | | | | * develop-ascraeus: [ticket/13003] Add missing language keys
| * Merge pull request #2899 from Skouat/ticket/13003Andreas Fischer2014-08-221-4/+4
| |\ | | | | | | | | | | | | | | | | | | [ticket/13003] Add missing language keys * Skouat/ticket/13003: [ticket/13003] Add missing language keys
| | * [ticket/13003] Add missing language keysMario Skouat2014-08-211-4/+4
| | | | | | | | | | | | PHPBB3-13003
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-211-12/+12
|\ \ \ | |/ /
| * | [ticket/12990] Use {$var} instead of ${var}Tristan Darricau2014-08-211-12/+12
| |/ | | | | | | PHPBB3-12990
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-2122-29/+142
|\ \ | |/
| * [ticket/12990] Use protected instead of privateTristan Darricau2014-08-171-2/+2
| | | | | | | | PHPBB3-12990
| * [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-1622-29/+142
| | | | | | | | PHPBB3-12990
* | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-161-2/+11
|\ \ | |/ | | | | | | * develop-ascraeus: [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
| * [ticket/12975] Fix the construction of phpbb\auth\provider\db for OauthTristan Darricau2014-08-121-2/+11
| | | | | | | | PHPBB3-12975
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-121-0/+35
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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] Add migration for 3.1.0-RC3Joas Schilling2014-08-111-0/+35
| |
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-115-4/+44
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-115-4/+44
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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-072-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | 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-073-2/+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-1115-14/+5971
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | [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-115-27/+36
| | | | | | | | | | | | 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-111-2/+12
| | | | | | | | | | | | 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-111-30/+48
| | | | | | | | | | | | PHPBB3-11854
| * | [ticket/11854] Fix coding styleTristan Darricau2014-08-113-812/+30
| | | | | | | | | | | | PHPBB3-11854
| * | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-111-1/+1
| | | | | | | | | | | | 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-111-1/+2
| | | | | | | | | | | | 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-111-0/+43
| | | | | | | | | | | | PHPBB3-11854
| * | [ticket/11854] Move captcha stuff to phpbb/ and use DI for pluginsTristan Darricau2014-08-1112-13/+5870
| | | | | | | | | | | | PHPBB3-11854
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-102-3/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12932] Remove set_datetime_class method from user class [ticket/12932] Fix tests and calls to create_datetime [ticket/12932] Add method for getting the datetime class and allow overriding Conflicts: phpBB/config/services.yml
| * | Merge pull request #2862 from marc1706/ticket/12932Joas Schilling2014-08-102-3/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12932] Add method for allowing override of \phpbb\datetime class * marc1706/ticket/12932: [ticket/12932] Remove set_datetime_class method from user class [ticket/12932] Fix tests and calls to create_datetime [ticket/12932] Add method for getting the datetime class and allow overriding
| | * | [ticket/12932] Remove set_datetime_class method from user classMarc Alexander2014-08-101-13/+0
| | | | | | | | | | | | | | | | PHPBB3-12932
| | * | [ticket/12932] Add method for getting the datetime class and allow overridingMarc Alexander2014-08-102-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | An extension can now override the datetime class by overwriting the datetime.class parameter in their own yml file. PHPBB3-12932
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-105-5/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/12956] Ensure the contact columns have been added before using them
| * | | Merge pull request #2858 from nickvergessen/ticket/12956Andreas Fischer2014-08-105-5/+10
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | [ticket/12956] Ensure the contact columns have been added before using t... * nickvergessen/ticket/12956: [ticket/12956] Ensure the contact columns have been added before using them
| | * | [ticket/12956] Ensure the contact columns have been added before using themJoas Schilling2014-08-105-5/+10
| | | | | | | | | | | | | | | | PHPBB3-12956
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-101-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/12794] Properly validate google+ field against valid character set
| * | | Merge pull request #2836 from marc1706/ticket/12794Joas Schilling2014-08-101-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12794] Properly validate google+ field against valid character set * marc1706/ticket/12794: [ticket/12794] Properly validate google+ field against valid character set
| | * | | [ticket/12794] Properly validate google+ field against valid character setMarc Alexander2014-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12794
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-1010-3/+111
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression
| * | | | Merge pull request #2837 from Geolim4/ticket/12671Joas Schilling2014-08-1010-3/+111
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/12671 Possibility to use NOT LIKE expression * Geolim4/ticket/12671: [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression
| | * | | | [ticket/12671] Possibility to use NOT LIKE expressionGeolim42014-08-092-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12671
| | * | | | [ticket/12671] Possibility to use NOT LIKE expressionGeolim42014-08-092-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12671
| | * | | | [ticket/12671] Possibility to use NOT LIKE expressionGeolim42014-08-082-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12671
| | * | | | [ticket/12671] Possibility to use NOT LIKE expressionGeolim42014-08-089-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12671
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-19 20:20:44 +0000