aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3671 from marc1706/ticket/9563Tristan Darricau2015-06-061-1/+13
|\ | | | | | | [ticket/9563] Do not show empty categories on index
| * [ticket/9563] Do not show empty categories on indexMarc Alexander2015-05-311-1/+13
| | | | | | | | PHPBB3-9563
* | Merge pull request #3680 from marc1706/ticket/13917Tristan Darricau2015-06-061-2/+14
|\ \ | | | | | | | | | [ticket/13917] Use hash_equals() if possible in password driver helper
| * | [ticket/13917] Do not pass non-string variables to hash_equals()Marc Alexander2015-06-041-2/+8
| | | | | | | | | | | | PHPBB3-13917
| * | [ticket/13917] Use hash_equals() if it's availableMarc Alexander2015-06-041-0/+6
| | | | | | | | | | | | PHPBB3-13917
* | | Merge pull request #3681 from marc1706/ticket/13200Tristan Darricau2015-06-0615-25/+25
|\ \ \ | | | | | | | | | | | | [ticket/13200] Disable autocomplete for sensitive input fields
| * | | [ticket/13200] Disable autocomplete for sensitive input fieldsMarc Alexander2015-06-0415-25/+25
| |/ / | | | | | | | | | PHPBB3-13200
* | | Merge pull request #3684 from CHItA/ticket/13841Marc Alexander2015-06-051-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/13841] Fix tests on 3.1 and master branch
| * | | [ticket/13841] Fix tests on 3.1 and master branchCHItA2015-06-051-1/+1
|/ / / | | | | | | | | | PHPBB3-13841
* | | Merge pull request #3611 from Alf007/ticket/13841Joas Schilling2015-06-041-1/+22
|\ \ \ | | | | | | | | | | | | Ticket/13841
| * | | [ticket/13841] Add core event on functions_admin for topics movealf0072015-05-301-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event added for the function move_topics() in includes/functions_admin.php, so that you can insert any extension's table(s) to be updated when topics are moved between forums Added parameters topic_ids, forum_id, forum_ids and auto_sync PHPBB3-13841
| * | | Merge pull request #1 from phpbb/develop-ascraeusalf0072015-05-25256-885/+4741
| |\ \ \ | | | | | | | | | | Develop ascraeus
* | \ \ \ Merge pull request #3567 from javiexin/ticket/13795Joas Schilling2015-06-041-23/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13795] Modify core event in posting to include poll data
| * | | | | [ticket/13795] Modify core event in posting to include poll datajaviexin2015-05-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the core.posting_modify_template_vars event in posting.php to extend the content of the page_data array to include poll data. That required moving the event and merging the new set of template vars. Also include the poll variable in the parameter list for event core.posting_modify_submission_errors, as it was missing, and any modification here on post_data for poll related data is silently ignored. Added correct @change tags to both events. PHPBB3-13795
| * | | | | [ticket/13795] Modify core event in posting to include poll datajaviexin2015-05-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the core.posting_modify_template_vars event in posting.php to extend the content of the page_data array to include poll data. That required moving the event and merging the new set of template vars. Also include the poll variable in the parameter list for event core.posting_modify_submission_errors, as it was missing, and any modification here on post_data for poll related data is silently ignored. PHPBB3-13795
| * | | | | [ticket/13795] Modify core event in posting to include poll datajaviexin2015-04-291-23/+25
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the core.posting_modify_template_vars event in posting.php to extend the content of the page_data array to include poll data. That required moving the event and merging the new set of template vars. PHPBB3-13795
* | | | | 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 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 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 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 #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 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 #3545 from VSEphpbb/ticket/13771Marc Alexander2015-05-301-2/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13771] Allow AJAX errors to support exceptions messages
| * | | | | | [ticket/13771] Only handle valid JQHXR response objectsMatt Friedman2015-05-041-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13771
| * | | | | | [ticket/13771] Allow AJAX errors to support exceptions messagesMatt Friedman2015-04-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13771
* | | | | | | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3023-126/+109
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/13790] Update phpcs
| * | | | | | | [ticket/13790] Update phpcsTristan Darricau2015-05-1923-126/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13790
* | | | | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-05-291-0/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0.x: [ticket/13875] Ignore cache, ext, and store folder in lint test Conflicts: tests/lint_test.php
| * | | | | | | Merge pull request #3639 from marc1706/ticket/13875Andreas Fischer2015-05-291-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13875] Ignore cache, ext, and store folder in lint test * marc1706/ticket/13875: [ticket/13875] Ignore cache, ext, and store folder in lint test
| | * | | | | | | [ticket/13875] Ignore cache, ext, and store folder in lint testMarc Alexander2015-05-281-0/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13875
* | | | | | | | Merge pull request #3640 from callumacrae/ticket/13876Marc Alexander2015-05-281-1/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13876] Use webfontloader asyncronously.