| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ticket/security-181' into ticket/security-181-rhea | Marc Alexander | 2016-11-13 | 8 | -4/+129 |
| |\ | |||||
| | * | [ticket/security-181] Update INSTALL.html to ask for more secure apache config | Marc Alexander | 2016-11-13 | 2 | -3/+26 |
| | | | | | | | | | SECURITY-181 | ||||
| | * | [ticket/security-181] Port .htaccess changes to other webserver types | Marc Alexander | 2016-11-13 | 3 | -2/+5 |
| | | | | | | | | | SECURITY-181 | ||||
| | * | [ticket/security-181] Deny access to migrations folders | Marc Alexander | 2016-11-13 | 3 | -0/+99 |
| | | | | | | | | | SECURITY-181 | ||||
| * | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 4 | -8/+25 |
| |\ \ | |/ | |||||
| | * | Merge pull request #4504 from VSEphpbb/ticket/14855 | Marc Alexander | 2016-11-12 | 4 | -13/+30 |
| | |\ | | | | | | | | | | [ticket/14855] Update notification and PM alert bubbles | ||||
| | | * | [ticket/14855] Bump font size to 10px | Matt Friedman | 2016-11-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-14855 | ||||
| | | * | [ticket/14855] CSS updates | Matt Friedman | 2016-11-11 | 3 | -5/+4 |
| | | | | | | | | | | | | | PHPBB3-14855 | ||||
| | | * | [ticket/14855] Update CSS | Matt Friedman | 2016-11-11 | 2 | -7/+16 |
| | | | | | | | | | | | | | PHPBB3-14855 | ||||
| | | * | [ticket/14855] Update the comments | Matt Friedman | 2016-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-14855 | ||||
| | | * | [ticket/14855] Remove notification bubble on mark all read | Matt Friedman | 2016-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-14855 | ||||
| | | * | [ticket/14855] Fix responsive alert bubble CSS | Matt Friedman | 2016-11-05 | 1 | -5/+2 |
| | | | | | | | | | | | | | PHPBB3-14855 | ||||
| | | * | [ticket/14855] Update notification and PM alert bubbles | Matt Friedman | 2016-11-05 | 3 | -7/+19 |
| | | | | | | | | | | | | | PHPBB3-14855 | ||||
| * | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #4505 from JimMH/patch-1 | Marc Alexander | 2016-11-12 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | [ticket/14859] Send notifications for PM reports to all users with correct permissions | ||||
| | | * | | [ticket/14859] Notifications for PM reports send to users with correct ↵ | Jim Mossing Holsteyn | 2016-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions Tracker ticket (set the ticket ID to your ticket ID): https://tracker.phpbb.com/browse/PHPBB3-14859 This addresses the problem that notifications of new PM reports were not sent out to moderators that weren't global moderators but did have the permission "Can close/delete PM reports". PHPBB3-14859 | ||||
| * | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 2 | -2/+14 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge pull request #4496 from senky/ticket/14848 | Marc Alexander | 2016-11-12 | 2 | -2/+14 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/14848] Add acp_ext_list_disabled/enabled_title_after | ||||
| | | * | | | [ticket/14848] Add acp_ext_list_disabled/enabled_title_after | Jakub Senko | 2016-11-02 | 2 | -2/+14 |
| | | | |/ | | |/| | | | | | | | | | PHPBB3-14848 | ||||
| * | | | | 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 | 2 | -1/+36 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge pull request #4481 from senky/ticket/14819 | Marc Alexander | 2016-11-12 | 2 | -1/+36 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/14819] Hide soft-deleted posts in topic review | ||||
| | | * | | | [ticket/14819] Hide soft-deleted posts in topic review | Jakub Senko | 2016-10-13 | 2 | -1/+36 |
| | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -16/+109 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 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 | Marc Alexander | 2016-11-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #4507 from nickvergessen/ticket-14788 | Marc Alexander | 2016-11-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14788] Farewell my friendz | ||||
| | | * | | | | | | [ticket/14788] Farewell | Joas Schilling | 2016-11-12 | 1 | -1/+1 |
| | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | PHPBB3-14788 | ||||
| * | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | [ticket/14860] Broken link on subscriptions page on mobile devices | lavigor | 2016-11-08 | 1 | -3/+3 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | PHPBB3-14860 | ||||
| * | | | | | | 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 | ||||
| | | * | | | | [ticket/11483] Generate user act key if database entry is empty | Marc Alexander | 2016-10-16 | 1 | -6/+11 |
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The force reactivation action in the ACP will no longer overwrite the generated activation key in case the key stored in the database is empty. It will also save the generated key back to the database to actually allow the activation by the user. PHPBB3-11483 | ||||
| * | | | | | Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.x | Marc Alexander | 2016-11-05 | 3 | -8/+22 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/14814] Fix reparser cron | Tristan Darricau | 2016-11-02 | 3 | -8/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14814 | ||||
| * | | | | | | [ticket/14846] Updated s9e\TextFormatter | JoshyPHP | 2016-11-02 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14846 | ||||
| * | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-10-28 | 2 | -18/+13 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | Merge pull request #4489 from rxu/ticket/14830 | Marc Alexander | 2016-10-28 | 2 | -19/+14 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14830] Fix FORM_INVALID error during some ACP setting operations | ||||
| | | * | | | | | [ticket/14823] Move check_form_key() inside actual save data step | Marc Alexander | 2016-10-28 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14823 | ||||
| | | * | | | | | [ticket/14830] Fix FORM_INVALID error on cpf settings changing | rxu | 2016-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | | * | | | | | [ticket/14830] Fix FORM_INVALID error during AСP search index deletion | rxu | 2016-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
