Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-13 | 3 | -1/+36 |
|\ | |||||
| * | Merge pull request #4488 from senky/ticket/14825 | Marc Alexander | 2016-11-13 | 3 | -1/+36 |
| |\ | |||||
| | * | [ticket/14825] Add core.auth_oauth_(login/link)_after | Jakub Senko | 2016-11-13 | 3 | -1/+36 |
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 5 | -9/+26 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #4504 from VSEphpbb/ticket/14855 | Marc Alexander | 2016-11-12 | 5 | -14/+31 |
| |\ \ | |||||
| | * | | [ticket/14855] Bump font size to 10px | Matt Friedman | 2016-11-12 | 1 | -1/+1 |
| | * | | [ticket/14855] CSS updates | Matt Friedman | 2016-11-11 | 3 | -5/+4 |
| | * | | [ticket/14855] Update CSS | Matt Friedman | 2016-11-11 | 2 | -7/+16 |
| | * | | [ticket/14855] Update the comments | Matt Friedman | 2016-11-06 | 1 | -1/+1 |
| | * | | [ticket/14855] Remove notification bubble on mark all read | Matt Friedman | 2016-11-06 | 1 | -1/+1 |
| | * | | [ticket/14855] Update notification functional test | Matt Friedman | 2016-11-05 | 1 | -1/+1 |
| | * | | [ticket/14855] Fix responsive alert bubble CSS | Matt Friedman | 2016-11-05 | 1 | -5/+2 |
| | * | | [ticket/14855] Update notification and PM alert bubbles | Matt Friedman | 2016-11-05 | 3 | -7/+19 |
* | | | | 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] Notifications for PM reports send to users with correct permis... | Jim Mossing Holsteyn | 2016-11-07 | 1 | -1/+1 |
* | | | | | 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 | Jakub Senko | 2016-11-02 | 2 | -2/+14 |
| | | |/ / | | |/| | | |||||
* | | | | | 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 | Jakub Senko | 2016-11-02 | 1 | -1/+13 |
| | |/ / / | |||||
* | | | | | 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 | Jakub Senko | 2016-10-13 | 2 | -1/+36 |
| | | |_|/ | | |/| | | |||||
* | | | | | 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] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804 | Daniel Sinn | 2016-10-03 | 10 | -18/+111 |
| | |\ \ \ \ | |||||
| | * | | | | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1 | Daniel Sinn | 2016-09-30 | 1 | -1/+1 |
| | * | | | | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @since | Daniel Sinn | 2016-09-30 | 1 | -3/+3 |
| | * | | | | | [ticket/14804] Add core event to MCP after merging topics | Daniel Sinn | 2016-09-30 | 1 | -6/+20 |
* | | | | | | | 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 | Joas Schilling | 2016-11-12 | 1 | -1/+1 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge pull request #4506 from lavigor/ticket/14860 | Marc Alexander | 2016-11-12 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | [ticket/14860] Broken link on subscriptions page on mobile devices | lavigor | 2016-11-08 | 1 | -3/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-11-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 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 | Marc Alexander | 2016-10-16 | 1 | -1/+1 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-11-06 | 2 | -6/+54 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #4486 from marc1706/ticket/11483 | Tristan Darricau | 2016-11-06 | 2 | -6/+54 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | [ticket/11483] Add tests for generating user act key on force reactivate | Marc Alexander | 2016-11-06 | 1 | -0/+43 |
| | * | | | | [ticket/11483] Generate user act key if database entry is empty | Marc Alexander | 2016-10-16 | 1 | -6/+11 |
| | |/ / / | |||||
* | | | | | 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 |
* | | | | | | Merge pull request #4494 from JoshyPHP/ticket/14846 | Máté Bartus | 2016-11-02 | 4 | -5/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [ticket/14846] Updated s9e\TextFormatter | JoshyPHP | 2016-11-02 | 4 | -5/+35 |
|/ / / / / / | |||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-10-28 | 3 | -32/+23 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #4489 from rxu/ticket/14830 | Marc Alexander | 2016-10-28 | 3 | -33/+24 |
| |\ \ \ \ \ |