aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge pull request #4346 from lavigor/ticket/14661Marc Alexander2016-06-081-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14661] Fix a typo in twig.php
| | * | | | | [ticket/14661] Fix a typo in twig.phplavigor2016-06-051-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-14661
* | | | | | [prep-release-3.2.0-RC1] Add migrationTristan Darricau2016-06-191-0/+40
| | | | | |
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-081-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | [ticket/14664] Fix PHPDoc comment in cron managerlavigor2016-06-071-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-14664
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-271-2/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/phpbb/notification/manager.php
| * | | [ticket/11446] Make get_notification_type_ids work with string tooJakub Senko2016-05-271-2/+7
| | | | | | | | | | | | | | | | PHPBB3-11446
| * | | [ticket/11446] Use sql_in_set properly in phpbb_notification_managerJakub Senko2016-05-231-12/+10
| |/ / | | | | | | | | | PHPBB3-11446
* | | [ticket/14648] Remove whitespace at the end of a lineMark Shaw2016-05-251-1/+1
| | | | | | | | | | | | PHPBB3-14648
* | | [ticket/14648] Fix bug where default notifications stop working if another ↵Mark Shaw2016-05-251-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | setting is set. When a new user signs up, they have an email preference set but no board notification preference set. The default board preference should work. Also when a user checks the email box for any notification preference, the default board preference should still work. PHPBB3-14648
* | | Merge pull request #4325 from DavidIQ/ticket/14591Marc Alexander2016-05-241-3/+3
|\ \ \ | | | | | | | | | | | | [ticket/14591] Use the correct delimiter for MSSQL
| * | | [ticket/14591] Use the correct delimiter for MSSQLDavid Colón2016-05-181-3/+3
| | | | | | | | | | | | PHPBB3-14591
* | | | [ticket/14645] Language pack not reconised when using a symlinkPaul Sohier2016-05-211-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Symfony finder does not follow symlinks by default. With this change it does, so a user is able to have the language pack outside the phpBB directory, and linked with a symlink into phpBB/language/ PHPBB3-14645
* | | Merge pull request #4315 from Nicofuma/ticket/14628Marc Alexander2016-05-161-4/+5
|\ \ \ | | | | | | | | | | | | [ticket/14628] Supports translatable error messages in the CLI installer
| * | | [ticket/14628] Supports translatable error messages in the CLI installerTristan Darricau2016-05-051-4/+5
| | | | | | | | | | | | | | | | PHPBB3-14628
* | | | [ticket/14595] Added smtp_port where places where smtp_host exists.Derek Held2016-05-143-0/+12
| | | | | | | | | | | | | | | | PHPBB3-14595
* | | | [ticket/14595] Added SMTP port to getConfigTreeBuilderDerek Held2016-05-141-0/+3
| | | | | | | | | | | | | | | | PHPBB3-14595
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-121-5/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | [ticket/14610] Implement lavigor methodRichard McGirr2016-05-091-10/+9
| | | | | | | | | | | | PHPBB3-14610
| * | [ticket/14610] Remove whitespaceRichard McGirr2016-05-081-1/+1
| | | | | | | | | | | | PHPBB3-14610
| * | [ticket/14610] Don't log an error if the Q&A captcha has been solvedRichard McGirr2016-05-081-0/+5
| |/ | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14610 PHPBB3-14610
* | [ticket/14607] Add missing auto_increment to report_idMarc Alexander2016-05-011-0/+45
| | | | | | | | PHPBB3-14607
* | Merge branch 'prep-release-3.2.0-b2' into 3.2.xTristan Darricau2016-04-281-0/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | * prep-release-3.2.0-b2: [prep-release-3.2.0-b2] Add schema.json [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2 [prep-release-3.2.0-b2] Add migration for 3.2.0-b2 [prep-release-3.2.0-b2] Update version to 3.2.0-b2
| * | [prep-release-3.2.0-b2] Add migration for 3.2.0-b2Tristan Darricau2016-03-031-0/+40
| | |
* | | Merge pull request #4286 from VSEphpbb/ticket/14569Marc Alexander2016-04-235-131/+48
|\ \ \ | | | | | | | | | | | | [ticket/14569] Extract CLI progress bar creation to a method
| * | | [ticket/14569] Extract CLI progress bar creation to a methodMatt Friedman2016-04-125-131/+48
| | | | | | | | | | | | | | | | PHPBB3-14569
* | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-04-161-0/+36
|\ \ \ \ | | |_|/ | |/| |
| * | | [prep-release-3.1.9] Add migration for 3.1.9Joas Schilling2016-04-161-0/+36
| | | |
* | | | [ticket/14589] Fix @var usageMáté Bartus2016-04-132-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14589
* | | | Merge pull request #4236 from Nicofuma/ticket/13616Máté Bartus2016-04-134-23/+17
|\ \ \ \ | | | | | | | | | | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
| * | | | [ticket/13616] Fix CS + constant in the core extensionTristan Darricau2016-04-031-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13616
| * | | | [ticket/13616] Fix UI testsTristan Darricau2016-04-031-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13616
| * | | | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexerTristan Darricau2016-04-033-23/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-13616
* | | | | Merge pull request #4284 from CHItA/ticket/14589Tristan Darricau2016-04-121-2/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14589] Add error messages for failable installer requirements * CHItA/ticket/14589: [ticket/14589] Fix grammatical errors in language strings [ticket/14589] Add error messages for failable installer requirements
| * | | | [ticket/14589] Add error messages for failable installer requirementsMáté Bartus2016-04-101-2/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-14589
* | | | | [ticket/14590] Prevent refresh requests after the last tasks in modulesMáté Bartus2016-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14590
* | | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-04-091-0/+36
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | [prep-release-3.1.9] Add migration for 3.1.9-RC1Joas Schilling2016-04-091-0/+36
| | | |
| * | | Merge pull request #4256 from Nicofuma/ticket/13683Marc Alexander2016-04-071-2/+12
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13683] Respects force_server_vars settings when generating URLs
* | \ \ \ Merge pull request #4258 from Nicofuma/ticket/13683-3.2.xMarc Alexander2016-04-072-10/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13683] Respects force_server_vars settings when generating URLs
| * \ \ \ \ Merge branch 'ticket/13683' into ticket/13683-3.2.xTristan Darricau2016-04-031-9/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13683: [ticket/13683] Fix CS
| | * | | | | [ticket/13683] Fix CSTristan Darricau2016-04-031-12/+11
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-13683
| | * | | | [ticket/13683] Removes extra / in script_pathTristan Darricau2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| | * | | | [ticket/13683] Updates testsTristan Darricau2016-03-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| | * | | | [ticket/13683] Fix more casesTristan Darricau2016-03-291-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| | * | | | [ticket/13683] Respects force_server_vars settings when generating URLsTristan Darricau2016-03-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| * | | | | [ticket/13683] Removes extra / in script_pathTristan Darricau2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13683
| * | | | | [ticket/13683] Fix merge into 3.2.xTristan Darricau2016-03-291-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13683
* | | | | | [ticket/14198] Use the build option to calculate the container cache filenameTristan Darricau2016-04-041-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14198
* | | | | | Merge pull request #4248 from VSEphpbb/ticket/14561Tristan Darricau2016-04-034-13/+605
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14561] Add more user commands * VSEphpbb/ticket/14561: [ticket/14561] Remove requires for functions in tests [ticket/14561] Small change to progress bar output [ticket/14561] Fix function docblock in activate command [ticket/14561] Add a progress bar to reclean command [ticket/14561] Use the user loader where appropriate [ticket/14561] Add extra help explaining reclean command [ticket/14561] Import classes with use statements [ticket/14561] Remove unused use statements [ticket/14561] Refactor tests [ticket/14561] Reclean usernames command [ticket/14561] User activate command [ticket/14561] User delete command