| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-16 | 2 | -0/+10 |
| |\ | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_move.html | ||||
| | * | Merge pull request #4337 from Senky/ticket/14506 | Marc Alexander | 2016-07-16 | 3 | -4/+16 |
| | |\ | | | | | | | | | | Add mcp_move_before template event | ||||
| | | * | [ticket/14506] Add mcp_move_before template event | Jakub Senko | 2016-05-29 | 3 | -4/+16 |
| | | | | | | | | | | | | | PHPBB3-14506 | ||||
| * | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-16 | 1 | -9/+22 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #4374 from TheKigen/ticket/14616 | Marc Alexander | 2016-07-16 | 1 | -9/+22 |
| | |\ \ | | | | | | | | | | | | | [ticket/14616] Fixed auto-prune failing on large forums | ||||
| | | * | | [ticket/14616] Switch prune limit to sql_query_limit instead of sql_and | Max Krivanek | 2016-07-06 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-14616 | ||||
| | | * | | [ticket/14616] Added comma expected by test scripts. | Max Krivanek | 2016-07-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-14616 | ||||
| | | * | | [ticket/14616] Added prune_limit to event core.prune_sql | Max Krivanek | 2016-06-28 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | PHPBB3-14616 | ||||
| | | * | | [ticket/14616] Removed misplaced tab. | Max Krivanek | 2016-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-14616 | ||||
| | | * | | [ticket/14616] Fixed auto-prune failing on large forums | Max Krivanek | 2016-06-27 | 1 | -6/+14 |
| | | | | | | | | | | | | | | | | | PHPBB3-14616 | ||||
| * | | | | Merge pull request #4380 from JoshyPHP/ticket/14706 | Marc Alexander | 2016-07-14 | 3 | -9/+9 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/14706] Updated [list] BBCode to automatically create a list item | ||||
| | * | | | | [ticket/14706] Updated [list] BBCode to automatically create a list item | JoshyPHP | 2016-07-08 | 3 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues with missing list items. Produces valid HTML. PHPBB3-14706 | ||||
| * | | | | | Merge pull request #4381 from wesleyfok/ticket/14709 | Marc Alexander | 2016-07-14 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14709] add post_id to mod log | ||||
| | * | | | | | [ticket/14709] add post_id to mod log | Wesley Fok | 2016-07-13 | 1 | -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.x | Marc Alexander | 2016-07-14 | 1 | -0/+10 |
| |\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #4347 from Senky/ticket/14631 | Marc Alexander | 2016-07-14 | 1 | -0/+10 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14631] Load truncate_string() if needed | ||||
| | | * | | | | [ticket/14631] Load truncate_string() if needed | Jakub Senko | 2016-06-07 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14631 | ||||
| * | | | | | | Merge pull request #4349 from marc1706/ticket/14665 | Andreas Fischer | 2016-07-10 | 1 | -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 migration | Marc Alexander | 2016-06-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | PHPBB3-14665 | ||||
| * | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-07 | 4 | -5/+5 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php | ||||
| | * | | | | | Merge pull request #4342 from Senky/ticket/14654 | Marc Alexander | 2016-07-07 | 5 | -7/+7 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14654] Change Imagemagick to ImageMagick | ||||
| | | * | | | | | [ticket/14654] Change Imagemagick to ImageMagick | Jakub Senko | 2016-06-11 | 5 | -7/+7 |
| | | | |/ / / | | |/| | | | | | | | | | | | | | | | PHPBB3-14654 | ||||
| * | | | | | | Merge pull request #4375 from bantu/ticket/14692 | Marc Alexander | 2016-07-06 | 1 | -1/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14692] Remove duplicate subexpression in questionnaire.php | ||||
| | * | | | | | | [ticket/14692] Remove duplicate subexpression in questionnaire.php | kilida | 2016-07-02 | 1 | -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.x | Marc Alexander | 2016-07-06 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Merge pull request #4354 from Stanzilla/smtp_explain | Marc Alexander | 2016-07-06 | 2 | -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 option | Benjamin Staneck | 2016-06-17 | 2 | -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 | ||||
| * | | | | | | | [ticket/14671] Remove schema.json file | Sumanai | 2016-07-02 | 1 | -3390/+0 |
| | |_|/ / / / |/| | | | | | | | | | | | PHPBB3-14671 | ||||
| * | | | | | | [Release 3.2.0-RC1] Update version to 3.2.0-RC2-dev | Tristan Darricau | 2016-06-27 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.x | Tristan Darricau | 2016-06-27 | 8 | -28/+123 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 changelog | Tristan Darricau | 2016-06-19 | 1 | -0/+55 |
| | | | | | | | | |||||
| | * | | | | | | [prep-release-3.2.0-RC1] Add migration | Tristan Darricau | 2016-06-19 | 1 | -0/+40 |
| | | | | | | | | |||||
| | * | | | | | | [prep-release-3.2.0-RC1] Update schema.json | Tristan Darricau | 2016-06-19 | 1 | -22/+22 |
| | | | | | | | | |||||
| | * | | | | | | [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1 | Tristan Darricau | 2016-06-19 | 5 | -6/+6 |
| | | | | | | | | |||||
| * | | | | | | | [ticket/14690] Create email queue cache file in the current env cache folder | rxu | 2016-06-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14690 | ||||
| * | | | | | | | Merge pull request #4233 from VSEphpbb/ticket/14547 | Marc Alexander | 2016-06-20 | 3 | -2/+167 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14547] Add Vagrant support to phpBB | ||||
| | * | | | | | | | [ticket/14547] Fix Docs and increase PHP memory limit | Matt Friedman | 2016-06-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547 | ||||
| | * | | | | | | | [ticket/14547] Use package compatible with phpBB requirements | Matt Friedman | 2016-04-28 | 3 | -28/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547 | ||||
| | * | | | | | | | [ticket/14547] Add Vagrant to phpBB | Matt Friedman | 2016-04-28 | 3 | -2/+167 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547 | ||||
| * | | | | | | | | [ticket/14660] Remove redundant empty line in ucp_profile.php | rxu | 2016-06-20 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14660 | ||||
| * | | | | | | | | Merge pull request #4357 from rxu/ticket/14660 | Marc Alexander | 2016-06-19 | 2 | -13/+19 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14660] Fix parsing board email messages through template engine. | ||||
| | * | | | | | | | | [ticket/14660] Fix typos in email templates. | rxu | 2016-06-19 | 5 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14660 | ||||
| | * | | | | | | | | [ticket/14660] Fix parsing board email messages through template engine. | rxu | 2016-06-18 | 2 | -13/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14660 | ||||
| * | | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-06-19 | 5 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | | [ticket/14683] Fix typos in email templates. | rxu | 2016-06-20 | 5 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14683 | ||||
| * | | | | | | | | | Merge pull request #4326 from Crizz0/ticket/14640 | Marc Alexander | 2016-06-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14640] Changes docu-link in language/en/install.php from 3.3 to 3.2 | ||||
| | * | | | | | | | | | [ticket/14640] Changes link from 3.3 to 3.2 to link to the correct docu | Crizzo | 2016-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14640 | ||||
| * | | | | | | | | | | Merge pull request #4356 from markshawtoronto/ticket/14680 | Marc Alexander | 2016-06-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14680] Fix wrong function name being checked in mcp_queue. | ||||
| | * | | | | | | | | | | [ticket/14680] Fix wrong function name being checked in mcp_queue. | Mark Shaw | 2016-06-17 | 1 | -1/+1 |
| | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14680 | ||||
| * | | | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-06-19 | 5 | -2/+55 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/language/en/install.php | ||||
