aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-06-043-3/+53
|\
| * Merge pull request #3558 from javiexin/ticket/13786Joas Schilling2015-06-044-4/+58
| |\
| | * [ticket/13786] Add events to add MCP post optionsjaviexin2015-05-282-4/+0
| | * [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| | * [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| | * [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-274-4/+62
* | | Merge branch '3.1.x'Joas Schilling2015-06-044-5/+47
|\ \ \ | |/ /
| * | Merge pull request #3502 from marc1706/ticket/13564Joas Schilling2015-06-044-5/+47
| |\ \
| | * | [ticket/13564] Try to unlink user account for every auth providerMarc Alexander2015-03-241-0/+35
| | * | [ticket/13564] Use user_id from link_data for unlinking account in oauthMarc Alexander2015-03-241-1/+4
| | * | [ticket/13564] Allow to specify user id for retrieving auth link dataMarc Alexander2015-03-243-4/+8
* | | | Merge pull request #3552 from MateBartus/ticket/13777Nils Adermann2015-05-3112-664/+754
|\ \ \ \
| * | | | [ticket/13777] Remove module_class_not_defined_exceptionMateBartus2015-05-312-20/+0
| * | | | [ticket/13777] Reorder get_module_infos() method's argumentsMateBartus2015-05-314-13/+8
| * | | | [ticket/13777] Use module manager in phpBB core filesMateBartus2015-05-314-71/+47
| * | | | [ticket/13777] Deduplicate migration service definitionsMateBartus2015-05-313-63/+5
| * | | | [ticket/13777] Move module management into serviceMateBartus2015-05-317-529/+726
* | | | | Merge branch '3.1.x'Cesar G2015-05-312-2/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.xCesar G2015-05-312-2/+6
| |\ \ \ \
| | * | | | [ticket/13905] Don't load loading.gif until needed.Callum Macrae2015-05-312-2/+6
* | | | | | Merge branch '3.1.x'Marc Alexander2015-05-314-96/+116
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | [ticket/13898] Moved jshint and jscs rcs to correct dir.Callum Macrae2015-05-312-102/+0
| * | | | [ticket/13898] Fixed all the forum_fn.js violations I understoodCallum Macrae2015-05-301-25/+37
| * | | | [ticket/13898] Allow underscores :(Callum Macrae2015-05-302-4/+3
| * | | | [ticket/13898] 4 spaces, not 2Callum Macrae2015-05-301-1/+1
| * | | | [ticket/13898] js coding standaaardsCallum Macrae2015-05-305-70/+181
| |/ / /
* | | | Merge pull request #3592 from Nicofuma/ticket/13388Nils Adermann2015-05-302-7/+125
|\ \ \ \
| * | | | [ticket/13388] Fix coding styleTristan Darricau2015-05-301-0/+1
| * | | | [ticket/13388] Fix deprecationsTristan Darricau2015-05-291-1/+1
| * | | | [ticket/13388] Fix rebaseTristan Darricau2015-05-291-0/+1
| * | | | [ticket/13388] Address commentsTristan Darricau2015-05-291-5/+4
| * | | | [ticket/13388] Integrate routing and di parameters resolutionTristan Darricau2015-05-292-7/+124
* | | | | 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
* | | | | | [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-3019-235/+207
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3020-50/+34
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [ticket/13790] Update phpcsTristan Darricau2015-05-1920-50/+34
* | | | | | Merge pull request #3561 from s9e/ticket/10922Tristan Darricau2015-05-291-2/+13
|\ \ \ \ \ \
| * | | | | | [ticket/10922] Replaced urlencode() with rawurlencode()JoshyPHP2015-04-281-1/+1
| * | | | | | [ticket/10922] Added support for body and subject in email BBCodeJoshyPHP2015-04-281-2/+13
* | | | | | | Merge pull request #3383 from nickvergessen/ticket/9109Tristan Darricau2015-05-293-15/+34
|\ \ \ \ \ \ \