aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15050] Use new file when new file already existsMarc Alexander2017-01-251-25/+46
| | | | | | | | | | Instead of trying to diff the new file against a pre-existing file, we're just going to use the new file. It's impossible to know whether the pre-existing file is newer or older than the new file. As the system will rely on the files being in the "new" state it's better to simply use the file in "new" state. PHPBB3-15050
* Use SSL in version check for extensiontas25802017-01-221-1/+1
| | | | PHPBB3-15025
* Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-221-0/+43
|\ | | | | | | | | | | | | | | * 3.1.x: [ticket/14968] Use earlier version as written in comment [ticket/14968] Update docblock and ensure method returns array [ticket/14968] Display possible upgrade on acp index and update page [ticket/14968] Add method for retrieving updates on current branch
| * [ticket/14968] Update docblock and ensure method returns arrayMarc Alexander2017-01-221-4/+8
| | | | | | | | PHPBB3-14968
| * [ticket/14968] Add method for retrieving updates on current branchMarc Alexander2017-01-221-0/+39
| | | | | | | | PHPBB3-14968
* | [ticket/15015] Use correct explain string for enable email settingsMarc Alexander2017-01-221-1/+1
| | | | | | | | PHPBB3-15015
* | 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
| * [ticket/15011] Output meaningful errors when validating all metadataMarc Alexander2017-01-151-2/+12
| | | | | | | | PHPBB3-15011
* | Merge pull request #4631 from JoshyPHP/ticket/14985Tristan Darricau2017-01-152-15/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | [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] 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 #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-151-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15008] Disable emoji when smilies are disabled
| * | | | [ticket/15008] Disable emoji when smilies are disabledJoshyPHP2017-01-141-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | [ticket/15010] Fix incorrect use of requestRichard McGirr2017-01-141-1/+1
|/ / / | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15010 PHPBB3-15010
* | | 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-081-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | [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] Fix pagination PHP warning on PHP 7.1rxu2017-01-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14971
* | | | [ticket/14967] Add cookie notice migration fixing invalid previous oneMarc Alexander2017-01-081-0/+36
|/ / / | | | | | | | | | PHPBB3-14967
* | | [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-071-0/+40
| | |
* | | Merge pull request #4618 from marc1706/ticket/14961Marc Alexander2017-01-071-0/+31
|\ \ \ | | | | | | | | | | | | [ticket/14961] Add cookie notice as enablable feature
| * | | [ticket/14961] Add cookie notice as enablable featureMarc Alexander2017-01-061-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses Insites cookieconsent v3.0.3: https://cookieconsent.insites.com PHPBB3-14961
* | | | Merge pull request #4619 from Nicofuma/ticket/14962Marc Alexander2017-01-072-5/+26
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14962] Introduces a new helper to check emptyness of bbcode texts
| * | | | [ticket/14962] Introduces a new helper to check emptyness of bbcode textsTristan Darricau2017-01-062-5/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-14962
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-061-2/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #4613 from rxu/ticket/14958Marc Alexander2017-01-061-2/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14958] Optimize Twig extension lang() function
| | * | | | [ticket/14958] Optimize Twig extension lang() functionrxu2017-01-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14958
* | | | | | Merge pull request #4617 from marc1706/ticket/14949Marc Alexander2017-01-061-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14949] Pass full notification array and post data for updating
| * | | | | | [ticket/14949] Pass full notification array and post data for updatingMarc Alexander2017-01-051-1/+7
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | PHPBB3-14949
* | | | | | [ticket/14946] Make sure to pass integers to max()Marc Alexander2017-01-041-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-14946
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-041-9/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4595 from DavidIQ/ticket/14941Marc Alexander2017-01-041-9/+16
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/14941] Apply changes individually for MySQL fulltext search
| | * | | [ticket/14941] Apply changes individually for MySQL fulltext searchDavid Colón2016-12-271-9/+16
| | | | |
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-047-11/+35
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4611 from marc1706/ticket/14838Marc Alexander2017-01-047-11/+35
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [icket/14838] Do not query full attachments table in feeds
| | * | | | [ticket/14838] Remove obsolete overriding methodMarc Alexander2017-01-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14838
| | * | | | [ticket/14838] Do not query full attachments table in feedsMarc Alexander2017-01-037-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fetch_attachments() will also now throw a runtime exception if a feed tries to do this nonetheless. PHPBB3-14838
* | | | | | [ticket/14957] Make sure config_php_file is set before injectingMarc Alexander2017-01-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14957
* | | | | | Merge branch 'ticket/14957' into ticket/14957-rheaMarc Alexander2017-01-031-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/14957] Do not use method return in write contextMarc Alexander2017-01-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for PHP 5.3.x compatibility. PHPBB3-14957
* | | | | | Merge branch 'ticket/14957' into ticket/14957-rheaMarc Alexander2017-01-032-6/+32
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | [ticket/14957] Do not cache database config entriesMarc Alexander2017-01-032-6/+13
| |/ / / | | | | | | | | | | | | PHPBB3-14957
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-12-301-4/+4
|\ \ \ \ | |/ / /
| * | | Merge pull request #4597 from javiexin/ticket/14943Tristan Darricau2016-12-301-4/+4
| |\ \ \ | | |/ / | |/| | | | | | [ticket/14943] Fix template loop access by index