| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-12-02 | 1 | -1/+2 |
| |\ | |||||
| | * | [ticket/13757] Properly fix bug with negative PM count | Victor A. Safronov | 2016-12-02 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | The fix from PR #4548 doesn't work as expected because in phpBB the sql_affectedrows() method always returns a count of matched rows instead of affected rows. This commit fixes bug properly. PHPBB3-13757 | ||||
| * | | Merge pull request #4547 from VSEphpbb/ticket/14883 | Marc Alexander | 2016-12-02 | 1 | -5/+5 |
| |\ \ | | | | | | | | | | [ticket/14883] Do not display empty forum rules (after they've been re-parsed) | ||||
| | * | | [ticket/14883] Remove extra tabbage | Matt Friedman | 2016-12-01 | 1 | -3/+3 |
| | | | | | | | | | | PHPBB3-14883 | ||||
| | * | | [ticket/14883] Refactor forum rules logic | Matt Friedman | 2016-12-01 | 1 | -11/+6 |
| | | | | | | | | | | PHPBB3-14883 | ||||
| | * | | [ticket/14883] Do not display empty forum rules (after reparsing) | Matt Friedman | 2016-11-30 | 1 | -0/+5 |
| | | | | | | | | | | | | | PHPBB3-14883 | ||||
| * | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-12-01 | 1 | -0/+6 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | [ticket/13757] Prevents the count of unread PMs from being negative | Victor A. Safronov | 2016-11-30 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the user_unread_privmsg flag in users table can become negative. It happens when the unread message is requested by simultaneous concurrent requests. Both requests will decrement the value of the flag. This commit prevents updating the flag if the message already marked as read. PHPBB3-13757 | ||||
| * | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-27 | 1 | -0/+14 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #4503 from rxu/ticket/14853 | Marc Alexander | 2016-11-27 | 1 | -0/+14 |
| | |\ \ | | | | | | | | | | | | | [ticket/14853] Add core event to allow modifying PM attachments download auth | ||||
| | | * | | [ticket/14853] Add core event to allow modifying PM attachments download auth | rxu | 2016-11-04 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | PHPBB3-14853 | ||||
| * | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-27 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge pull request #4512 from senky/ticket/14863 | Marc Alexander | 2016-11-27 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/14863] Properly treat plural rules in confirmation box title | ||||
| | | * | | | [ticket/14863] Properly treat plural rules in confirmation box title | Jakub Senko | 2016-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14863 | ||||
| * | | | | | Merge pull request #4508 from marc1706/ticket/9211 | Tristan Darricau | 2016-11-24 | 1 | -0/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9211] Use different icon for link subforum in forum legend * marc1706/ticket/9211: [ticket/9211] Use different icon for link subforum in forum legend | ||||
| | * | | | | | [ticket/9211] Use different icon for link subforum in forum legend | Marc Alexander | 2016-11-16 | 1 | -0/+3 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | PHPBB3-9211 | ||||
| * | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-20 | 1 | -1/+11 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #4502 from rxu/ticket/14852 | Marc Alexander | 2016-11-20 | 1 | -1/+11 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14852] Add core event to modify email headers | ||||
| | | * | | | | [ticket/14852] Add core event to modify email headers | rxu | 2016-11-04 | 1 | -1/+11 |
| | | | |_|/ | | |/| | | | | | | | | | | | | PHPBB3-14852 | ||||
| * | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-20 | 2 | -2/+2 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #4511 from senky/ticket/14842 | Marc Alexander | 2016-11-20 | 2 | -2/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14842] Don't display filesize limit if there is none | ||||
| | | * | | | | [ticket/14842] Don't display filesize limit if there is none | Jakub Senko | 2016-11-15 | 2 | -2/+2 |
| | | |/ / / | | | | | | | | | | | | | | | | PHPBB3-14842 | ||||
| * | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-20 | 2 | -1/+20 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | [ticket/14850] Add core.generate_smilies_before | Jmz | 2016-11-20 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows changing root_path of smilies to use CDN for example PHPBB3-14850 | ||||
| | * | | | | [ticket/14850] Add core.smiley_text_root_path | Jmz | 2016-11-20 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows changing root_path of smilies to use CDN for example PHPBB3-14850 | ||||
| * | | | | | Merge remote-tracking branch 'senky/ticket/14739' into 3.2.x | Marc Alexander | 2016-11-17 | 7 | -11/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/14739] Remove SQLite 2.8.x database driver | Jakub Senko | 2016-11-16 | 7 | -11/+1 |
| | | |_|/ / | |/| | | | | | | | | | | | | | PHPBB3-14739 | ||||
| * | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-16 | 1 | -1/+17 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #4497 from senky/ticket/14849 | Marc Alexander | 2016-11-16 | 1 | -1/+17 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14849] Add core.acp_extensions_run_action | ||||
| | | * | | | | [ticket/14849] Add core.acp_extensions_run_action | Jakub Senko | 2016-11-13 | 1 | -1/+17 |
| | | | |/ / | | |/| | | | | | | | | | | | | PHPBB3-14849 | ||||
| * | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-16 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| | * | | | Merge pull request #4510 from senky/ticket/14864 | Marc Alexander | 2016-11-16 | 1 | -1/+1 |
| | |\ \ \ | | |_|/ | |/| | | | | | | [ticket/14864] Set maxlength=64 to dateformat in ACP | ||||
| | | * | | [ticket/14864] Set maxlength=64 to dateformat in ACP | Jakub Senko | 2016-11-13 | 1 | -1/+1 |
| | | |/ | | | | | | | | | | PHPBB3-14864 | ||||
| * | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 1 | -1/+13 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #4495 from senky/ticket/14847 | Marc Alexander | 2016-11-12 | 1 | -1/+13 |
| | |\ \ | | | | | | | | | | | | | [ticket/14847] Add core.acp_attachments_config_edit_add | ||||
| | | * | | [ticket/14847] Add core.acp_attachments_config_edit_add | Jakub Senko | 2016-11-02 | 1 | -1/+13 |
| | | |/ | | | | | | | | | | PHPBB3-14847 | ||||
| * | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 1 | -1/+32 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #4481 from senky/ticket/14819 | Marc Alexander | 2016-11-12 | 1 | -1/+32 |
| | |\ \ | | | | | | | | | | | | | [ticket/14819] Hide soft-deleted posts in topic review | ||||
| | | * | | [ticket/14819] Hide soft-deleted posts in topic review | Jakub Senko | 2016-10-13 | 1 | -1/+32 |
| | | | | | | | | | | | | | | | | | PHPBB3-14819 | ||||
| * | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 1 | -7/+21 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge pull request #4472 from dsinn/ticket/14804 | Marc Alexander | 2016-11-12 | 1 | -7/+21 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/14804] Add core event to MCP after merging topics | ||||
| | | * \ \ | [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804 | Daniel Sinn | 2016-10-03 | 4 | -13/+37 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | PHPBB3-14804 | ||||
| | | * | | | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1 | Daniel Sinn | 2016-09-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804 | ||||
| | | * | | | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @since | Daniel Sinn | 2016-09-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804 | ||||
| | | * | | | | [ticket/14804] Add core event to MCP after merging topics | Daniel Sinn | 2016-09-30 | 1 | -6/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed $topic_data and defined $to_topic_data in order to avoid ambiguity and to stop overwriting a variable. PHPBB3-14804 | ||||
| * | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-11-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14795] Use maximum topic views instead of adding up views in merge | ||||
| | * | | | | | Merge pull request #4485 from marc1706/ticket/14795 | Tristan Darricau | 2016-11-06 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14795] Use maximum topic views instead of adding up views in merge * github.com:phpbb/phpbb: [ticket/14795] Use maximum topic views instead of adding up views in merge | ||||
| | | * | | | | | [ticket/14795] Use maximum topic views instead of adding up views in merge | Marc Alexander | 2016-10-16 | 1 | -1/+1 |
| | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging topics should not result in topic views being added up but rather in the highest topic view showing up for the merged topic. PHPBB3-14795 | ||||
| * | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-11-06 | 1 | -6/+11 |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/11483] Add tests for generating user act key on force reactivate [ticket/11483] Generate user act key if database entry is empty | ||||
| | * | | | | | Merge pull request #4486 from marc1706/ticket/11483 | Tristan Darricau | 2016-11-06 | 1 | -6/+11 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11483] Generate user act key if database entry is empty * github.com:phpbb/phpbb: [ticket/11483] Add tests for generating user act key on force reactivate [ticket/11483] Generate user act key if database entry is empty | ||||
