28823 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marc Alexander	93ca17f07a	Merge branch 'ticket/security-181' into ticket/security-181-rhea	2017-01-06 12:49:35 +01:00
Marc Alexander	1dea4625d0	[ticket/security-181] Update wording in INSTALL.html ... SECURITY-181	2017-01-06 12:27:38 +01:00
Marc Alexander	78c2e31ec2	[ticket/security-181] Add .htaccess to 3.2.x migrations ... SECURITY-181	2016-11-13 12:29:31 +01:00
Marc Alexander	a2953cb10c	Merge branch 'ticket/security-181' into ticket/security-181-rhea	2016-11-13 12:29:28 +01:00
Marc Alexander	44dd1ef984	[ticket/security-181] Update INSTALL.html to ask for more secure apache config ... SECURITY-181	2016-11-13 12:26:35 +01:00
Marc Alexander	7ba9b06881	[ticket/security-181] Port .htaccess changes to other webserver types ... SECURITY-181	2016-11-13 11:50:23 +01:00
Marc Alexander	61683f895c	[ticket/security-181] Deny access to migrations folders ... SECURITY-181	2016-11-13 11:43:17 +01:00
Marc Alexander	9c7e8c2dc5	Merge branch '3.1.x' into 3.2.x	2016-11-12 19:41:10 +01:00
Marc Alexander	372324cead	Merge pull request #4504 from VSEphpbb/ticket/14855 ... [ticket/14855] Update notification and PM alert bubbles	2016-11-12 19:30:34 +01:00
Marc Alexander	2319748c08	Merge branch '3.1.x' into 3.2.x	2016-11-12 19:27:09 +01:00
Marc Alexander	39f5b82bc3	Merge pull request #4505 from JimMH/patch-1 ... [ticket/14859] Send notifications for PM reports to all users with correct permissions	2016-11-12 19:27:06 +01:00
Matt Friedman	55f7438187	[ticket/14855] Bump font size to 10px ... PHPBB3-14855	2016-11-12 09:32:57 -08:00
Marc Alexander	4a1e5df654	Merge branch '3.1.x' into 3.2.x	2016-11-12 17:14:39 +01:00
Marc Alexander	c77798b1a3	Merge pull request #4496 from senky/ticket/14848 ... [ticket/14848] Add acp_ext_list_disabled/enabled_title_after	2016-11-12 17:14:35 +01:00
Marc Alexander	ef77852aff	Merge branch '3.1.x' into 3.2.x	2016-11-12 17:10:14 +01:00
Marc Alexander	221cd3eb68	Merge pull request #4495 from senky/ticket/14847 ... [ticket/14847] Add core.acp_attachments_config_edit_add	2016-11-12 17:08:28 +01:00
Marc Alexander	728335820c	Merge branch '3.1.x' into 3.2.x	2016-11-12 16:17:31 +01:00
Marc Alexander	bc4c82bae5	Merge pull request #4481 from senky/ticket/14819 ... [ticket/14819] Hide soft-deleted posts in topic review	2016-11-12 16:17:27 +01:00
Marc Alexander	78db28286e	Merge branch '3.1.x' into 3.2.x	2016-11-12 13:54:59 +01:00
Marc Alexander	577d669ba7	Merge pull request #4472 from dsinn/ticket/14804 ... [ticket/14804] Add core event to MCP after merging topics	2016-11-12 13:53:24 +01:00
Marc Alexander	dd561ec275	Merge branch '3.1.x' into 3.2.x	2016-11-12 13:47:42 +01:00
Marc Alexander	a298ed1a66	Merge pull request #4507 from nickvergessen/ticket-14788 ... [ticket/14788] Farewell my friendz	2016-11-12 13:47:39 +01:00
Marc Alexander	8d3d396f1b	Merge branch '3.1.x' into 3.2.x	2016-11-12 13:44:32 +01:00
Marc Alexander	43ea7168d1	Merge pull request #4506 from lavigor/ticket/14860 ... [ticket/14860] Broken link on subscriptions page on mobile devices	2016-11-12 13:44:29 +01:00
Joas Schilling	c9ea560c63	[ticket/14788] Farewell ... PHPBB3-14788	2016-11-12 12:12:01 +01:00
Matt Friedman	0fd04f2e6f	[ticket/14855] CSS updates ... PHPBB3-14855	2016-11-11 16:38:46 -08:00
Matt Friedman	74285b4308	[ticket/14855] Update CSS ... PHPBB3-14855	2016-11-11 09:32:25 -08:00
lavigor	cdf6464382	[ticket/14860] Broken link on subscriptions page on mobile devices ... PHPBB3-14860	2016-11-08 16:50:53 +03:00
Jim Mossing Holsteyn	4533dd9fa0	[ticket/14859] Notifications for PM reports send to users with correct 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	2016-11-07 16:06:50 +01:00
Matt Friedman	9b1e2e523c	[ticket/14855] Update the comments ... PHPBB3-14855	2016-11-06 16:12:39 -08:00
Matt Friedman	0e114f91f4	[ticket/14855] Remove notification bubble on mark all read ... PHPBB3-14855	2016-11-06 10:00:50 -08:00
Tristan Darricau	50f5efba9c	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14795] Use maximum topic views instead of adding up views in merge	2016-11-06 15:47:49 +01:00
Tristan Darricau	9be9062df3	Merge pull request #4485 from marc1706/ticket/14795 ... [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	2016-11-06 15:47:20 +01:00
Tristan Darricau	cd348b200a	Merge branch '3.1.x' into 3.2.x ... * 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	2016-11-06 15:41:59 +01:00
Tristan Darricau	dc32b900c5	Merge pull request #4486 from marc1706/ticket/11483 ... [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	2016-11-06 15:41:46 +01:00
Marc Alexander	ac36cc25eb	[ticket/11483] Add tests for generating user act key on force reactivate ... PHPBB3-11483	2016-11-06 11:58:31 +01:00
Matt Friedman	af2bf4ef36	[ticket/14855] Update notification functional test ... PHPBB3-14855	2016-11-05 19:41:08 -07:00
Matt Friedman	87209fdd06	[ticket/14855] Fix responsive alert bubble CSS ... PHPBB3-14855	2016-11-05 16:29:13 -07:00
Matt Friedman	c259a9b387	[ticket/14855] Update notification and PM alert bubbles ... PHPBB3-14855	2016-11-05 16:15:50 -07:00
Marc Alexander	ecb81894cc	Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.x	2016-11-05 21:35:06 +01:00
Tristan Darricau	d90afa67d8	[ticket/14814] Fix reparser cron ... PHPBB3-14814	2016-11-02 19:38:33 +01:00
Jakub Senko	2f6a258175	[ticket/14848] Add acp_ext_list_disabled/enabled_title_after ... PHPBB3-14848	2016-11-02 10:03:11 +01:00
Máté Bartus	094ac6b60f	Merge pull request #4494 from JoshyPHP/ticket/14846 ... [ticket/14846] Updated s9e\TextFormatter	2016-11-02 10:01:20 +01:00
Jakub Senko	552691efbf	[ticket/14847] Add core.acp_attachments_config_edit_add ... PHPBB3-14847	2016-11-02 09:46:36 +01:00
JoshyPHP	33f1934b72	[ticket/14846] Updated s9e\TextFormatter ... PHPBB3-14846	2016-11-02 09:19:35 +01:00
Marc Alexander	f658e062b2	Merge branch '3.1.x' into 3.2.x	2016-10-28 21:06:21 +02:00
Marc Alexander	85898d3d2c	Merge pull request #4489 from rxu/ticket/14830 ... [ticket/14830] Fix FORM_INVALID error during some ACP setting operations	2016-10-28 19:36:49 +02:00
Marc Alexander	466bdee8e6	[ticket/14823] Move check_form_key() inside actual save data step ... PHPBB3-14823	2016-10-28 21:37:00 +07:00
Tristan Darricau	b8ef36ddb1	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14818] Optimize generate_board_url function	2016-10-24 23:08:09 +02:00
Tristan Darricau	e3a85ff0a7	Merge pull request #4487 from gmixo/patch-2 ... [ticket/14818] Optimize generate_board_url function * gmixo/patch-2: [ticket/14818] Optimize generate_board_url function	2016-10-24 23:08:06 +02:00