Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' | Oliver Schramm | 2015-05-30 | 1 | -0/+1 |
|\ | |||||
| * | Merge pull request #3638 from naderman/ticket/13874 | Oliver Schramm | 2015-05-30 | 1 | -0/+1 |
| |\ | |||||
| | * | [ticket/13874] Add master to sami API docs | Nils Adermann | 2015-05-28 | 1 | -0/+1 |
* | | | Merge branch '3.1.x' | Marc Alexander | 2015-05-30 | 4 | -261/+199 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #3658 from callumacrae/js-refactoring-again | Marc Alexander | 2015-05-30 | 5 | -262/+200 |
| |\ \ | |||||
| | * | | [ticket/13887] Made readable code DRY | Callum Macrae | 2015-05-29 | 1 | -16/+13 |
| | * | | [ticket/13887] Made unreadable code readable | Callum Macrae | 2015-05-29 | 1 | -14/+12 |
| | * | | [ticket/13887] Minor JS refactoring | Callum Macrae | 2015-05-29 | 5 | -58/+63 |
| | * | | [ticket/13887] Use correct JSDoc syntax | Callum Macrae | 2015-05-29 | 3 | -190/+128 |
* | | | | Merge pull request #3665 from Nicofuma/ticket/13896 | Nils Adermann | 2015-05-30 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | [ticket/13896] Fix coding style | Tristan Darricau | 2015-05-30 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | 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] Only handle valid JQHXR response objects | Matt Friedman | 2015-05-04 | 1 | -4/+7 |
| | * | | | [ticket/13771] Allow AJAX errors to support exceptions messages | Matt Friedman | 2015-04-21 | 1 | -1/+5 |
* | | | | | Merge branch '3.1.x' | Nils Adermann | 2015-05-30 | 22 | -311/+282 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3560 from Nicofuma/ticket/13790 | Nils Adermann | 2015-05-30 | 23 | -126/+109 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13790] Update phpcs | Tristan Darricau | 2015-05-19 | 23 | -126/+109 |
* | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-05-29 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '3.0.x' into 3.1.x | Andreas Fischer | 2015-05-29 | 1 | -0/+2 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Merge pull request #3639 from marc1706/ticket/13875 | Andreas Fischer | 2015-05-29 | 1 | -0/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | [ticket/13875] Ignore cache, ext, and store folder in lint test | Marc Alexander | 2015-05-28 | 1 | -0/+2 |
| | |/ / / / | |||||
* | | | | | | Merge pull request #3660 from Nicofuma/ticket/13890 | Oliver Schramm | 2015-05-29 | 1 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [ticket/13890] Fix di tests | Tristan Darricau | 2015-05-29 | 1 | -0/+12 |
* | | | | | | | Merge pull request #3561 from s9e/ticket/10922 | Tristan Darricau | 2015-05-29 | 3 | -4/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ticket/10922] Added test | JoshyPHP | 2015-04-28 | 2 | -0/+2 |
| * | | | | | | | [ticket/10922] Added test data | JoshyPHP | 2015-04-28 | 2 | -3/+9 |
| * | | | | | | | [ticket/10922] Added tests | JoshyPHP | 2015-04-28 | 2 | -0/+4 |
| * | | | | | | | [ticket/10922] Replaced urlencode() with rawurlencode() | JoshyPHP | 2015-04-28 | 2 | -2/+2 |
| * | | | | | | | [ticket/10922] Added support for body and subject in email BBCode | JoshyPHP | 2015-04-28 | 3 | -4/+19 |
* | | | | | | | | Merge pull request #3383 from nickvergessen/ticket/9109 | Tristan Darricau | 2015-05-29 | 5 | -15/+181 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | [ticket/9109] Improve docblock and fix spelling errors | Marc Alexander | 2015-02-08 | 2 | -2/+3 |
| * | | | | | | | | [ticket/9109] Only query database once in phpbb_get_max_setting_from_group | Marc Alexander | 2015-02-08 | 3 | -20/+30 |
| * | | | | | | | | [ticket/9109] Properly document and calculate the group settings with value 0 | Joas Schilling | 2015-02-08 | 5 | -15/+170 |
* | | | | | | | | | Merge pull request #3613 from nickvergessen/ticket/13844 | Tristan Darricau | 2015-05-29 | 21 | -32/+1265 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | [ticket/13844] Add events | Joas Schilling | 2015-05-20 | 4 | -17/+63 |
| * | | | | | | | | | [ticket/13844] Add unit tests for the help manager | Joas Schilling | 2015-05-17 | 1 | -0/+183 |
| * | | | | | | | | | [ticket/13844] Remove hacky code for the help array | Joas Schilling | 2015-05-17 | 2 | -15/+4 |
| * | | | | | | | | | [ticket/13844] Fix language file so the tests pass | Joas Schilling | 2015-05-16 | 3 | -6/+6 |
| * | | | | | | | | | [ticket/13844] Add a functional test that browses the help pages | Joas Schilling | 2015-05-16 | 1 | -0/+12 |
| * | | | | | | | | | [ticket/13844] FAQ in new controller format | Joas Schilling | 2015-05-16 | 12 | -19/+187 |
| * | | | | | | | | | [ticket/13844] Refactor bbcode help to the new system | Joas Schilling | 2015-05-16 | 5 | -0/+271 |
| * | | | | | | | | | [ticket/13844] Add new versions of the old help_* files | Joas Schilling | 2015-05-16 | 2 | -0/+252 |
| * | | | | | | | | | [ticket/13844] Add a little develop script to migrate the files | Joas Schilling | 2015-05-16 | 1 | -0/+312 |
* | | | | | | | | | | Merge pull request #3616 from s9e/ticket/13847 | Tristan Darricau | 2015-05-29 | 7 | -3/+172 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | [ticket/13847] Updated ucp_pm_compose to use utils when forwarding | JoshyPHP | 2015-05-25 | 2 | -2/+19 |
| * | | | | | | | | | [ticket/13847] Updated ucp_pm_compose to use the utils service | JoshyPHP | 2015-05-25 | 2 | -1/+19 |
| * | | | | | | | | | [ticket/13847] Changed enquote() logic to use whichever is the shortest | JoshyPHP | 2015-05-25 | 2 | -3/+19 |
| * | | | | | | | | | [ticket/13847] Move quote generation to text_formatter.utils | JoshyPHP | 2015-05-25 | 5 | -1/+119 |
* | | | | | | | | | | Merge pull request #3622 from s9e/ticket/13860 | Tristan Darricau | 2015-05-29 | 2 | -24/+37 |
|\ \ \ \ \ \ \ \ \ \ |