aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/security-181' into ticket/security-181-rheaMarc Alexander2016-11-138-4/+129
|\
| * [ticket/security-181] Update INSTALL.html to ask for more secure apache configMarc Alexander2016-11-132-3/+26
| | | | | | | | SECURITY-181
| * [ticket/security-181] Port .htaccess changes to other webserver typesMarc Alexander2016-11-133-2/+5
| | | | | | | | SECURITY-181
| * [ticket/security-181] Deny access to migrations foldersMarc Alexander2016-11-133-0/+99
| | | | | | | | SECURITY-181
* | 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] Update notification and PM alert bubbles
| | * [ticket/14855] Bump font size to 10pxMatt Friedman2016-11-121-1/+1
| | | | | | | | | | | | PHPBB3-14855
| | * [ticket/14855] CSS updatesMatt Friedman2016-11-113-5/+4
| | | | | | | | | | | | PHPBB3-14855
| | * [ticket/14855] Update CSSMatt Friedman2016-11-112-7/+16
| | | | | | | | | | | | PHPBB3-14855
| | * [ticket/14855] Update the commentsMatt Friedman2016-11-061-1/+1
| | | | | | | | | | | | PHPBB3-14855
| | * [ticket/14855] Remove notification bubble on mark all readMatt Friedman2016-11-061-1/+1
| | | | | | | | | | | | PHPBB3-14855
| | * [ticket/14855] Update notification functional testMatt Friedman2016-11-051-1/+1
| | | | | | | | | | | | PHPBB3-14855
| | * [ticket/14855] Fix responsive alert bubble CSSMatt Friedman2016-11-051-5/+2
| | | | | | | | | | | | PHPBB3-14855
| | * [ticket/14855] Update notification and PM alert bubblesMatt Friedman2016-11-053-7/+19
| | | | | | | | | | | | PHPBB3-14855
* | | 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] Send notifications for PM reports to all users with correct permissions
| | * | [ticket/14859] Notifications for PM reports send to users with correct ↵Jim Mossing Holsteyn2016-11-071-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.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_after
| | * | | [ticket/14848] Add acp_ext_list_disabled/enabled_title_afterJakub Senko2016-11-022-2/+14
| | | |/ | | |/| | | | | | | | | PHPBB3-14848
* | | | 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_add
| | * | | [ticket/14847] Add core.acp_attachments_config_edit_addJakub Senko2016-11-021-1/+13
| | |/ / | | | | | | | | | | | | PHPBB3-14847
* | | | 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 review
| | * | | [ticket/14819] Hide soft-deleted posts in topic reviewJakub Senko2016-10-132-1/+36
| | | | | | | | | | | | | | | | | | | | PHPBB3-14819
* | | | | 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] Add core event to MCP after merging topics
| | * \ \ \ [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804Daniel Sinn2016-10-0310-18/+111
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804
| | * | | | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1Daniel Sinn2016-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804
| | * | | | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @sinceDaniel Sinn2016-09-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804
| | * | | | | [ticket/14804] Add core event to MCP after merging topicsDaniel Sinn2016-09-301-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.xMarc Alexander2016-11-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4507 from nickvergessen/ticket-14788Marc Alexander2016-11-121-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14788] Farewell my friendz
| | * | | | | | [ticket/14788] FarewellJoas Schilling2016-11-121-1/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | PHPBB3-14788
* | | | | | | 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 devices
| | * | | | | [ticket/14860] Broken link on subscriptions page on mobile deviceslavigor2016-11-081-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14860
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-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/14795Tristan Darricau2016-11-061-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 mergeMarc Alexander2016-10-161-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.xTristan Darricau2016-11-062-6/+54
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 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/11483Tristan Darricau2016-11-062-6/+54
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add tests for generating user act key on force reactivateMarc Alexander2016-11-061-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11483
| | * | | | [ticket/11483] Generate user act key if database entry is emptyMarc Alexander2016-10-161-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.xMarc Alexander2016-11-053-8/+22
|\ \ \ \ \
| * | | | | [ticket/14814] Fix reparser cronTristan Darricau2016-11-023-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14814
* | | | | | Merge pull request #4494 from JoshyPHP/ticket/14846Máté Bartus2016-11-024-5/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14846] Updated s9e\TextFormatter
| * | | | | | [ticket/14846] Updated s9e\TextFormatterJoshyPHP2016-11-024-5/+35
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14846
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-283-32/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | |