aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4380 from JoshyPHP/ticket/14706Marc Alexander2016-07-146-10/+12
|\
| * [ticket/14706] Updated [list] BBCode to automatically create a list itemJoshyPHP2016-07-086-10/+12
* | Merge pull request #4381 from wesleyfok/ticket/14709Marc Alexander2016-07-141-0/+1
|\ \
| * | [ticket/14709] add post_id to mod logWesley Fok2016-07-131-0/+1
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-141-0/+10
|\ \ \ | |/ / |/| |
| * | Merge pull request #4347 from Senky/ticket/14631Marc Alexander2016-07-141-0/+10
| |\ \
| | * | [ticket/14631] Load truncate_string() if neededJakub Senko2016-06-071-0/+10
* | | | Merge pull request #4349 from marc1706/ticket/14665Andreas Fischer2016-07-101-1/+2
|\ \ \ \
| * | | | [ticket/14665] Remove invalid syntax in report_id_auto_increment migrationMarc Alexander2016-06-081-1/+2
* | | | | Merge branch '3.1.x' into 3.2.xAndreas Fischer2016-07-081-0/+1
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | Merge pull request #4379 from marc1706/ticket/14689Andreas Fischer2016-07-081-0/+1
| |\ \ \
| | * | | [ticket/14689] Build API docs for 3.2.xMarc Alexander2016-07-071-0/+1
| |/ / /
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-074-5/+5
|\ \ \ \ | |/ / /
| * | | Merge pull request #4342 from Senky/ticket/14654Marc Alexander2016-07-075-7/+7
| |\ \ \
| | * | | [ticket/14654] Change Imagemagick to ImageMagickJakub Senko2016-06-115-7/+7
| | | |/ | | |/|
* | | | Merge pull request #4375 from bantu/ticket/14692Marc Alexander2016-07-061-1/+0
|\ \ \ \
| * | | | [ticket/14692] Remove duplicate subexpression in questionnaire.phpkilida2016-07-021-1/+0
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-062-1/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4354 from Stanzilla/smtp_explainMarc Alexander2016-07-062-1/+2
| |\ \ \ \
| | * | | | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server optionBenjamin Staneck2016-06-172-1/+2
* | | | | | Merge pull request #4376 from Sumanai/ticket/14671Marc Alexander2016-07-061-3390/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/14671] Remove schema.json fileSumanai2016-07-021-3390/+0
|/ / / / /
* | | | | Merge pull request #4360 from VSEphpbb/ticket/14684Marc Alexander2016-06-281-1/+2
|\ \ \ \ \
| * | | | | [ticket/14684] Add and use $NOTESTS for ext-sniff.shMatt Friedman2016-06-191-1/+2
* | | | | | Merge pull request #4372 from lavigor/ticket/14696Marc Alexander2016-06-271-32/+43
|\ \ \ \ \ \
| * | | | | | [ticket/14696] Be perfectlavigor2016-06-261-21/+19
| * | | | | | [ticket/14696] Fix email template test for '0' usernamelavigor2016-06-261-13/+26
* | | | | | | [Release 3.2.0-RC1] Update version to 3.2.0-RC2-devTristan Darricau2016-06-273-3/+3
* | | | | | | Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.xTristan Darricau2016-06-279-29/+124
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [prep-release-3.2.0-RC1] Update changelogTristan Darricau2016-06-191-0/+55
| * | | | | | [prep-release-3.2.0-RC1] Add migrationTristan Darricau2016-06-191-0/+40
| * | | | | | [prep-release-3.2.0-RC1] Update schema.jsonTristan Darricau2016-06-191-22/+22
| * | | | | | [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1Tristan Darricau2016-06-196-7/+7
* | | | | | | Merge pull request #4367 from rxu/ticket/14690Marc Alexander2016-06-261-2/+2
|\ \ \ \ \ \ \
| * | | | | | | [ticket/14690] Create email queue cache file in the current env cache folderrxu2016-06-231-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #4233 from VSEphpbb/ticket/14547Marc Alexander2016-06-209-3/+323
|\ \ \ \ \ \ \
| * | | | | | | [ticket/14547] Fix Docs and increase PHP memory limitMatt Friedman2016-06-192-2/+2
| * | | | | | | [ticket/14547] Ignore backup config.php filesMatt Friedman2016-04-281-1/+1
| * | | | | | | [ticket/14547] Use package compatible with phpBB requirementsMatt Friedman2016-04-286-31/+35
| * | | | | | | [ticket/14547] Add Vagrant to phpBBMatt Friedman2016-04-289-2/+318
* | | | | | | | Merge pull request #4362 from rxu/ticket/14660-fix-empty-lineMáté Bartus2016-06-201-1/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | [ticket/14660] Remove redundant empty line in ucp_profile.phprxu2016-06-201-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #4357 from rxu/ticket/14660Marc Alexander2016-06-193-13/+157
|\ \ \ \ \ \ \
| * | | | | | | [ticket/14660] Add test case.rxu2016-06-191-0/+138
| * | | | | | | [ticket/14660] Fix typos in email templates.rxu2016-06-195-5/+5
| * | | | | | | [ticket/14660] Fix parsing board email messages through template engine.rxu2016-06-182-13/+19
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-195-5/+5
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #4358 from rxu/ticket/14683Marc Alexander2016-06-195-5/+5
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/14683] Fix typos in email templates.rxu2016-06-205-5/+5
| |/ / / / / / /
* | | | | | | | Merge pull request #4326 from Crizz0/ticket/14640Marc Alexander2016-06-191-1/+1
|\ \ \ \ \ \ \ \