aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.3.x'HEADmasterMarc Alexander2020-02-011-0/+4
|\
| * Merge branch '3.2.x' into 3.3.xMarc Alexander2020-02-011-0/+4
| |\
| | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-281-2/+2
| | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-221-4/+4
| | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-201-0/+4
| | * [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-021-1/+1
| | * [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-021-0/+1
* | | Merge branch '3.3.x'Marc Alexander2020-01-091-1/+1
|\| |
| * | [ticket/16311] Fix password length ACP setting explanationrxu2020-01-091-1/+1
* | | Merge branch '3.3.x'Marc Alexander2020-01-021-0/+1
|\| |
| * | Merge pull request #5802 from 3D-I/ticket/16279Marc Alexander2020-01-021-0/+1
| |\ \
| | * | [ticket/16279] Add permission for Emoji in topic title3D-I2019-12-301-1/+1
| | * | [ticket/16279] Add permission for Emoji in topic title3D-I2019-12-301-0/+1
| | |/
* | | Merge branch '3.3.x'Marc Alexander2019-12-241-1/+1
|\| |
| * | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-241-1/+1
| |\|
| | * [ticket/16257] Typo in SMTP_SERVER_EXPLAIN3D-I2019-12-241-1/+1
* | | Merge branch '3.3.x'Marc Alexander2019-12-211-1/+2
|\| |
| * | [ticket/16250] Add a service to check BBCodes safenessJoshyPHP2019-12-131-1/+2
* | | Merge branch '3.3.x'Marc Alexander2019-11-221-0/+2
|\| |
| * | Merge pull request #5686 from v12mike/ticket/9837Marc Alexander2019-11-221-0/+2
| |\ \
| | * | [ticket/9837] Make unapproved posts visible to authorv12mike2019-11-211-1/+1
| | * | [ticket/9837] Display unapproved posts to their authorsv12mike2019-11-211-2/+2
| | * | [ticket/9837] Make unapproved posts visible to posterv12mike2019-11-211-1/+1
| | * | [ticket/9837] Make unapproved posts visible to postersv12mike2019-11-211-1/+1
| | * | [ticket/9837] Make unapproved posts visible to postersv12mike2019-11-211-0/+2
* | | | Merge branch '3.3.x'Marc Alexander2019-11-081-0/+2
|\| | |
| * | | [ticket/12559] Add forum setting to limit subforum legendPayBas2019-11-011-0/+2
| |/ /
* | | Merge branch '3.3.x'Marc Alexander2019-10-261-1/+0
|\| |
| * | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-261-1/+0
| |\|
| | * Merge pull request #5695 from 3D-I/ticket/16161Marc Alexander2019-10-261-1/+0
| | |\
| | | * [ticket/16161] Enable BBcodes without closing tag3D-I2019-09-221-1/+0
* | | | Merge branch '3.3.x'Marc Alexander2019-10-211-2/+2
|\| | |
| * | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-211-2/+2
| |\| |
| | * | [ticket/16147] Updated tokens legend in BBCodes ACPJoshyPHP2019-09-041-2/+2
| | |/
* | | Merge branch '3.3.x'Marc Alexander2019-08-171-42/+43
|\| |
| * | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-08-171-42/+43
| |\|
| | * Merge pull request #5656 from 3D-I/ticket/16019Marc Alexander2019-08-171-42/+43
| | |\
| | | * [ticket/16019] Amend explanation3D-I2019-08-141-1/+1
| | | * [ticket/16019] Short explanation3D-I2019-08-141-1/+1
| | | * [ticket/16019] Short array syntax and tabulation3D-I2019-08-141-43/+43
| | | * [ticket/16019] Rewamp ACP_STYLES_EXPLAIN3D-I2019-08-141-35/+35
| | | * [ticket/16019] Deny prosilver's uninstallation3D-I2019-08-131-1/+2
* | | | Merge branch '3.3.x'Marc Alexander2019-08-121-0/+2
|\| | |
| * | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-08-121-0/+2
| |\| |
| | * | Merge pull request #5650 from 3D-I/ticket/16127Marc Alexander2019-08-121-0/+2
| | |\ \ | | | |/ | | |/|
| | | * [ticket/16127] Minimum 1 and rephrasing.3D-I2019-08-081-2/+2
| | | * [ticket/16127] Add UI for email $max_chunk_size3D-I2019-08-071-0/+2
* | | | Merge branch '3.3.x'Marc Alexander2019-08-111-1/+1
|\| | |
| * | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-08-111-1/+1
| |\| |
| | * | [ticket/16109] Fix Custom Profile Field visibility's explain3D-I2019-08-061-1/+1
| | |/