aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-224-9/+10
|\
| * Merge pull request #5833 from mrgoldy/ticket/16332Marc Alexander2020-01-224-9/+10
| |\
| | * [ticket/16332] Amend formatting tests to expect translated code stringmrgoldy2020-01-212-6/+6
| | * [ticket/16332] Code and Quote language strings globally availablemrgoldy2020-01-212-3/+4
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-201-0/+6
|\| |
| * | Merge pull request #5814 from 3D-I/ticket/15079Marc Alexander2020-01-201-0/+6
| |\ \
| | * | [ticket/15079] Fix Emoji and rich text in Draft subject3D-I2020-01-021-18/+1
| | * | [ticket/15079] Fix Emoji and rich text in Draft subject3D-I2020-01-021-0/+23
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-201-0/+12
|\| | |
| * | | Merge pull request #5813 from 3D-I/ticket/15712Marc Alexander2020-01-201-0/+12
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/15712] Add Emoji and rich text in PM Draft subject3D-I2020-01-031-0/+6
| | * | [ticket/15712] Add Emoji and rich text in PM subject3D-I2020-01-021-0/+6
| | |/
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-183-7/+12
|\| |
| * | Merge pull request #5821 from marc1706/ticket/16296Marc Alexander2020-01-183-7/+12
| |\ \
| | * | [ticket/16296] Adjust form token check for mark actionsMarc Alexander2020-01-073-7/+12
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-181-2/+2
|\| | |
| * | | Merge pull request #5830 from marc1706/ticket/16328Marc Alexander2020-01-181-2/+2
| |\ \ \
| | * | | [ticket/16328] Inform admins about PHP requirements in phpBB 3.3Marc Alexander2020-01-181-2/+2
| |/ / /
* | | | Merge pull request #5828 from AlfredoRamos/ticket/16323Marc Alexander2020-01-182-4/+6
|\ \ \ \
| * | | | [ticket/16323] Replace the spaceless tag with its homologue filterAlfredo Ramos2020-01-142-4/+6
|/ / / /
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-131-1/+1
|\| | |
| * | | Merge pull request #5819 from mrgoldy/ticket/16291Marc Alexander2020-01-131-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/16291] Add missing report timemrgoldy2020-01-051-1/+1
| | |/
* | | Merge pull request #5826 from 3D-I/ticket/16308Marc Alexander2020-01-111-5/+1
|\ \ \
| * | | [ticket/16308] Fix UCP reset password3D-I2020-01-111-1/+1
| * | | [ticket/16308] Fix UCP reset password3D-I2020-01-102-3/+2
| * | | [ticket/16308] Fix UCP reset password3D-I2020-01-092-6/+3
|/ / /
* | | Merge pull request #5823 from JoshyPHP/ticket/16309Marc Alexander2020-01-094-7/+34
|\ \ \
| * | | [ticket/16309] Fix smilies with a left square bracketJoshyPHP2020-01-084-7/+34
* | | | Merge pull request #5812 from rxu/ticket/16288Marc Alexander2020-01-0921-46/+110
|\ \ \ \
| * | | | [ticket/16288] Drop redundant parenthesesrxu2020-01-081-1/+1
| * | | | [ticket/16288] PHP 8 compatibilityrxu2020-01-0321-46/+110
* | | | | Merge pull request #5824 from rxu/ticket/16311Marc Alexander2020-01-091-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/16311] Fix password length ACP setting explanationrxu2020-01-091-1/+1
|/ / / /
* | | | Merge branch 'prep-release-3.3.0' into 3.3.xMarc Alexander2020-01-0618-36/+124
|\ \ \ \
| * | | | [prep-release-3.3.0] Update changelogMarc Alexander2020-01-061-0/+1
| * | | | Merge pull request #5820 from marc1706/ticket/16293Marc Alexander2020-01-061-1/+1
| |\ \ \ \
| | * | | | [ticket/16293] Do not update to hashes that don't support combined hashingMarc Alexander2020-01-061-1/+1
| * | | | | [prep-release-3.3.0] Rename 3.3 to ProteusMarc Alexander2020-01-051-3/+3
| * | | | | Merge pull request #5818 from marc1706/ticket/16266Marc Alexander2020-01-051-11/+3
| |\ \ \ \ \
| | * | | | | [ticket/16266] Remove extra declaration of constantsMarc Alexander2020-01-051-11/+3
| | |/ / / /
| * | | | | [prep-release-3.3.0] Update changelogMarc Alexander2020-01-041-0/+1
| * | | | | Merge pull request #5817 from marc1706/ticket/16290Marc Alexander2020-01-049-14/+28
| |\ \ \ \ \
| | * | | | | [ticket/16290] Update to new SVG logo in package docsMarc Alexander2020-01-049-14/+28
| | |/ / / /
| * | | | | [prep-release-3.3.0] Add changelog for 3.3.0Marc Alexander2020-01-041-0/+43
| * | | | | [prep-release-3.3.0] Add migration for 3.3.0Marc Alexander2020-01-041-0/+37
| * | | | | [prep-release-3.3.0] Update version numbers for 3.3.0 releaseMarc Alexander2020-01-046-7/+7
|/ / / / /
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-048-20/+178
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-049-20/+178
| |\ \ \ | | |_|/ | |/| |
| | * | [prep-release-3.2.9] Update changelog for 3.2.9Marc Alexander2020-01-041-0/+25