aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-133-1/+36
|\
| * Merge pull request #4488 from senky/ticket/14825Marc Alexander2016-11-133-1/+36
| |\
| | * [ticket/14825] Add core.auth_oauth_(login/link)_afterJakub Senko2016-11-133-1/+36
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-125-9/+26
|\ \ \ | |/ /
| * | Merge pull request #4504 from VSEphpbb/ticket/14855Marc Alexander2016-11-125-14/+31
| |\ \
| | * | [ticket/14855] Bump font size to 10pxMatt Friedman2016-11-121-1/+1
| | * | [ticket/14855] CSS updatesMatt Friedman2016-11-113-5/+4
| | * | [ticket/14855] Update CSSMatt Friedman2016-11-112-7/+16
| | * | [ticket/14855] Update the commentsMatt Friedman2016-11-061-1/+1
| | * | [ticket/14855] Remove notification bubble on mark all readMatt Friedman2016-11-061-1/+1
| | * | [ticket/14855] Update notification functional testMatt Friedman2016-11-051-1/+1
| | * | [ticket/14855] Fix responsive alert bubble CSSMatt Friedman2016-11-051-5/+2
| | * | [ticket/14855] Update notification and PM alert bubblesMatt Friedman2016-11-053-7/+19
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #4505 from JimMH/patch-1Marc Alexander2016-11-121-1/+1
| |\ \ \
| | * | | [ticket/14859] Notifications for PM reports send to users with correct permis...Jim Mossing Holsteyn2016-11-071-1/+1
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-122-2/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4496 from senky/ticket/14848Marc Alexander2016-11-122-2/+14
| |\ \ \ \
| | * | | | [ticket/14848] Add acp_ext_list_disabled/enabled_title_afterJakub Senko2016-11-022-2/+14
| | | |/ / | | |/| |
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4495 from senky/ticket/14847Marc Alexander2016-11-121-1/+13
| |\ \ \ \
| | * | | | [ticket/14847] Add core.acp_attachments_config_edit_addJakub Senko2016-11-021-1/+13
| | |/ / /
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-122-1/+36
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4481 from senky/ticket/14819Marc Alexander2016-11-122-1/+36
| |\ \ \ \
| | * | | | [ticket/14819] Hide soft-deleted posts in topic reviewJakub Senko2016-10-132-1/+36
| | | |_|/ | | |/| |
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-7/+21
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4472 from dsinn/ticket/14804Marc Alexander2016-11-121-7/+21
| |\ \ \ \
| | * \ \ \ [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804Daniel Sinn2016-10-0310-18/+111
| | |\ \ \ \
| | * | | | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1Daniel Sinn2016-09-301-1/+1
| | * | | | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @sinceDaniel Sinn2016-09-301-3/+3
| | * | | | | [ticket/14804] Add core event to MCP after merging topicsDaniel Sinn2016-09-301-6/+20
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4507 from nickvergessen/ticket-14788Marc Alexander2016-11-121-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/14788] FarewellJoas Schilling2016-11-121-1/+1
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4506 from lavigor/ticket/14860Marc Alexander2016-11-121-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | [ticket/14860] Broken link on subscriptions page on mobile deviceslavigor2016-11-081-3/+3
| |/ / / / /
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4485 from marc1706/ticket/14795Tristan Darricau2016-11-061-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/14795] Use maximum topic views instead of adding up views in mergeMarc Alexander2016-10-161-1/+1
| | | |_|/ / | | |/| | |
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-062-6/+54
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4486 from marc1706/ticket/11483Tristan Darricau2016-11-062-6/+54
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | [ticket/11483] Add tests for generating user act key on force reactivateMarc Alexander2016-11-061-0/+43
| | * | | | [ticket/11483] Generate user act key if database entry is emptyMarc Alexander2016-10-161-6/+11
| | |/ / /
* | | | | Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.xMarc Alexander2016-11-053-8/+22
|\ \ \ \ \
| * | | | | [ticket/14814] Fix reparser cronTristan Darricau2016-11-023-8/+22
* | | | | | Merge pull request #4494 from JoshyPHP/ticket/14846Máté Bartus2016-11-024-5/+35
|\ \ \ \ \ \
| * | | | | | [ticket/14846] Updated s9e\TextFormatterJoshyPHP2016-11-024-5/+35
|/ / / / / /
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-283-32/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #4489 from rxu/ticket/14830Marc Alexander2016-10-283-33/+24
| |\ \ \ \ \