Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | | | | [ticket/13844] Fix language file so the tests pass | Joas Schilling | 2015-05-16 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 | ||||
| * | | | | | | [ticket/13844] FAQ in new controller format | Joas Schilling | 2015-05-16 | 12 | -19/+187 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 | ||||
| * | | | | | | [ticket/13844] Refactor bbcode help to the new system | Joas Schilling | 2015-05-16 | 5 | -0/+271 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 | ||||
| * | | | | | | [ticket/13844] Add new versions of the old help_* files | Joas Schilling | 2015-05-16 | 2 | -0/+252 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 | ||||
| * | | | | | | [ticket/13844] Add a little develop script to migrate the files | Joas Schilling | 2015-05-16 | 1 | -0/+312 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 | ||||
* | | | | | | | Merge pull request #3616 from s9e/ticket/13847 | Tristan Darricau | 2015-05-29 | 4 | -3/+65 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13847] Move quote generation to text_formatter.utils | ||||
| * | | | | | | | [ticket/13847] Updated ucp_pm_compose to use utils when forwarding | JoshyPHP | 2015-05-25 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13847 | ||||
| * | | | | | | | [ticket/13847] Updated ucp_pm_compose to use the utils service | JoshyPHP | 2015-05-25 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...when quoting a post PHPBB3-13847 | ||||
| * | | | | | | | [ticket/13847] Changed enquote() logic to use whichever is the shortest | JoshyPHP | 2015-05-25 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will enclose attribute values in single- or double- quotes depending on whichever requires the least escaping. Characters that need to be escaped are always escaped regardless. PHPBB3-13847 | ||||
| * | | | | | | | [ticket/13847] Move quote generation to text_formatter.utils | JoshyPHP | 2015-05-25 | 3 | -1/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13847 | ||||
* | | | | | | | | Merge pull request #3622 from s9e/ticket/13860 | Tristan Darricau | 2015-05-29 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13860] Fixed array-to-string conversion |