aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-074-4/+45
|\
| * Merge pull request #5574 from dark-1/ticket/16025Marc Alexander2019-06-074-4/+45
| |\ | | | | | | | | | [ticket/16025] Add 2 template events *_author_username_{append/prepend}
| | * [ticket/16025] Add 2 template events *_author_username_{append/prepend}Dark❶2019-05-071-6/+6
| | | | | | | | | | | | PHPBB3-16025
| | * [ticket/16025] Add 2 template events *_author_username_{append/prepend}Dark❶2019-04-201-1/+1
| | | | | | | | | | | | PHPBB3-16025
| | * [ticket/16025] Add 2 template events *_author_username_{append/prepend}Dark❶2019-04-203-189/+189
| | | | | | | | | | | | PHPBB3-16025
| | * [ticket/16025] Add 2 template events *_author_username_{append/prepend}Dark❶2019-04-204-190/+231
| | | | | | | | | | | | PHPBB3-16025
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-061-0/+24
|\ \ \ | |/ /
| * | Merge pull request #5573 from dark-1/ticket/16024Marc Alexander2019-06-061-0/+24
| |\ \ | | | | | | | | | | | | [ticket/16024] Add core.topic_review_modify_sql_ary
| | * | [ticket/16024] Add core.topic_review_modify_sql_aryDark❶2019-05-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16024
| | * | [ticket/16024] Add core.topic_review_modify_sql_aryDark❶2019-04-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16024
| | * | [ticket/16024] Add core.topic_review_modify_sql_aryDark❶2019-04-201-0/+24
| | |/ | | | | | | | | | PHPBB3-16024
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-062-2/+2
|\ \ \ | |/ /
| * | Merge pull request #5603 from senky/ticket/16000Marc Alexander2019-06-062-2/+2
| |\ \ | | | | | | | | | | | | [ticket/16000] Link to php's date()
| | * | [ticket/16000] Do not open links in a new tabJakub Senko2019-06-042-2/+2
| | | | | | | | | | | | | | | | PHPBB3-16000
| | * | [ticket/16000] Link to php's date()Jakub Senko2019-05-242-2/+2
| | | | | | | | | | | | | | | | PHPBB3-16000
* | | | Merge pull request #5583 from marc1706/ticket/15987Marc Alexander2019-06-052-1/+65
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15987] Table parameters as array
| * | | | [ticket/15987] Go back to previous table definition typeMarc Alexander2019-05-143-93/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will still allow using the 'tables' parameter array but will also ensure full backward compatibility and compatibility with extensions that will add more tables to the 'tables' array. PHPBB3-15987
| * | | | [ticket/15987] Add missing paranthesisMarc Alexander2019-05-141-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15987
| * | | | [ticket/15987] Add container extension to support tables "array access"Marc Alexander2019-05-142-1/+60
| | | | | | | | | | | | | | | | | | | | PHPBB3-15987
| * | | | [ticket/15987] Table parameters as arraymrgoldy2019-05-141-77/+78
| | | | | | | | | | | | | | | | | | | | PHPBB3-15987
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-051-7/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #5615 from 3D-I/ticket/16073Marc Alexander2019-06-051-7/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16073] Fix warning in ACP version check
| | * | | | [ticket/16073] Fix warning in ACP version check3D-I2019-06-011-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16073
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-043-9/+24
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5612 from senky/ticket/15932Marc Alexander2019-06-043-9/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15932] Disallow deleting locked attachments
| | * | | | | [ticket/15932] Disallow deleting locked attachmentsJakub Senko2019-05-283-9/+24
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-15932
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-031-2/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5607 from senky/ticket/15974Marc Alexander2019-06-031-2/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15974] Remove Back to previous page link
| | * | | | | [ticket/15974] Remove Back to previous page linkJakub Senko2019-05-271-2/+0
| | | |_|/ / | | |/| | | | | | | | | | | | | | | PHPBB3-15974
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-031-1/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/16071] Undefined index for custom attachments groups3D-I2019-05-291-1/+5
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-16071
| * | | | Merge pull request #5592 from 3D-I/ticket/16055Marc Alexander2019-05-271-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16055] Fix Oauth's logins in 3.2.x
| | * | | | [ticket/16055] Fix Oauth's redirects3D-I2019-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Via forum, memberlist, topic or post etc.. PHPBB3-16055
* | | | | | [ticket/16072] Update s9e/text-formatterJoshyPHP2019-05-313-18/+57
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16072
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-271-8/+10
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | [ticket/16053] Update s9e/text-formatterJoshyPHP2019-05-171-8/+10
| | |/ / | |/| | | | | | | | | | PHPBB3-16053
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-141-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #5587 from 3D-I/ticket/16048Marc Alexander2019-05-141-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16048] Fix restore backup from ACP
| | * | | [ticket/16048] Fix restore backup from ACP3D-I2019-05-071-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-16048
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-141-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/16050] Fix PHP warning in MCP Banning tab on PHP 7.2+rxu2019-05-111-1/+1
| |/ / | | | | | | | | | PHPBB3-16050
* | | [ticket/16052] Update composer dependenciesMarc Alexander2019-05-121-806/+232
| | | | | | | | | | | | PHPBB3-16052
* | | [ticket/16052] Add 3.3.0-dev migrationMarc Alexander2019-05-111-0/+36
| | | | | | | | | | | | PHPBB3-16052
* | | [ticket/15927] Avoid using floatshanakin2019-05-111-6/+2
| | | | | | | | | | | | PHPBB3-15927
* | | [ticket/15927] Fix render issuehanakin2019-05-112-9/+13
| | | | | | | | | | | | PHPBB3-15927
* | | [ticket/16052] Update version numbers to 3.3Marc Alexander2019-05-1120-70/+70
| | | | | | | | | | | | PHPBB3-16052
* | | [ticket/16052] Fix issues caused by mergesMarc Alexander2019-05-113-4/+3
| | | | | | | | | | | | PHPBB3-16052
* | | [ticket/14948] Require json extension in composer.jsonMarc Alexander2019-05-092-2/+4
| | | | | | | | | | | | PHPBB3-14948
* | | [ticket/14948] Use continue 2 instead of continue to continue while loopMarc Alexander2019-05-091-2/+2
| | | | | | | | | | | | PHPBB3-14948
* | | [ticket/14948] Update lexer to be compatible with twig 2.6Marc Alexander2019-05-091-13/+3
| | | | | | | | | | | | PHPBB3-14948