aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch '3.1.x'Joas Schilling2015-06-043-3/+53
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_post.html
| * | | | | Merge pull request #3558 from javiexin/ticket/13786Joas Schilling2015-06-044-4/+58
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13786] Add events to add MCP post options
| | * | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-05-282-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html Remove extra template variable around the new event. PHPBB3-13786
| | * | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html Fix another typo. PHPBB3-13786
| | * | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html Fix typo. PHPBB3-13786
| | * | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-274-4/+62
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html PHPBB3-13786
* | | | | | Merge branch '3.1.x'Joas Schilling2015-06-047-5/+215
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3502 from marc1706/ticket/13564Joas Schilling2015-06-047-5/+215
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/13564] Unlink user accounts upon deleting user
| | * | | | [ticket/13564] Add tests for unlinking account upon deleting userMarc Alexander2015-04-252-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13564
| | * | | | [ticket/13564] Try to unlink user account for every auth providerMarc Alexander2015-03-242-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13564
| | * | | | [ticket/13564] Use user_id from link_data for unlinking account in oauthMarc Alexander2015-03-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13564
| | * | | | [ticket/13564] Allow to specify user id for retrieving auth link dataMarc Alexander2015-03-243-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13564
* | | | | | Merge pull request #3552 from MateBartus/ticket/13777Nils Adermann2015-05-3115-702/+783
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/13777] Move module management related functionailty into service
| * | | | | | [ticket/13777] Remove module_class_not_defined_exceptionMateBartus2015-05-312-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
| * | | | | | [ticket/13777] Reorder get_module_infos() method's argumentsMateBartus2015-05-315-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
| * | | | | | [ticket/13777] Fix testsMateBartus2015-05-313-38/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
| * | | | | | [ticket/13777] Use module manager in phpBB core filesMateBartus2015-05-314-71/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
| * | | | | | [ticket/13777] Deduplicate migration service definitionsMateBartus2015-05-313-63/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
| * | | | | | [ticket/13777] Move module management into serviceMateBartus2015-05-317-529/+726
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
* | | | | | | Merge branch '3.1.x'Cesar G2015-05-312-2/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13905] Don't load loading.gif until needed.
| * | | | | | Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.xCesar G2015-05-312-2/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/13905: [ticket/13905] Don't load loading.gif until needed.
| | * | | | | | [ticket/13905] Don't load loading.gif until needed.Callum Macrae2015-05-312-2/+6
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | PHPBB3-13905
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-316-96/+218
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Merge pull request #3668 from callumacrae/js-lintingMarc Alexander2015-05-316-96/+218
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/13898] js coding standards
| | * | | | [ticket/13898] Moved jshint and jscs rcs to correct dir.Callum Macrae2015-05-312-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13898
| | * | | | [ticket/13898] Fixed all the forum_fn.js violations I understoodCallum Macrae2015-05-301-25/+37
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13898
| | * | | | [ticket/13898] Allow underscores :(Callum Macrae2015-05-302-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13898
| | * | | | [ticket/13898] 4 spaces, not 2Callum Macrae2015-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13898
| | * | | | [ticket/13898] js coding standaaardsCallum Macrae2015-05-305-70/+181
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13898
* | | | | Merge pull request #3670 from s9e/ticket/8420Marc Alexander2015-05-311-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/8420] Emoticon removes space before itself when using preview
| * | | | | [ticket/8420] Added regression testJoshyPHP2015-05-311-0/+14
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-8420
* | | | | Merge pull request #3592 from Nicofuma/ticket/13388Nils Adermann2015-05-306-10/+157
|\ \ \ \ \ | | | | | | | | | | | | [ticket/13388] Integrate routing and di parameters resolution
| * | | | | [ticket/13388] Fix coding styleTristan Darricau2015-05-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388
| * | | | | [ticket/13388] Fix deprecationsTristan Darricau2015-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388
| * | | | | [ticket/13388] Fix rebaseTristan Darricau2015-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388
| * | | | | [ticket/13388] Address commentsTristan Darricau2015-05-291-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388
| * | | | | [ticket/13388] Integrate routing and di parameters resolutionTristan Darricau2015-05-296-10/+156
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388
* | | | | | 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 docs
| | * | | | | [ticket/13874] Add master to sami API docsNils Adermann2015-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13874
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-304-261/+199
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * | | | | | Merge pull request #3658 from callumacrae/js-refactoring-againMarc Alexander2015-05-305-262/+200
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | JS Refactoring
| | * | | | | | [ticket/13887] Made readable code DRYCallum Macrae2015-05-291-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13887
| | * | | | | | [ticket/13887] Made unreadable code readableCallum Macrae2015-05-291-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13887
| | * | | | | | [ticket/13887] Minor JS refactoringCallum Macrae2015-05-295-58/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13887
| | * | | | | | [ticket/13887] Use correct JSDoc syntaxCallum Macrae2015-05-293-190/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13887
* | | | | | | | Merge pull request #3665 from Nicofuma/ticket/13896Nils Adermann2015-05-301-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix conding style
| * | | | | | | | [ticket/13896] Fix coding styleTristan Darricau2015-05-301-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13896
* | | | | | | | 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] Allow AJAX errors to support exceptions messages
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 20:51:04 +0000