aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-191-2/+2
|\ | | | | | | | | * 3.1.x: [ticket/14806] Fix ACP test emails authentication failure
| * Merge pull request #4734 from rxu/ticket/14806Tristan Darricau2017-03-191-2/+2
| |\ | | | | | | | | | | | | | | | | | | [ticket/14806] Fix ACP test emails authentication failure * github.com:phpbb/phpbb: [ticket/14806] Fix ACP test emails authentication failure
| | * [ticket/14806] Fix ACP test emails authentication failurerxu2017-03-111-2/+2
| | | | | | | | | | | | PHPBB3-14806
* | | Merge branch 'ticket/14928' into 3.2.xTristan Darricau2017-03-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/14928: [ticket/14928] fixing valid stability %s
| * | | [ticket/14928] fixing valid stability %sRishabh04-022017-03-191-1/+1
|/ / / | | | | | | | | | PHPBB3-14928
* | | Merge pull request #4736 from rubencm/ticket/15123Tristan Darricau2017-03-193-0/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15123] Check if extension was enabled/disabled before enable or disable * rubencm/ticket/15123: [ticket/15123] modified return error codes [ticket/15123] modified language strings [ticket/15123] modified language string [ticket/15123] removed blank spaces [ticket/15123] add check before enable or disable extension
| * | | [ticket/15123] modified return error codesRubén Calvo2017-03-132-2/+2
| | | | | | | | | | | | | | | | PHPBB3-15123
| * | | [ticket/15123] modified language stringsRubén Calvo2017-03-133-4/+4
| | | | | | | | | | | | | | | | PHPBB3-15123
| * | | [ticket/15123] modified language stringRubén Calvo2017-03-133-4/+4
| | | | | | | | | | | | | | | | PHPBB3-15123
| * | | [ticket/15123] removed blank spacesRubén Calvo2017-03-132-2/+2
| | | | | | | | | | | | | | | | PHPBB3-15123
| * | | [ticket/15123] add check before enable or disable extensionRubén Calvo2017-03-133-0/+16
| | | | | | | | | | | | | | | | PHPBB3-15123
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-191-0/+134
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * 3.1.x: [ticket/15122] Add cache driver for memcached
| * | | Merge pull request #4737 from marc1706/ticket/15122Tristan Darricau2017-03-191-0/+134
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15122] Add cache driver for memcached * marc1706/ticket/15122: [ticket/15122] Add cache driver for memcached
| | * | | [ticket/15122] Add cache driver for memcachedMarc Alexander2017-03-121-0/+134
| | | |/ | | |/| | | | | | | | | PHPBB3-15122
* | | | Merge pull request #4740 from rubencm/ticket/14974Tristan Darricau2017-03-192-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14974] Make cookie notice configurable via language files * rubencm/ticket/14974: [ticket/14974] make cookie notice configurable via language files
| * | | | [ticket/14974] make cookie notice configurable via language filesRubén Calvo2017-03-132-1/+3
| | |_|/ | |/| | | | | | | | | | PHPBB3-14974
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-194-1/+54
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13558] Change options prefix and add settings precautions. [ticket/13558] Make SSL context specific options more SMTP general [ticket/13558] Add smtp SSL context configuration options
| * | | Merge pull request #4745 from rxu/ticket/13558Tristan Darricau2017-03-194-1/+54
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13558] Add smtp SSL context configuration options * rxu/ticket/13558: [ticket/13558] Change options prefix and add settings precautions. [ticket/13558] Make SSL context specific options more SMTP general [ticket/13558] Add smtp SSL context configuration options
| | * | | [ticket/13558] Change options prefix and add settings precautions.rxu2017-03-194-16/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-13558
| | * | | [ticket/13558] Make SSL context specific options more SMTP generalrxu2017-03-181-12/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-13558
| | * | | [ticket/13558] Add smtp SSL context configuration optionsrxu2017-03-174-0/+54
| | | |/ | | |/| | | | | | | | | PHPBB3-13558
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-192-2/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/14844] Add CSS classes for strong and italics text to BBCodes
| * | | Merge pull request #4749 from marc1706/ticket/14844Tristan Darricau2017-03-192-2/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14844] Add CSS classes for strong and italics text to BBCodes * marc1706/ticket/14844: [ticket/14844] Add CSS classes for strong and italics text to BBCodes
| | * | | [ticket/14844] Add CSS classes for strong and italics text to BBCodesMarc Alexander2017-03-192-2/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-14844
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-03-191-15/+47
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4578 from javiexin/ticket/14849Marc Alexander2017-03-191-15/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14849] Add core.acp_extensions_run_action
| | * | | | [ticket/14849] Add core.acp_extensions_run_actionjaviexin2017-02-191-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename event to core.acp_extensions_run_action_before PHPBB-14849
| | * | | | [ticket/14849] Add core.acp_extensions_run_actionjaviexin2016-12-301-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the event to a slightly modified position. Added an extra variable to the event. Additional event to be run after the execution of the action in ACP. Added a new action to allow for extension execution control. PHPBB-14849
| | * | | | [ticket/14849] Add core.acp_extensions_run_action_afterjaviexin2016-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional event to be run after the execution of the action in ACP. Adding missing var as input to event. PHPBB-14849
| | * | | | [ticket/14849] Add core.acp_extensions_run_action_afterjaviexin2016-12-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional event to be run after the execution of the action in ACP PHPBB-14849
| | * | | | [ticket/14849] Add core.acp_extensions_run_actionjaviexin2016-12-111-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the event to a slightly modified position to perform common checks before calling the event, added an extra variable to allow execution control, honor the extension modified value of u_action (if any) PHPBB-14849
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-03-192-57/+33
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4703 from javiexin/ticket/15011Marc Alexander2017-03-192-57/+33
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/15011] All errors on metadata throw exceptions
| | * | | | Merge branch '3.1.x' into ticket/15011javiexin2017-02-1580-409/+914
| | |\ \ \ \
| | * | | | | [ticket/15011] All errors on metadata throw exceptionsjaviexin2017-02-152-47/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is inconsistency in the way error are treated in metadata_manager. Some method return false on error, others throw exception. With this, the usage is homogeneus, and the uses of these are also adapted. Using same ticket as it is the same issue, solved in a different way. PHPBB3-15011
* | | | | | | Merge pull request #4742 from JoshyPHP/ticket/15126Marc Alexander2017-03-191-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15126] Disable HTML entities in quote helper
| * | | | | | | [ticket/15126] Disable HTML entities in quote helperJoshyPHP2017-03-151-2/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | PHPBB3-15126
* | | | | | | Merge pull request #4738 from rxu/ticket/15124Marc Alexander2017-03-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15124] Hide navbar icon titles in repsonsive view
| * | | | | | | [ticket/15124] Hide navbar icon titles in repsonsive viewrxu2017-03-131-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-15124
* | | | | | | Merge pull request #4695 from marc1706/ticket/15083Marc Alexander2017-03-192-0/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15083] Fix invalid emoji sizing in ACP & print view
| * | | | | | | [ticket/15083] Add stylelint exceptions for admin.cssMarc Alexander2017-03-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15083
| * | | | | | | [ticket/15083] Add stylelint definitionsMarc Alexander2017-02-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15083
| * | | | | | | [ticket/15083] Fix invalid emoji sizing in ACP & print viewMarc Alexander2017-02-112-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15083
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-03-193-0/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4743 from rubencm/ticket/14820Marc Alexander2017-03-193-0/+9
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | [ticket/14820] Add style version in ACP
| | * | | | | [ticket/14820] Add style version in ACPRubén Calvo2017-03-163-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14820
* | | | | | | Merge pull request #4729 from vinny/ticket/15118Marc Alexander2017-03-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15118] Fix html error in jumpbox.html
| * | | | | | | [ticket/15118] Fix html error in jumpbox.htmlVinny2017-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15118
* | | | | | | | Merge pull request #4696 from marc1706/ticket/14979Marc Alexander2017-03-081-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14979] Do not display underline for unread icon
| * | | | | | | | [ticket/14979] Use hanakin's CSS versionMarc Alexander2017-02-191-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14979