Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' | Joas Schilling | 2015-06-04 | 4 | -5/+47 |
|\ | |||||
| * | Merge pull request #3502 from marc1706/ticket/13564 | Joas Schilling | 2015-06-04 | 4 | -5/+47 |
| |\ | | | | | | | | | | [ticket/13564] Unlink user accounts upon deleting user | ||||
| | * | [ticket/13564] Try to unlink user account for every auth provider | Marc Alexander | 2015-03-24 | 1 | -0/+35 |
| | | | | | | | | | | | | PHPBB3-13564 | ||||
| | * | [ticket/13564] Use user_id from link_data for unlinking account in oauth | Marc Alexander | 2015-03-24 | 1 | -1/+4 |
| | | | | | | | | | | | | PHPBB3-13564 | ||||
| | * | [ticket/13564] Allow to specify user id for retrieving auth link data | Marc Alexander | 2015-03-24 | 3 | -4/+8 |
| | | | | | | | | | | | | PHPBB3-13564 | ||||
* | | | Merge pull request #3552 from MateBartus/ticket/13777 | Nils Adermann | 2015-05-31 | 12 | -664/+754 |
|\ \ \ | | | | | | | | | [ticket/13777] Move module management related functionailty into service | ||||
| * | | | [ticket/13777] Remove module_class_not_defined_exception | MateBartus | 2015-05-31 | 2 | -20/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-13777 | ||||
| * | | | [ticket/13777] Reorder get_module_infos() method's arguments | MateBartus | 2015-05-31 | 4 | -13/+8 |
| | | | | | | | | | | | | | | | | PHPBB3-13777 | ||||
| * | | | [ticket/13777] Use module manager in phpBB core files | MateBartus | 2015-05-31 | 4 | -71/+47 |
| | | | | | | | | | | | | | | | | PHPBB3-13777 | ||||
| * | | | [ticket/13777] Deduplicate migration service definitions | MateBartus | 2015-05-31 | 3 | -63/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-13777 | ||||
| * | | | [ticket/13777] Move module management into service | MateBartus | 2015-05-31 | 7 | -529/+726 |
| | | | | | | | | | | | | | | | | PHPBB3-13777 | ||||
* | | | | Merge branch '3.1.x' | Cesar G | 2015-05-31 | 2 | -2/+6 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | * 3.1.x: [ticket/13905] Don't load loading.gif until needed. | ||||
| * | | | Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.x | Cesar G | 2015-05-31 | 2 | -2/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/13905: [ticket/13905] Don't load loading.gif until needed. | ||||
| | * | | | [ticket/13905] Don't load loading.gif until needed. | Callum Macrae | 2015-05-31 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13905 | ||||
* | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-05-31 | 4 | -96/+116 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | [ticket/13898] Moved jshint and jscs rcs to correct dir. | Callum Macrae | 2015-05-31 | 2 | -102/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-13898 | ||||
| * | | | [ticket/13898] Fixed all the forum_fn.js violations I understood | Callum Macrae | 2015-05-30 | 1 | -25/+37 |
| | | | | | | | | | | | | | | | | PHPBB3-13898 | ||||
| * | | | [ticket/13898] Allow underscores :( | Callum Macrae | 2015-05-30 | 2 | -4/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-13898 | ||||
| * | | | [ticket/13898] 4 spaces, not 2 | Callum Macrae | 2015-05-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-13898 | ||||
| * | | | [ticket/13898] js coding standaaards | Callum Macrae | 2015-05-30 | 5 | -70/+181 |
| |/ / | | | | | | | | | | PHPBB3-13898 | ||||
* | | | Merge pull request #3592 from Nicofuma/ticket/13388 | Nils Adermann | 2015-05-30 | 2 | -7/+125 |
|\ \ \ | | | | | | | | | [ticket/13388] Integrate routing and di parameters resolution | ||||
| * | | | [ticket/13388] Fix coding style | Tristan Darricau | 2015-05-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-13388 | ||||
| * | | | [ticket/13388] Fix deprecations | Tristan Darricau | 2015-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-13388 | ||||
| * | | | [ticket/13388] Fix rebase | Tristan Darricau | 2015-05-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-13388 | ||||
| * | | | [ticket/13388] Address comments | Tristan Darricau | 2015-05-29 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | PHPBB3-13388 | ||||
| * | | | [ticket/13388] Integrate routing and di parameters resolution | Tristan Darricau | 2015-05-29 | 2 | -7/+124 |
| | | | | | | | | | | | | | | | | PHPBB3-13388 | ||||
* | | | | Merge branch '3.1.x' | Marc Alexander | 2015-05-30 | 4 | -261/+199 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html | ||||
| * | | | Merge pull request #3658 from callumacrae/js-refactoring-again | Marc Alexander | 2015-05-30 | 5 | -262/+200 |
| |\ \ \ | | | | | | | | | | | | | | | | JS Refactoring | ||||
| | * | | | [ticket/13887] Made readable code DRY | Callum Macrae | 2015-05-29 | 1 | -16/+13 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13887 | ||||
| | * | | | [ticket/13887] Made unreadable code readable | Callum Macrae | 2015-05-29 | 1 | -14/+12 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13887 | ||||
| | * | | | [ticket/13887] Minor JS refactoring | Callum Macrae | 2015-05-29 | 5 | -58/+63 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13887 | ||||
| | * | | | [ticket/13887] Use correct JSDoc syntax | Callum Macrae | 2015-05-29 | 3 | -190/+128 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13887 | ||||
* | | | | | [ticket/13896] Fix coding style | Tristan Darricau | 2015-05-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13896 | ||||
* | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-05-30 | 1 | -2/+9 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3545 from VSEphpbb/ticket/13771 | Marc Alexander | 2015-05-30 | 1 | -2/+9 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13771] Allow AJAX errors to support exceptions messages | ||||
| | * | | | | [ticket/13771] Only handle valid JQHXR response objects | Matt Friedman | 2015-05-04 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13771 | ||||
| | * | | | | [ticket/13771] Allow AJAX errors to support exceptions messages | Matt Friedman | 2015-04-21 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13771 | ||||
* | | | | | | Merge branch '3.1.x' | Nils Adermann | 2015-05-30 | 19 | -235/+207 |
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock | ||||
| * | | | | Merge pull request #3560 from Nicofuma/ticket/13790 | Nils Adermann | 2015-05-30 | 20 | -50/+34 |
| |\ \ \ \ | | |_|/ / | |/| | | | [ticket/13790] Update phpcs | ||||
| | * | | | [ticket/13790] Update phpcs | Tristan Darricau | 2015-05-19 | 20 | -50/+34 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13790 | ||||
* | | | | | Merge pull request #3561 from s9e/ticket/10922 | Tristan Darricau | 2015-05-29 | 1 | -2/+13 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/10922] Added support for body and subject in email BBCode | ||||
| * | | | | | [ticket/10922] Replaced urlencode() with rawurlencode() | JoshyPHP | 2015-04-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC-6068 asks for percent-encoding so that seems more correct. Not sure about that one. PHPBB3-10922 | ||||
| * | | | | | [ticket/10922] Added support for body and subject in email BBCode | JoshyPHP | 2015-04-28 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10922 | ||||
* | | | | | | Merge pull request #3383 from nickvergessen/ticket/9109 | Tristan Darricau | 2015-05-29 | 3 | -15/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Ticket/9109 Properly document and calculate the group settings with value 0 | ||||
| * | | | | | | [ticket/9109] Improve docblock and fix spelling errors | Marc Alexander | 2015-02-08 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9109 | ||||
| * | | | | | | [ticket/9109] Only query database once in phpbb_get_max_setting_from_group | Marc Alexander | 2015-02-08 | 1 | -20/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More test cases have been added, too. PHPBB3-9109 | ||||
| * | | | | | | [ticket/9109] Properly document and calculate the group settings with value 0 | Joas Schilling | 2015-02-08 | 3 | -15/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9109 | ||||
* | | | | | | | Merge pull request #3613 from nickvergessen/ticket/13844 | Tristan Darricau | 2015-05-29 | 19 | -32/+1069 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/13844 Better FAQ language files | ||||
| * | | | | | | | [ticket/13844] Add events | Joas Schilling | 2015-05-20 | 3 | -14/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 | ||||
| * | | | | | | | [ticket/13844] Remove hacky code for the help array | Joas Schilling | 2015-05-17 | 2 | -15/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 |