10490 Commits

Author	SHA1	Message	Date
Tristan Darricau	c46efa461e	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14806] Fix ACP test emails authentication failure	2017-03-19 18:45:29 +01:00
Tristan Darricau	6abcfe41e0	Merge pull request #4734 from rxu/ticket/14806 ... [ticket/14806] Fix ACP test emails authentication failure * github.com:phpbb/phpbb: [ticket/14806] Fix ACP test emails authentication failure	2017-03-19 18:44:41 +01:00
Tristan Darricau	552da2e805	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/13558] Change options prefix and add settings precautions. [ticket/13558] Make SSL context specific options more SMTP general [ticket/13558] Add smtp SSL context configuration options	2017-03-19 18:07:14 +01:00
Tristan Darricau	0b2369901a	Merge pull request #4745 from rxu/ticket/13558 ... [ticket/13558] Add smtp SSL context configuration options * rxu/ticket/13558: [ticket/13558] Change options prefix and add settings precautions. [ticket/13558] Make SSL context specific options more SMTP general [ticket/13558] Add smtp SSL context configuration options	2017-03-19 18:04:53 +01:00
Marc Alexander	e497937dd4	Merge branch '3.1.x' into 3.2.x	2017-03-19 16:01:37 +01:00
Marc Alexander	948ce2d84f	Merge pull request #4578 from javiexin/ticket/14849 ... [ticket/14849] Add core.acp_extensions_run_action	2017-03-19 16:01:33 +01:00
Marc Alexander	9958a68c57	Merge branch '3.1.x' into 3.2.x	2017-03-19 15:53:08 +01:00
Marc Alexander	59396771e6	Merge pull request #4703 from javiexin/ticket/15011 ... [ticket/15011] All errors on metadata throw exceptions	2017-03-19 15:49:33 +01:00
rxu	22b8632426	[ticket/13558] Change options prefix and add settings precautions. ... PHPBB3-13558	2017-03-19 14:32:53 +07:00
Marc Alexander	e4d253ce76	Merge branch '3.1.x' into 3.2.x	2017-03-19 00:01:34 +01:00
Marc Alexander	0f95e607ff	Merge pull request #4743 from rubencm/ticket/14820 ... [ticket/14820] Add style version in ACP	2017-03-19 00:01:30 +01:00
rxu	2cc9b6a857	[ticket/13558] Make SSL context specific options more SMTP general ... PHPBB3-13558	2017-03-18 01:11:32 +07:00
rxu	ac87784a11	[ticket/13558] Add smtp SSL context configuration options ... PHPBB3-13558	2017-03-17 01:21:57 +07:00
Rubén Calvo	d10a5b67a1	[ticket/14820] Add style version in ACP ... PHPBB3-14820	2017-03-16 00:00:50 +01:00
rxu	4826f7c1d3	[ticket/14806] Fix ACP test emails authentication failure ... PHPBB3-14806	2017-03-11 17:06:26 +07:00
Marc Alexander	1edb0bd173	Merge pull request #4700 from DavidIQ/ticket/15089 ... [ticket/15089] Reverse the order of cookie secure radio buttons	2017-03-08 21:27:11 +01:00
Marc Alexander	dbf7f2b7ee	Merge branch '3.1.x' into 3.2.x	2017-02-22 11:09:02 +01:00
Marc Alexander	4c3ddea09f	Merge remote-tracking branch 'origin/ticket/14927' into 3.1.x	2017-02-22 11:08:22 +01:00
Marc Alexander	bc86210db8	[ticket/14927] Put vars on one line ... PHPBB3-14927	2017-02-21 22:15:12 +01:00
Marc Alexander	efe6bcf95a	Merge branch '3.1.x' into 3.2.x	2017-02-21 21:14:12 +01:00
Marc Alexander	896249f0e8	Merge pull request #4604 from rxu/ticket/13344 ... [ticket/13344] Add core event to acp/info/acp_logs.php	2017-02-21 21:10:35 +01:00
david63	bac6dbda5e	[ticket/14927] Corrected order in docblock of event & target version ... PHPBB3-14927	2017-02-21 20:46:58 +01:00
david63	1b46435734	[ticket/14927] Add items to core.user_add_modify_data ... PHPBB3-14927	2017-02-21 20:44:00 +01:00
javiexin	cdca848018	[ticket/14849] Add core.acp_extensions_run_action ... Rename event to core.acp_extensions_run_action_before PHPBB-14849	2017-02-19 22:01:02 +01:00
javiexin	7f69580df3	Merge branch '3.1.x' into ticket/15011	2017-02-15 23:56:52 +01:00
javiexin	7646280d51	[ticket/15011] All errors on metadata throw exceptions ... There is inconsistency in the way error are treated in metadata_manager. Some method return false on error, others throw exception. With this, the usage is homogeneus, and the uses of these are also adapted. Using same ticket as it is the same issue, solved in a different way. PHPBB3-15011	2017-02-15 23:51:08 +01:00
David Colón	e1910b9a0f	[ticket/15089] Reverse the order of cookie secure radio buttons	2017-02-12 22:26:40 -05:00
Marc Alexander	f27cdad73e	Merge branch '3.1.x' into 3.2.x	2017-02-11 21:48:20 +01:00
Marc Alexander	45199adebd	Merge pull request #4523 from senky/ticket/13429 ... [ticket/13429] Replace @change with @changed in event docblocks	2017-02-11 15:19:47 +01:00
Marc Alexander	d81df55963	[ticket/14998] Point only to install dir from acp_update ... PHPBB3-14998	2017-01-28 09:16:49 +01:00
Jakub Senko	779758f219	[ticket/13429] Replace @change with @changed ... PHPBB3-13429	2017-01-23 13:33:15 +01:00
Tristan Darricau	7c77e33313	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14968] Use earlier version as written in comment [ticket/14968] Update docblock and ensure method returns array [ticket/14968] Display possible upgrade on acp index and update page [ticket/14968] Add method for retrieving updates on current branch	2017-01-22 23:15:26 +01:00
Marc Alexander	a620ce0713	[ticket/14968] Display possible upgrade on acp index and update page ... PHPBB3-14968	2017-01-22 16:37:20 +01:00
Tristan Darricau	c4ee378456	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/11076] State current and minimum required versions in old PHP notice	2017-01-15 18:13:00 +01:00
Marc Alexander	cb44dbc8cb	[ticket/11076] State current and minimum required versions in old PHP notice ... PHPBB3-11076	2017-01-15 15:32:55 +01:00
Tristan Darricau	4fd6b0fd88	Merge pull request #4632 from VSEphpbb/ticket/14989 ... [ticket/14989] Allow more admin-configurable schemes in post links * VSEphpbb/ticket/14989: [ticket/14989] Allow more admin-configurable schemes in post links	2017-01-15 12:36:26 +01:00
Matt Friedman	a3accfaf46	[ticket/14989] Allow more admin-configurable schemes in post links ... PHPBB3-14989	2017-01-11 01:55:39 -08:00
Marc Alexander	385feb0a5d	[3.2.x] Update development version to 3.2.1-dev	2017-01-07 17:19:35 +01:00
Marc Alexander	da8ec61ab2	[prep-release-3.2.0] Update version numbers and add 3.2.0 migration	2017-01-07 11:48:15 +01:00
Marc Alexander	44f130808f	Merge pull request #4618 from marc1706/ticket/14961 ... [ticket/14961] Add cookie notice as enablable feature	2017-01-07 00:20:18 +01:00
Marc Alexander	91637f8070	Merge pull request #4608 from marc1706/ticket/14954 ... [ticket/14954] Properly check if topic has attachments in mcp_queue	2017-01-06 01:14:09 +01:00
Marc Alexander	e0eeea800c	[ticket/14961] Add cookie notice as enablable feature ... Uses Insites cookieconsent v3.0.3: https://cookieconsent.insites.com PHPBB3-14961	2017-01-06 00:57:12 +01:00
Marc Alexander	777a1ad916	[ticket/14945] Parse signature preview with generate_text_for_display() ... PHPBB3-14945	2017-01-04 22:04:07 +01:00
Marc Alexander	cfa2bc534b	Merge branch '3.1.x' into 3.2.x	2017-01-04 21:50:25 +01:00
Marc Alexander	a0abb1e10e	Merge pull request #4600 from hubaishan/ticket/14549 ... [ticket/14549] fix mcp page redirect back after topic merge and rised warning	2017-01-04 21:47:21 +01:00
Marc Alexander	24b02ad4d6	Merge pull request #4443 from Crizz0/ticket/14780 ... [ticket/14780] Correction to let group setting overwrite global PM setting	2017-01-04 21:07:32 +01:00
Marc Alexander	c5ce0cd3c4	Merge pull request #4599 from VSEphpbb/ticket/14945 ... [ticket/14945] Fix bbcode flags in user sig previews	2017-01-04 17:48:52 +01:00
Marc Alexander	4c550c221b	[ticket/14954] Properly check if topic has attachments in mcp_queue ... PHPBB3-14954	2017-01-02 23:23:53 +01:00
Tristan Darricau	2251816b10	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query	2017-01-02 22:47:47 +01:00
Marc Alexander	7df7cfff33	[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query ... PHPBB3-14953	2017-01-02 22:39:40 +01:00