aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15023] Remove all prev RWD and add newhanakin2017-01-161-9/+10
| | | | PHPBB3-15023
* [ticket/15023] Remove unnessecary left-box classhanakin2017-01-161-1/+3
| | | | | | no longer nessecary after this fix PHPPB3-15023
* [ticket/15023] undo previous changeshanakin2017-01-162-12/+1
| | | | PHPBB3-15023
* Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-151-2/+12
|\ | | | | | | | | * 3.1.x: [ticket/15011] Output meaningful errors when validating all metadata
| * Merge pull request #4651 from marc1706/ticket/15011Tristan Darricau2017-01-151-2/+12
| |\ | | | | | | | | | | | | | | | | | | [ticket/15011] Output meaningful errors when validating all metadata * marc1706/ticket/15011: [ticket/15011] Output meaningful errors when validating all metadata
| | * [ticket/15011] Output meaningful errors when validating all metadataMarc Alexander2017-01-151-2/+12
| | | | | | | | | | | | PHPBB3-15011
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-152-3/+3
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/11076] State current and minimum required versions in old PHP notice
| * | Merge pull request #4649 from marc1706/ticket/11076Tristan Darricau2017-01-152-3/+3
| |\ \ | | |/ | |/| | | | | | | | | | | | | [ticket/11076] State current and minimum required versions in old PHP notice * marc1706/ticket/11076: [ticket/11076] State current and minimum required versions in old PHP notice
| | * [ticket/11076] State current and minimum required versions in old PHP noticeMarc Alexander2017-01-152-3/+3
| |/ | | | | | | PHPBB3-11076
* | Merge pull request #4648 from JoshyPHP/ticket/15016Marc Alexander2017-01-155-8/+58
|\ \ | | | | | | | | | [ticket/15016] Fixed an issue with some parentheses in smilies
| * | [ticket/15016] Fixed an issue with some parentheses in smiliesJoshyPHP2017-01-155-8/+58
| | | | | | | | | | | | PHPBB3-15016
* | | Merge pull request #4632 from VSEphpbb/ticket/14989Tristan Darricau2017-01-153-0/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14989] Allow more admin-configurable schemes in post links * VSEphpbb/ticket/14989: [ticket/14989] Allow more admin-configurable schemes in post links
| * | | [ticket/14989] Allow more admin-configurable schemes in post linksMatt Friedman2017-01-113-0/+50
| | | | | | | | | | | | | | | | PHPBB3-14989
* | | | Merge pull request #4631 from JoshyPHP/ticket/14985Tristan Darricau2017-01-154-15/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14985] Decode HTML special chars in plain text columns * JoshyPHP/ticket/14985: [ticket/14985] Added functional tests for BBCodes and smilies [ticket/14985] Decode HTML special chars in plain text columns
| * | | | [ticket/14985] Added functional tests for BBCodes and smiliesJoshyPHP2017-01-122-0/+89
| | | | | | | | | | | | | | | | | | | | PHPBB3-14985
| * | | | [ticket/14985] Decode HTML special chars in plain text columnsJoshyPHP2017-01-122-15/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-14985
* | | | | [ticket/15011] Fix 3.2.x mergeTristan Darricau2017-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15011
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-151-1/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * 3.1.x: [ticket/15011] Error not checked on metadata load failure
| * | | | Merge pull request #4646 from javiexin/ticket/15011Tristan Darricau2017-01-151-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15011] Error not checked on metadata load failure * javiexin/ticket/15011: [ticket/15011] Error not checked on metadata load failure
| | * | | | [ticket/15011] Error not checked on metadata load failurejaviexin2017-01-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15011
* | | | | | Merge pull request #4630 from hubaishan/ticket/14984Tristan Darricau2017-01-151-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14984] Correct wrong arrow direction in PM inbox * hubaishan/ticket/14984: [ticket/14984] Correct wrong arrow direction in PM inbox
| * | | | | | [ticket/14984] Correct wrong arrow direction in PM inboxhubaishan2017-01-102-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | icons.css change is needed for RTL, becouse inherit float is right PHPBB3-14984
* | | | | | | Merge pull request #4640 from JimMH/patch-3Tristan Darricau2017-01-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15002] Show topic icons in search results * JimMH/patch-3: [ticket/15002] Show topic icons in search results
| * | | | | | | [ticket/15002] Show topic icons in search resultsJim Mossing Holsteyn2017-01-131-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #4638 from VSEphpbb/ticket/14999Tristan Darricau2017-01-151-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14999] Correct Next PM Iconography * VSEphpbb/ticket/14999: [ticket/14999] Correct Next PM Iconography
| * | | | | | | [ticket/14999] Correct Next PM IconographyMatt Friedman2017-01-121-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14999
* | | | | | | Merge pull request #4647 from marc1706/ticket/15012Tristan Darricau2017-01-151-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15012] Use valid constructor in ftp_file_updater * marc1706/ticket/15012: [ticket/15012] Use valid constructor in ftp_file_updater
| * | | | | | [ticket/15012] Use valid constructor in ftp_file_updaterMarc Alexander2017-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15012
* | | | | | | Merge pull request #4643 from JoshyPHP/ticket/15008Marc Alexander2017-01-154-0/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15008] Disable emoji when smilies are disabled
| * | | | | | | [ticket/15008] Disable emoji when smilies are disabledJoshyPHP2017-01-144-0/+22
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will effectively disable emoji shortname and won't replace emoji with images but will not prevent a browser or OS from displaying emoji as images. PHPBB3-15008
* | | | | | | Merge pull request #4645 from rmcgirr83/ticket/15010Marc Alexander2017-01-151-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | [ticket/15010] Fix incorrect use of request
| * | | | | | [ticket/15010] Fix incorrect use of requestRichard McGirr2017-01-141-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15010 PHPBB3-15010
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-143-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge pull request #4641 from VSEphpbb/ticket/15003Marc Alexander2017-01-145-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15003] Do not check disabled checkboxes with marklist function
| | * | | | [ticket/15003] Do not check disabled checkboxes with marklist functionMatt Friedman2017-01-135-5/+5
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15003
* | | | | Merge pull request #4625 from Nicofuma/ticket/14973Marc Alexander2017-01-081-0/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14973] Add BC layer for \phpbb\db\tools
| * | | | | [ticket/14973] Add BC layer for \phpbb\db\toolsTristan Darricau2017-01-081-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14973
* | | | | | Merge pull request #4623 from rxu/ticket/14971Tristan Darricau2017-01-082-1/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14971] Fix pagination PHP warning on PHP 7.1 * rxu/ticket/14971: [ticket/14971] Add on_page test with the string arguments [ticket/14971] Fix pagination PHP warning on PHP 7.1
| * | | | | [ticket/14971] Add on_page test with the string argumentsrxu2017-01-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14971
| * | | | | [ticket/14971] Fix pagination PHP warning on PHP 7.1rxu2017-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14971
* | | | | | Merge pull request #4621 from marc1706/ticket/14967Tristan Darricau2017-01-081-0/+36
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14967] Add cookie notice migration fixing invalid previous one * marc1706/ticket/14967: [ticket/14967] Add cookie notice migration fixing invalid previous one
| * | | | | [ticket/14967] Add cookie notice migration fixing invalid previous oneMarc Alexander2017-01-081-0/+36
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-14967
* | | | | [3.2.x] Update development version to 3.2.1-devMarc Alexander2017-01-073-5/+5
| | | | |
* | | | | Merge branch 'prep-release-3.2.0' into 3.2.xMarc Alexander2017-01-0710-16/+56
|\ \ \ \ \
| * | | | | [prep-release-3.2.0] Fix links to convertorMarc Alexander2017-01-071-7/+7
| | | | | |
| * | | | | [prep-release-3.2.0] Correctly compare extensions versionMarc Alexander2017-01-072-2/+2
| | | | | |
| * | | | | [prep-release-3.2.0] Update version numbers and add 3.2.0 migrationMarc Alexander2017-01-077-7/+47
|/ / / / /
* | | | | Merge pull request #4618 from marc1706/ticket/14961Marc Alexander2017-01-0710-3/+74
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14961] Add cookie notice as enablable feature
| * | | | | [ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2Marc Alexander2017-01-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14961
| * | | | | [ticket/14961] Also translate "learn more" linkMarc Alexander2017-01-062-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14961