aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.3.x'Marc Alexander2020-01-224-9/+10
|\
| * 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.3.x'Marc Alexander2020-01-201-0/+6
|\| | |
| * | | 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.3.x'Marc Alexander2020-01-201-0/+12
|\| | | |
| * | | | 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.3.x'Marc Alexander2020-01-183-7/+12
|\| | |
| * | | 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.3.x'Marc Alexander2020-01-181-2/+2
|\| | | |
| * | | | 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 branch '3.3.x'Marc Alexander2020-01-182-4/+6
|\| | | |
| * | | | 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 pull request #5808 from marc1706/ticket/16284Marc Alexander2020-01-1438-352/+625
|\ \ \ \ \
| * | | | | [ticket/16284] Add depends_on to classesMarc Alexander2020-01-146-0/+42
| * | | | | [ticket/16284] Adjust create schema and add tables to testsMarc Alexander2020-01-0116-31/+103
| * | | | | [ticket/16284] Add effectively installed checks where applicableMarc Alexander2020-01-018-119/+181
| * | | | | [ticket/16284] Add effectively_installed to add_storage_permissionMarc Alexander2020-01-011-6/+20
| * | | | | [ticket/16284] Use tables array in acp_storage_moduleMarc Alexander2020-01-011-1/+1
| * | | | | [ticket/16284] Provide tables as array in migrationsMarc Alexander2020-01-013-9/+34
| * | | | | [ticket/16284] Add effectively_installed check to acp_storage_moduleMarc Alexander2020-01-011-8/+30
| * | | | | [ticket/16284] Add migration for 4.0.0-devMarc Alexander2020-01-011-0/+36
| * | | | | [ticket/16284] Move migrations not included in 3.3 to v400Marc Alexander2020-01-0110-0/+0
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-131-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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 branch '3.3.x'Marc Alexander2020-01-111-5/+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 branch '3.3.x'Marc Alexander2020-01-094-7/+34
|\| | | |
| * | | | 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 branch '3.3.x'Marc Alexander2020-01-0921-46/+110
|\| | | | |
| * | | | | Merge pull request #5812 from rxu/ticket/16288Marc Alexander2020-01-0921-46/+110
| |\ \ \ \ \