10547 Commits

Author	SHA1	Message	Date
Marc Alexander	d956ac418d	Merge branch '3.2.x'	2017-02-22 11:09:30 +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	7794696317	Merge branch '3.2.x'	2017-02-21 21:14:34 +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
Marc Alexander	30c8e40b9b	Merge branch '3.2.x'	2017-02-11 21:48:42 +01: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	7f82d28f6f	Merge branch '3.2.x' ... * 3.2.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:16:23 +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	3d61d2b370	Merge branch '3.2.x' ... * 3.2.x: [ticket/15011] Output meaningful errors when validating all metadata [ticket/11076] State current and minimum required versions in old PHP notice	2017-01-15 18:16:45 +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	51500977b2	Merge branch '3.2.x' ... * 3.2.x: [ticket/14989] Allow more admin-configurable schemes in post links	2017-01-15 12:36:29 +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	663bdda53c	Merge branch '3.2.x'	2017-01-07 00:20:22 +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	a187c46072	Merge branch '3.2.x'	2017-01-06 01:14:13 +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	0543413626	Merge branch '3.2.x'	2017-01-06 01:06:10 +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	13d0549e59	Merge branch '3.2.x'	2017-01-04 21:50:47 +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	ee3cf0af0f	Merge branch '3.2.x'	2017-01-04 21:07:36 +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	3fef34a541	Merge branch '3.2.x'	2017-01-04 17:48:56 +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	387d76aa09	Merge branch '3.2.x' ... * 3.2.x: [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query	2017-01-02 22:47:51 +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
rxu	3e5e8fd0e3	[ticket/13344] Add core event to acp/info/acp_logs.php ... PHPBB3-13344	2017-01-01 23:38:01 +07:00
hubaishan	40bc4ac484	[ticket/14549] Correcting $redirect var to avoid the bug ... by this correct $redirect will go to clean mcp page after merge PHPBB3-14549	2016-12-29 13:11:19 +03:00
Marc Alexander	7eddb02568	Merge branch '3.2.x'	2016-12-28 22:24:12 +01:00
Marc Alexander	442d21ace2	Merge branch '3.1.x' into 3.2.x	2016-12-28 22:23:52 +01:00
Marc Alexander	3ccaac488b	Merge pull request #4531 from senky/ticket/14817 ... [ticket/14817] Add core.send_file_to_browser_before	2016-12-28 22:19:12 +01:00
Marc Alexander	4ca90795af	Merge branch '3.2.x'	2016-12-28 22:12:48 +01:00
Marc Alexander	8a7607964f	Merge branch '3.1.x' into 3.2.x	2016-12-28 22:12:26 +01:00