aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-162-0/+10
|\ | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_move.html
| * Merge pull request #4337 from Senky/ticket/14506Marc Alexander2016-07-163-4/+16
| |\ | | | | | | | | | Add mcp_move_before template event
| | * [ticket/14506] Add mcp_move_before template eventJakub Senko2016-05-293-4/+16
| | | | | | | | | | | | PHPBB3-14506
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-161-9/+22
|\ \ \ | |/ /
| * | Merge pull request #4374 from TheKigen/ticket/14616Marc Alexander2016-07-161-9/+22
| |\ \ | | | | | | | | | | | | [ticket/14616] Fixed auto-prune failing on large forums
| | * | [ticket/14616] Switch prune limit to sql_query_limit instead of sql_andMax Krivanek2016-07-061-7/+2
| | | | | | | | | | | | | | | | PHPBB3-14616
| | * | [ticket/14616] Added comma expected by test scripts.Max Krivanek2016-07-011-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14616
| | * | [ticket/14616] Added prune_limit to event core.prune_sqlMax Krivanek2016-06-281-1/+11
| | | | | | | | | | | | | | | | PHPBB3-14616
| | * | [ticket/14616] Removed misplaced tab.Max Krivanek2016-06-271-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14616
| | * | [ticket/14616] Fixed auto-prune failing on large forumsMax Krivanek2016-06-271-6/+14
| | | | | | | | | | | | | | | | PHPBB3-14616
* | | | Merge pull request #4380 from JoshyPHP/ticket/14706Marc Alexander2016-07-146-10/+12
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14706] Updated [list] BBCode to automatically create a list item
| * | | | [ticket/14706] Updated [list] BBCode to automatically create a list itemJoshyPHP2016-07-086-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues with missing list items. Produces valid HTML. PHPBB3-14706
* | | | | Merge pull request #4381 from wesleyfok/ticket/14709Marc Alexander2016-07-141-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14709] add post_id to mod log
| * | | | | [ticket/14709] add post_id to mod logWesley Fok2016-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the missing post_id value to the moderator log entry created upon deleting one or more posts in the MCP topic view. PHPBB3-14709
* | | | | | 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 needed
| | * | | | [ticket/14631] Load truncate_string() if neededJakub Senko2016-06-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14631
* | | | | | Merge pull request #4349 from marc1706/ticket/14665Andreas Fischer2016-07-101-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14665] Remove invalid syntax in report_id_auto_increment migration * marc1706/ticket/14665: [ticket/14665] Remove invalid syntax in report_id_auto_increment migration
| * | | | | | [ticket/14665] Remove invalid syntax in report_id_auto_increment migrationMarc Alexander2016-06-081-1/+2
| | | | | | | | | | | | | | | | | | | | | PHPBB3-14665
* | | | | | | Merge branch '3.1.x' into 3.2.xAndreas Fischer2016-07-081-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | | * 3.1.x: [ticket/14689] Build API docs for 3.2.x
| * | | | | Merge pull request #4379 from marc1706/ticket/14689Andreas Fischer2016-07-081-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14689] Build API docs for 3.2.x * marc1706/ticket/14689: [ticket/14689] Build API docs for 3.2.x
| | * | | | | [ticket/14689] Build API docs for 3.2.xMarc Alexander2016-07-071-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14689
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-074-5/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php
| * | | | | Merge pull request #4342 from Senky/ticket/14654Marc Alexander2016-07-075-7/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14654] Change Imagemagick to ImageMagick
| | * | | | | [ticket/14654] Change Imagemagick to ImageMagickJakub Senko2016-06-115-7/+7
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-14654
* | | | | | Merge pull request #4375 from bantu/ticket/14692Marc Alexander2016-07-061-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14692] Remove duplicate subexpression in questionnaire.php
| * | | | | | [ticket/14692] Remove duplicate subexpression in questionnaire.phpkilida2016-07-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subexpression `($ip_address_ary[0] == '192' && $ip_address_ary[1] == '168')` was repeated. PHPBB3-14692
* | | | | | | 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 option
| | * | | | | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server optionBenjamin Staneck2016-06-172-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help users trying to figure out why their mail config is not working when they forgot to use a protocol prefix. PHPBB3-14184
* | | | | | | Merge pull request #4376 from Sumanai/ticket/14671Marc Alexander2016-07-061-3390/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | [ticket/14671] Remove schema.json file
| * | | | | | [ticket/14671] Remove schema.json fileSumanai2016-07-021-3390/+0
|/ / / / / / | | | | | | | | | | | | PHPBB3-14671
* | | | | | Merge pull request #4360 from VSEphpbb/ticket/14684Marc Alexander2016-06-281-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14684] Add and use $NOTESTS for ext-sniff.sh
| * | | | | | [ticket/14684] Add and use $NOTESTS for ext-sniff.shMatt Friedman2016-06-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14684
* | | | | | | Merge pull request #4372 from lavigor/ticket/14696Marc Alexander2016-06-271-32/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14696] Fix email template test for '0' username
| * | | | | | | [ticket/14696] Be perfectlavigor2016-06-261-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14696
| * | | | | | | [ticket/14696] Fix email template test for '0' usernamelavigor2016-06-261-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14696
* | | | | | | | [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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/prep-release-3.2.0-RC1: [prep-release-3.2.0-RC1] Update changelog [prep-release-3.2.0-RC1] Add migration [prep-release-3.2.0-RC1] Update schema.json [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
| * | | | | | | [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 folder
| * | | | | | | | [ticket/14690] Create email queue cache file in the current env cache folderrxu2016-06-231-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14690
* | | | | | | | Merge pull request #4233 from VSEphpbb/ticket/14547Marc Alexander2016-06-209-3/+323
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14547] Add Vagrant support to phpBB
| * | | | | | | | [ticket/14547] Fix Docs and increase PHP memory limitMatt Friedman2016-06-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547
| * | | | | | | | [ticket/14547] Ignore backup config.php filesMatt Friedman2016-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547
| * | | | | | | | [ticket/14547] Use package compatible with phpBB requirementsMatt Friedman2016-04-286-31/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547
| * | | | | | | | [ticket/14547] Add Vagrant to phpBBMatt Friedman2016-04-289-2/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547