10360 commits

Author	SHA1	Message	Date
Marc Alexander	d894472866	Merge branch '3.1.x' into 3.2.x	2016-11-27 20:49:22 +01:00
Marc Alexander	a3faf1fefc	Merge pull request #4503 from rxu/ticket/14853 ... [ticket/14853] Add core event to allow modifying PM attachments download auth	2016-11-27 20:49:19 +01:00
Marc Alexander	0e8a573a71	Merge branch '3.1.x' into 3.2.x	2016-11-27 20:45:12 +01:00
Marc Alexander	642bfe9a39	Merge pull request #4512 from senky/ticket/14863 ... [ticket/14863] Properly treat plural rules in confirmation box title	2016-11-27 20:45:08 +01:00
Tristan Darricau	3e1f9c4201	Merge pull request #4508 from marc1706/ticket/9211 ... [ticket/9211] Use different icon for link subforum in forum legend * marc1706/ticket/9211: [ticket/9211] Use different icon for link subforum in forum legend	2016-11-24 14:16:37 +01:00
Marc Alexander	453d9113f1	Merge branch '3.1.x' into 3.2.x	2016-11-20 15:23:20 +01:00
Marc Alexander	dbd9c1f242	Merge pull request #4502 from rxu/ticket/14852 ... [ticket/14852] Add core event to modify email headers	2016-11-20 15:23:16 +01:00
Marc Alexander	c3108d44ce	Merge branch '3.1.x' into 3.2.x	2016-11-20 13:18:31 +01:00
Marc Alexander	d98fd7868b	Merge pull request #4511 from senky/ticket/14842 ... [ticket/14842] Don't display filesize limit if there is none	2016-11-20 13:18:27 +01:00
Marc Alexander	20771271ca	Merge branch '3.1.x' into 3.2.x	2016-11-20 12:57:31 +01:00
Jmz	0d15a95f97	[ticket/14850] Add core.generate_smilies_before ... Allows changing root_path of smilies to use CDN for example PHPBB3-14850	2016-11-20 12:56:12 +01:00
Jmz	6bbc18fa40	[ticket/14850] Add core.smiley_text_root_path ... Allows changing root_path of smilies to use CDN for example PHPBB3-14850	2016-11-20 12:56:11 +01:00
Marc Alexander	9343317121	Merge remote-tracking branch 'senky/ticket/14739' into 3.2.x	2016-11-17 09:56:51 +01:00
Marc Alexander	c6bed98cf5	Merge branch '3.1.x' into 3.2.x	2016-11-16 21:57:10 +01:00
Marc Alexander	34ebbbc7c3	Merge pull request #4497 from senky/ticket/14849 ... [ticket/14849] Add core.acp_extensions_run_action	2016-11-16 21:56:15 +01:00
Marc Alexander	4844370c26	Merge branch '3.1.x' into 3.2.x	2016-11-16 21:53:30 +01:00
Marc Alexander	1ff01d722a	Merge pull request #4510 from senky/ticket/14864 ... [ticket/14864] Set maxlength=64 to dateformat in ACP	2016-11-16 21:53:27 +01:00
Marc Alexander	5a82061c3a	[ticket/9211] Use different icon for link subforum in forum legend ... PHPBB3-9211	2016-11-16 21:51:58 +01:00
Jakub Senko	e974f338af	[ticket/14739] Remove SQLite 2.8.x database driver ... PHPBB3-14739	2016-11-16 17:59:28 +01:00
Jakub Senko	ba5243ba76	[ticket/14842] Don't display filesize limit if there is none ... PHPBB3-14842	2016-11-15 14:22:42 +01:00
Jakub Senko	b80b624551	[ticket/14849] Add core.acp_extensions_run_action ... PHPBB3-14849	2016-11-13 22:34:28 +01:00
Jakub Senko	260dc5ed7c	[ticket/14863] Properly treat plural rules in confirmation box title ... PHPBB3-14863	2016-11-13 17:21:41 +01:00
Jakub Senko	f8fb3e0f9f	[ticket/14864] Set maxlength=64 to dateformat in ACP ... PHPBB3-14864	2016-11-13 15:12:23 +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
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
rxu	ad4fe1799f	[ticket/14853] Add core event to allow modifying PM attachments download auth ... PHPBB3-14853	2016-11-04 18:42:49 +07:00
rxu	6984f17f62	[ticket/14852] Add core event to modify email headers ... PHPBB3-14852	2016-11-04 18:23:09 +07:00
Jakub Senko	552691efbf	[ticket/14847] Add core.acp_attachments_config_edit_add ... PHPBB3-14847	2016-11-02 09:46:36 +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
rxu	a41b16d06a	[ticket/14830] Fix FORM_INVALID error on cpf settings changing ... PHPBB3-14830	2016-10-24 23:22:00 +07:00
Marc Alexander	2a038d45df	Merge branch '3.1.x' into 3.2.x	2016-10-23 11:48:56 +02:00
Marc Alexander	3cb09358fe	Merge pull request #4490 from kasimi/ticket/14827 ... [ticket/14827] Fix adding multiple form keys	2016-10-23 11:48:53 +02:00
rxu	8afa9fdf28	[ticket/14830] Fix FORM_INVALID error during AСP search index deletion ... PHPBB3-14830	2016-10-21 01:23:45 +07:00
rxu	eca10dc08f	[ticket/14830] Fix FORM_INVALID error on search backend changing ... PHPBB3-14830	2016-10-21 01:23:44 +07:00
rxu	8e54c9ef8b	[ticket/14830] Fix link hash checking case ... PHPBB3-14830	2016-10-21 01:23:43 +07:00
rxu	832a87b924	[ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletion ... PHPBB3-14830	2016-10-21 01:23:43 +07:00
kasimi	f02afe58bc	[ticket/14827] Possibility to add multiple form keys ... PHPBB3-14827	2016-10-19 22:42:52 +02:00
MIkhail Gulyaev	868d55913d	[ticket/14818] Optimize generate_board_url function ... if $config['force_server_vars'] no need to calculate $request	2016-10-17 12:54:08 +07:00