aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Oliver Schramm2015-05-301-0/+1
|\
| * Merge pull request #3638 from naderman/ticket/13874Oliver Schramm2015-05-301-0/+1
| |\
| | * [ticket/13874] Add master to sami API docsNils Adermann2015-05-281-0/+1
* | | Merge branch '3.1.x'Marc Alexander2015-05-304-261/+199
|\ \ \ | |/ /
| * | Merge pull request #3658 from callumacrae/js-refactoring-againMarc Alexander2015-05-305-262/+200
| |\ \
| | * | [ticket/13887] Made readable code DRYCallum Macrae2015-05-291-16/+13
| | * | [ticket/13887] Made unreadable code readableCallum Macrae2015-05-291-14/+12
| | * | [ticket/13887] Minor JS refactoringCallum Macrae2015-05-295-58/+63
| | * | [ticket/13887] Use correct JSDoc syntaxCallum Macrae2015-05-293-190/+128
* | | | Merge pull request #3665 from Nicofuma/ticket/13896Nils Adermann2015-05-301-1/+1
|\ \ \ \
| * | | | [ticket/13896] Fix coding styleTristan Darricau2015-05-301-1/+1
|/ / / /
* | | | Merge branch '3.1.x'Marc Alexander2015-05-301-2/+9
|\ \ \ \ | |/ / /
| * | | Merge pull request #3545 from VSEphpbb/ticket/13771Marc Alexander2015-05-301-2/+9
| |\ \ \
| | * | | [ticket/13771] Only handle valid JQHXR response objectsMatt Friedman2015-05-041-4/+7
| | * | | [ticket/13771] Allow AJAX errors to support exceptions messagesMatt Friedman2015-04-211-1/+5
* | | | | Merge branch '3.1.x'Nils Adermann2015-05-3022-311/+282
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3023-126/+109
| |\ \ \ \
| | * | | | [ticket/13790] Update phpcsTristan Darricau2015-05-1923-126/+109
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-05-291-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-05-291-0/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge pull request #3639 from marc1706/ticket/13875Andreas Fischer2015-05-291-0/+2
| | |\ \ \ \
| | | * | | | [ticket/13875] Ignore cache, ext, and store folder in lint testMarc Alexander2015-05-281-0/+2
| | |/ / / /
* | | | | | Merge pull request #3660 from Nicofuma/ticket/13890Oliver Schramm2015-05-291-0/+12
|\ \ \ \ \ \
| * | | | | | [ticket/13890] Fix di testsTristan Darricau2015-05-291-0/+12
* | | | | | | Merge pull request #3561 from s9e/ticket/10922Tristan Darricau2015-05-293-4/+31
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10922] Added testJoshyPHP2015-04-282-0/+2
| * | | | | | | [ticket/10922] Added test dataJoshyPHP2015-04-282-3/+9
| * | | | | | | [ticket/10922] Added testsJoshyPHP2015-04-282-0/+4
| * | | | | | | [ticket/10922] Replaced urlencode() with rawurlencode()JoshyPHP2015-04-282-2/+2
| * | | | | | | [ticket/10922] Added support for body and subject in email BBCodeJoshyPHP2015-04-283-4/+19
* | | | | | | | Merge pull request #3383 from nickvergessen/ticket/9109Tristan Darricau2015-05-295-15/+181
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/9109] Improve docblock and fix spelling errorsMarc Alexander2015-02-082-2/+3
| * | | | | | | | [ticket/9109] Only query database once in phpbb_get_max_setting_from_groupMarc Alexander2015-02-083-20/+30
| * | | | | | | | [ticket/9109] Properly document and calculate the group settings with value 0Joas Schilling2015-02-085-15/+170
* | | | | | | | | Merge pull request #3613 from nickvergessen/ticket/13844Tristan Darricau2015-05-2921-32/+1265
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13844] Add eventsJoas Schilling2015-05-204-17/+63
| * | | | | | | | | [ticket/13844] Add unit tests for the help managerJoas Schilling2015-05-171-0/+183
| * | | | | | | | | [ticket/13844] Remove hacky code for the help arrayJoas Schilling2015-05-172-15/+4
| * | | | | | | | | [ticket/13844] Fix language file so the tests passJoas Schilling2015-05-163-6/+6
| * | | | | | | | | [ticket/13844] Add a functional test that browses the help pagesJoas Schilling2015-05-161-0/+12
| * | | | | | | | | [ticket/13844] FAQ in new controller formatJoas Schilling2015-05-1612-19/+187
| * | | | | | | | | [ticket/13844] Refactor bbcode help to the new systemJoas Schilling2015-05-165-0/+271
| * | | | | | | | | [ticket/13844] Add new versions of the old help_* filesJoas Schilling2015-05-162-0/+252
| * | | | | | | | | [ticket/13844] Add a little develop script to migrate the filesJoas Schilling2015-05-161-0/+312
* | | | | | | | | | Merge pull request #3616 from s9e/ticket/13847Tristan Darricau2015-05-297-3/+172
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | [ticket/13847] Updated ucp_pm_compose to use utils when forwardingJoshyPHP2015-05-252-2/+19
| * | | | | | | | | [ticket/13847] Updated ucp_pm_compose to use the utils serviceJoshyPHP2015-05-252-1/+19
| * | | | | | | | | [ticket/13847] Changed enquote() logic to use whichever is the shortestJoshyPHP2015-05-252-3/+19
| * | | | | | | | | [ticket/13847] Move quote generation to text_formatter.utilsJoshyPHP2015-05-255-1/+119
* | | | | | | | | | Merge pull request #3622 from s9e/ticket/13860Tristan Darricau2015-05-292-24/+37
|\ \ \ \ \ \ \ \ \ \