aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15726] Implement selective purge in APCu cache driverv12mike2018-09-162-0/+0
| | | | | | fix file permissions PHPBB3-15726
* [ticket/15726] Implement selective purge in APCu cache driverv12mike2018-09-161-5/+4
| | | | | | Fix whitespace PHPBB3-15726
* [ticket/15726] Implement selective purge in APCu cache driverv12mike2018-09-162-1/+22
| | | | | | | | | | | | | | | The current APCu cache driver implements a global clearing of the APCu when the phpBB cache is purged. This is inappropriate if there are other phpBB boards, or other php applications sharing the APCu cache. This patch changes the behviour so that only cache entries matching the key_prefix of this board are cleared by a phpBB cache purge. The APCu unit test script has been updated to test this behaviour. It has also been updated so that the test case can be run individually previously it relied on initialisations made in other test scripts. PHPBB3-15726
* Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-07-181-134/+193
|\
| * Merge pull request #5232 from marc1706/ticket/15677Marc Alexander2018-07-181-134/+193
| |\ | | | | | | | | | [ticket/15677] Update symfony to 2.8.42, others to latest
| | * [ticket/15677] Updates for Symfony 2.8.42Marc Alexander2018-07-081-55/+54
| | | | | | | | | | | | PHPBB3-15677
| | * [ticket/15677] Update symfony to 2.8.41, others to latestMarc Alexander2018-07-081-128/+188
| | | | | | | | | | | | PHPBB3-15677
* | | Merge branch 'prep-release-3.2.3' into 3.2.xTristan Darricau2018-07-080-0/+0
|\ \ \ | |/ / | | | | | | * prep-release-3.2.3:
| * | Merge pull request #5238 from avijc/ticket/15680Tristan Darricau2018-07-081-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | [ticket/15680] Point to 3.2 documentation * github.com:/phpbb/phpbb: [ticket/15680] Point to 3.2 documentation
* | | Merge pull request #5238 from avijc/ticket/15680Tristan Darricau2018-07-081-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | [ticket/15680] Point to 3.2 documentation * github.com:/phpbb/phpbb: [ticket/15680] Point to 3.2 documentation
| * | [ticket/15680] Point to 3.2 documentationAnssi Johansson2018-06-051-1/+1
| | | | | | | | | | | | | | | | | | The old link pointed to 3.1 documentation PHPBB3-15680
* | | Merge pull request #5239 from avijc/ticket/15683Tristan Darricau2018-07-081-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15683] Better error message when commit message has CRLF * github.com:/phpbb/phpbb: [ticket/15683] Better error message when commit message has CRLF
| * | | [ticket/15683] Better error message when commit message has CRLFAnssi Johansson2018-06-051-0/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When someone tries to do a pull request with incorrect line breaks in the commit message, the error message as given by Travis is "Unexpected EOF encountered". The error message should be clearer that CR/LF was the problem. This change adds a separate check for CRLF line endings. PHPBB3-15683
* | | Merge pull request #5244 from OxCom/ticket/15678Tristan Darricau2018-07-081-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15678] Fix build and cache flow for container * github.com:/phpbb/phpbb: [ticket/15678] Fix build and cache flow for container
| * | | [ticket/15678] Fix build and cache flow for containerAndrii Afanasiev2018-06-152-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. During procedure of building container we have to check both required files in cache: container_* and autoload_*. This files should be "fresh" and if one of the does not exist then we have to build it and put into a cache one more time. 2. Fix typo 'posic_getuid' does not exist, so $php_uid is alwasy was false. PHPBB3-15678
* | | | Merge pull request #5249 from senky/ticket/15659Tristan Darricau2018-07-082-0/+106
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15659] Fix retrieve_block_vars() * github.com:/phpbb/phpbb: [ticket/15659] Fix retrieve_block_vars()
| * | | | [ticket/15659] Fix retrieve_block_vars()Jakub Senko2018-07-072-0/+106
| | | | | | | | | | | | | | | | | | | | PHPBB3-15659
* | | | | Merge pull request #5250 from senky/ticket/15666Tristan Darricau2018-07-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15666] Language system is not fully supported in Twig * github.com:/phpbb/phpbb: [ticket/15666] Fix array key in twig lang() call
| * | | | | [ticket/15666] Fix array key in twig lang() callJakub Senko2018-06-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15666
* | | | | Merge pull request #5252 from senky/ticket/15674Tristan Darricau2018-07-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15674] Edit language lines in file en\acp\profile.php * github.com:/phpbb/phpbb: [ticket/15674] Improve CPF lang descriptions
| * | | | | [ticket/15674] Improve CPF lang descriptionsJakub Senko2018-06-191-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15674
* | | | | Merge pull request #5253 from senky/ticket/15618Tristan Darricau2018-07-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15618] Display The team link only to users with permission * github.com:/phpbb/phpbb: [ticket/15618] Display The team link only to users with permission
| * | | | | [ticket/15618] Display The team link only to users with permissionJakub Senko2018-06-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15618
* | | | | Merge pull request #5254 from senky/ticket/15620Tristan Darricau2018-07-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15620] Use separate local avatar cache file for every lang * github.com:/phpbb/phpbb: [ticket/15620] Use separate local avatar cache file for every lang
| * | | | | [ticket/15620] Use separate local avatar cache file for every langJakub Senko2018-06-181-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15620
* | | | | Merge pull request #5256 from senky/ticket/13043Tristan Darricau2018-07-0811-38/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13043] Improve HTML5 * github.com:/phpbb/phpbb: [ticket/13043] Improve HTML5
| * | | | | [ticket/13043] Improve HTML5Jakub Senko2018-06-1811-38/+16
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13043
* | | | | Merge pull request #5257 from senky/ticket/15651Tristan Darricau2018-07-081-4/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15651] Remove unnecessary condition * github.com:/phpbb/phpbb: [ticket/15651] Remove unnecessary condition
| * | | | | [ticket/15651] Remove unnecessary conditionJakub Senko2018-06-181-4/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | module.remove internally check if the module exists PHPBB3-15651
* | | | | Merge pull request #5258 from senky/ticket/15628Tristan Darricau2018-07-081-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15628] Add topic link to newtopic_notify.txt * github.com:/phpbb/phpbb: [ticket/15628] Add topic link to newtopic_notify.txt
| * | | | | [ticket/15628] Add topic link to newtopic_notify.txtJakub Senko2018-06-191-0/+4
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15628
* | | | | Merge pull request #5260 from senky/ticket/15696Tristan Darricau2018-07-082-1/+137
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15696] 'if' module tool should support calling other tools * github.com:/phpbb/phpbb: [ticket/15696] Add tests [ticket/15696] Add support of other tools to 'if'
| * | | | | [ticket/15696] Add testsJakub Senko2018-07-051-0/+136
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15696
| * | | | | [ticket/15696] Add support of other tools to 'if'Jakub Senko2018-06-191-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15696
* | | | | Merge pull request #5261 from senky/ticket/15670Tristan Darricau2018-07-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15670] Group forum permission: Can see forum gives NO SQL ERROR * github.com:/phpbb/phpbb: [ticket/15670] Fix SQL error when !f_list_topics and f_read
| * | | | | [ticket/15670] Fix SQL error when !f_list_topics and f_readJakub Senko2018-06-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15670
* | | | | Merge pull request #5262 from senky/ticket/15606Tristan Darricau2018-07-081-5/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15606] Hide viewprofile link when unavailable * github.com:/phpbb/phpbb: [ticket/15606] Hide viewprofile link when unavailable
| * | | | | [ticket/15606] Hide viewprofile link when unavailableJakub Senko2018-06-181-5/+7
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15606
* | | | | Merge pull request #5269 from 3D-I/ticket/15705Tristan Darricau2018-07-081-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15705] fix phpbbcli language vs PHP * github.com:/phpbb/phpbb: [ticket/15705] fix phpbbcli language vs PHP
| * | | | | [ticket/15705] fix phpbbcli language vs PHP3D-I2018-06-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15705
* | | | | | Merge pull request #5277 from ghostal/ticket/15717Tristan Darricau2018-07-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15717] Using correct variable for log entry * github.com:/phpbb/phpbb: [ticket/15717] Using correct variable for log entry
| * | | | | | [ticket/15717] Using correct variable for log entryAlex Miles2018-07-041-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-15717
* | | | | | Merge pull request #5278 from hubaishan/ticket/15673Tristan Darricau2018-07-081-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15673] Fix Duplicated links in QuickLinks and main nav bar * github.com:/phpbb/phpbb: [ticket/15673] Fix Duplicated links in QuickLinks and main nav bar
| * | | | | | [ticket/15673] Fix Duplicated links in QuickLinks and main nav barhubaishan2018-07-041-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add required class to common.css PHPBB3-15673
* | | | | | Merge pull request #5198 from kasimi/ticket/15637Tristan Darricau2018-07-083-3/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15637] Extract multi-line PHP event descriptions * github.com:/phpbb/phpbb: [ticket/15637] Remove trailing space from description [ticket/15637] Preserve line breaks in event descriptions [ticket/15637] Updated test fixture to include complete event description [ticket/15637] Remove trailing space from description [ticket/15637] Fixed removing white-spaces from description line [ticket/15637] Extract all lines before the first @tag [ticket/15637] Extract multi-line PHP event descriptions
| * | | | | | [ticket/15637] Remove trailing space from descriptionkasimi2018-07-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15637
| * | | | | | [ticket/15637] Preserve line breaks in event descriptionskasimi2018-07-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15637
| * | | | | | [ticket/15637] Updated test fixture to include complete event descriptionkasimi2018-07-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15637
| * | | | | | [ticket/15637] Remove trailing space from descriptionkasimi2018-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15637
| * | | | | | [ticket/15637] Fixed removing white-spaces from description linekasimi2018-07-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15637