aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/16221] Fix ACP statistics layout3D-I2019-12-252-2/+8
| | | | | | Resolve conflicts PHPBB3-16221
* [ticket/16221] Fix ACP statistics layout3D-I2019-12-241-2/+2
| | | | PHPBB3-16221
* [ticket/16221] Fix ACP statistics layout3D-I2019-12-242-54/+64
| | | | PHPBB3-16221
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-241-2/+2
|\
| * Merge pull request #5784 from 3D-I/ticket/15902Marc Alexander2019-12-241-2/+2
| |\ | | | | | | | | | [ticket/15902] Out of range error with Sphinx search
| | * [ticket/15902] Out of range error with Sphinx search3D-I2019-12-241-1/+1
| | | | | | | | | | | | | | | | | | Add missing modification. PHPBB3-15902
| | * [ticket/15902] Out of range error with Sphinx search3D-I2019-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The reporter he's waiting this fix to be in the core. I created this PR based on trusting his report. I can't test it. PHPBB3-15902
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-241-1/+1
|\ \ \ | |/ /
| * | Merge pull request #5785 from 3D-I/ticket/16257Marc Alexander2019-12-241-1/+1
| |\ \ | | |/ | |/| | | | [ticket/16257] Typo in SMTP_SERVER_EXPLAIN
| | * [ticket/16257] Typo in SMTP_SERVER_EXPLAIN3D-I2019-12-241-1/+1
| |/ | | | | | | PHPBB3-16257
* | Merge pull request #5782 from marc1706/ticket/16263Marc Alexander2019-12-231-0/+5
|\ \ | | | | | | | | | [ticket/16263] Ensure that remove_email_hash depends on migration adding hash
| * | [ticket/16263] Ensure that remove_email_hash depends on migration adding hashMarc Alexander2019-12-231-0/+5
|/ / | | | | | | PHPBB3-16263
* | Merge pull request #5779 from 3D-I/ticket/16260Marc Alexander2019-12-231-4/+7
|\ \ | | | | | | | | | [ticket/16260] Missing check whether the index exists in ACP - PHP 7.4
| * | [ticket/16260] Missing check whether the index exists in ACP - PHP 7.43D-I2019-12-221-10/+7
| | | | | | | | | | | | PHPBB3-16260
| * | [ticket/16260] Missing check whether the index exists in ACP - PHP 7.43D-I2019-12-221-7/+11
| | | | | | | | | | | | PHPBB3-16260
| * | [ticket/16260] Missing check whether the index exists in ACP - PHP 7.43D-I2019-12-211-4/+6
| | | | | | | | | | | | PHPBB3-16260
* | | Merge pull request #5781 from marc1706/ticket/16263Marc Alexander2019-12-221-40/+40
|\ \ \ | | | | | | | | | | | | [ticket/16263] Do not expect numbers as strings in apache provider test
| * | | [ticket/16263] Do not expect numbers as strings in apache provider testMarc Alexander2019-12-221-40/+40
| |/ / | | | | | | | | | PHPBB3-16263
* | | Merge pull request #5780 from 3D-I/ticket/16261Marc Alexander2019-12-221-1/+1
|\ \ \ | |/ / |/| | | | | [ticket/16261] Missing check whether the index exists in install - PHP 7.4
| * | [ticket/16261] Missing check whether the index exists in install - PHP 7.43D-I2019-12-221-1/+1
|/ / | | | | | | PHPBB3-16261
* | [3.3.x] Update version numbers to 3.3.0-RC2-devMarc Alexander2019-12-213-4/+4
| |
* | Merge branch 'prep-release-3.3.0-RC1' into 3.3.xMarc Alexander2019-12-218-7/+74
|\ \
| * | [prep-release-3.3.0-RC1] Update changelog for 3.3.0-RC1Marc Alexander2019-12-211-0/+31
| | |
| * | [prep-release-3.3.0-RC1] Add migration for 3.3.0-RC1Marc Alexander2019-12-211-0/+36
| | |
| * | [prep-release-3.3.0-RC1] Update version numbers to 3.3.0-RC1Marc Alexander2019-12-212-3/+3
| | |
| * | [prep-release-3.3.0-RC1] Update version numbers to 3.3.0-RC1Marc Alexander2019-12-214-4/+4
|/ /
* | Merge pull request #5770 from JoshyPHP/ticket/16250Marc Alexander2019-12-217-5/+262
|\ \ | | | | | | | | | [ticket/16250] Add a service to check BBCodes safeness in ACP
| * | [ticket/16250] Reworked status as constantsJoshyPHP2019-12-163-13/+29
| | | | | | | | | | | | PHPBB3-16250
| * | [ticket/16250] Add a service to check BBCodes safenessJoshyPHP2019-12-137-5/+246
| | | | | | | | | | | | PHPBB3-16250
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-211-2/+2
|\ \ \ | | |/ | |/|
| * | Merge pull request #5777 from KYPREO/ticket/16258Marc Alexander2019-12-211-2/+2
| |\ \ | | | | | | | | | | | | [ticket/16258] Fix sample Sphinx configuration file
| | * | [ticket/16258] Fix sample Sphinx configuration fileKYPREO2019-12-171-2/+2
| |/ / | | | | | | | | | PHPBB3-16258
* | | Merge pull request #5769 from hanakin/ticket/16248Marc Alexander2019-12-2117-4/+20
|\ \ \ | | | | | | | | | | | | [ticket/16248] swap logo for new svg version
| * | | [ticket/16248] stupid lack of standards are stupidhanakin2019-12-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16248
| * | | [ticket/16248] add quotes to langhanakin2019-12-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16248
| * | | [ticket/16248] Convert to twighanakin2019-12-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16248
| * | | [ticket/16248] fix logo in acphanakin2019-12-082-2/+8
| | | | | | | | | | | | | | | | PHPBB3-16248
| * | | [ticket/16248] loaaaad svg old way for BChanakin2019-12-074-6/+11
| | | | | | | | | | | | | | | | PHPBB3-16248
| * | | [ticket/16248] Remove all unused theme/imageshanakin2019-12-0710-0/+0
| | | | | | | | | | | | | | | | PHPBB3-16248
| * | | [ticket/16248] Swap out logoshanakin2019-12-072-4/+8
| | | | | | | | | | | | | | | | PHPBB3-16248
| * | | [ticket/16248] Add DS_Store to gitignorehanakin2019-12-071-0/+1
| | | | | | | | | | | | | | | | PHPBB3-16248
* | | | Merge pull request #5728 from rxu/ticket/15294Marc Alexander2019-12-154-58/+221
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15294] Fix session_gc() selecting expired sessions for unique users
| * | | | [ticket/15294] Minor code adjustingrxu2019-11-053-51/+51
| | | | | | | | | | | | | | | | | | | | PHPBB3-15294
| * | | | [ticket/15294] Add session_gc() testsrxu2019-11-053-1/+140
| | | | | | | | | | | | | | | | | | | | PHPBB3-15294
| * | | | [ticket/15294] Get rid of SQL query in a loop as far as possiblerxu2019-11-041-8/+43
| | | | | | | | | | | | | | | | | | | | PHPBB3-15294
| * | | | [ticket/15294] Back to the all DBMS compliant splitted queriesrxu2019-11-041-27/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-15294
| * | | | [ticket/15294] Another approach, optimize updating & purging expired sessionsrxu2019-11-031-32/+31
| | | | | | | | | | | | | | | | | | | | PHPBB3-15294
| * | | | [ticket/15294] Fix session_gc() selecting expired sessions for unique usersrxu2019-11-031-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove limit of 10 as it does not allow to collect all the garbage. PHPBB3-15294
* | | | | Merge pull request #5775 from SagePtr/ticket/16255Marc Alexander2019-12-151-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16255] Fix PHP 7.4 deprecation warning
| * | | | | [ticket/16255] Fix PHP 7.4 deprecation warningSage Pointer2019-12-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16255