29206 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tristan Darricau	2111e1d61f	Merge pull request #4638 from VSEphpbb/ticket/14999 ... [ticket/14999] Correct Next PM Iconography * VSEphpbb/ticket/14999: [ticket/14999] Correct Next PM Iconography	2017-01-15 11:26:59 +01:00
Tristan Darricau	0b5218cec1	Merge pull request #4647 from marc1706/ticket/15012 ... [ticket/15012] Use valid constructor in ftp_file_updater * marc1706/ticket/15012: [ticket/15012] Use valid constructor in ftp_file_updater	2017-01-15 11:25:55 +01:00
Marc Alexander	42e78004fb	Merge pull request #4643 from JoshyPHP/ticket/15008 ... [ticket/15008] Disable emoji when smilies are disabled	2017-01-15 00:25:28 +01:00
Marc Alexander	b72df1f384	Merge pull request #4645 from rmcgirr83/ticket/15010 ... [ticket/15010] Fix incorrect use of request	2017-01-15 00:13:46 +01:00
Marc Alexander	abf7a4f663	[ticket/15012] Use valid constructor in ftp_file_updater ... PHPBB3-15012	2017-01-14 22:48:24 +01:00
Richard McGirr	02b5873442	[ticket/15010] Fix incorrect use of request ... https://tracker.phpbb.com/browse/PHPBB3-15010 PHPBB3-15010	2017-01-14 09:18:55 -05:00
Marc Alexander	d226059b98	Merge branch '3.1.x' into 3.2.x	2017-01-14 14:59:04 +01:00
Marc Alexander	8af6df3946	Merge pull request #4641 from VSEphpbb/ticket/15003 ... [ticket/15003] Do not check disabled checkboxes with marklist function	2017-01-14 14:58:48 +01:00
JoshyPHP	15315ac87a	[ticket/15008] Disable emoji when smilies are disabled ... Will effectively disable emoji shortname and won't replace emoji with images but will not prevent a browser or OS from displaying emoji as images. PHPBB3-15008	2017-01-14 14:27:38 +01:00
Matt Friedman	366e8583c8	[ticket/15003] Do not check disabled checkboxes with marklist function ... PHPBB3-15003	2017-01-13 12:00:31 -08:00
Matt Friedman	a9a04adbd2	[ticket/14999] Correct Next PM Iconography ... PHPBB3-14999	2017-01-12 19:45:53 -08:00
Marc Alexander	26c6cb819e	Merge pull request #4625 from Nicofuma/ticket/14973 ... [ticket/14973] Add BC layer for \phpbb\db\tools	2017-01-08 20:53:53 +01:00
Tristan Darricau	aaee7c7db9	Merge pull request #4623 from rxu/ticket/14971 ... [ticket/14971] Fix pagination PHP warning on PHP 7.1 * rxu/ticket/14971: [ticket/14971] Add on_page test with the string arguments [ticket/14971] Fix pagination PHP warning on PHP 7.1	2017-01-08 18:35:22 +01:00
Tristan Darricau	42cf311b2f	[ticket/14973] Add BC layer for \phpbb\db\tools ... PHPBB3-14973	2017-01-08 18:31:10 +01:00
Tristan Darricau	4d5140abaf	Merge pull request #4621 from marc1706/ticket/14967 ... [ticket/14967] Add cookie notice migration fixing invalid previous one * marc1706/ticket/14967: [ticket/14967] Add cookie notice migration fixing invalid previous one	2017-01-08 18:06:17 +01:00
rxu	06b402bdec	[ticket/14971] Add on_page test with the string arguments ... PHPBB3-14971	2017-01-08 23:09:36 +07:00
rxu	c98193a799	[ticket/14971] Fix pagination PHP warning on PHP 7.1 ... PHPBB3-14971	2017-01-08 22:16:40 +07:00
Marc Alexander	40985de245	[ticket/14967] Add cookie notice migration fixing invalid previous one ... PHPBB3-14967	2017-01-08 10:48:30 +01: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	9e1ef9fad3	Merge branch 'prep-release-3.2.0' into 3.2.x	2017-01-07 17:04:28 +01:00
Marc Alexander	830a384988	[prep-release-3.2.0] Fix links to convertor release-3.2.0	2017-01-07 16:16:24 +01:00
Marc Alexander	9bbd034a4e	[prep-release-3.2.0] Correctly compare extensions version	2017-01-07 14:44:04 +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	e096137537	Merge pull request #4620 from marc1706/ticket/14772 ... [ticket/14772] Use float to prevent pagination overwriting topic time	2017-01-07 00:18:40 +01:00
Marc Alexander	7074876f32	Merge pull request #4619 from Nicofuma/ticket/14962 ... [ticket/14962] Introduces a new helper to check emptyness of bbcode texts	2017-01-07 00:16:45 +01:00
Marc Alexander	538f03efb0	[ticket/14962] Fix functional test for editing post ... PHPBB3-14962	2017-01-06 23:46:34 +01:00
Marc Alexander	ba82dfa49e	[ticket/14772] Add rtl definition for .topic-poster and small margin ... PHPBB3-14772	2017-01-06 22:36:35 +01:00
Marc Alexander	89f0e4d54f	[ticket/14772] Use float to prevent pagination overwriting topic time ... PHPBB3-14772	2017-01-06 22:27:11 +01:00
Tristan Darricau	f82299b8e4	[ticket/14962] Introduces a new helper to check emptyness of bbcode texts ... PHPBB3-14962	2017-01-06 21:40:31 +01:00
Marc Alexander	166320ef9e	Merge branch '3.1.x' into 3.2.x	2017-01-06 15:29:40 +01:00
Marc Alexander	9d7acd1897	Merge pull request #4613 from rxu/ticket/14958 ... [ticket/14958] Optimize Twig extension lang() function	2017-01-06 15:29:35 +01:00
Marc Alexander	f423c2803a	Merge pull request #4617 from marc1706/ticket/14949 ... [ticket/14949] Pass full notification array and post data for updating	2017-01-06 13:53:39 +01:00
Marc Alexander	743d3af3c5	[ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2 ... PHPBB3-14961	2017-01-06 12:06:39 +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	70cf5ddf9d	Merge pull request #4615 from marc1706/ticket/14946 ... [ticket/14946] Make sure to pass integers to max()	2017-01-06 01:12:39 +01:00
Marc Alexander	864953ebff	Merge pull request #4616 from marc1706/ticket/14945 ... [ticket/14945] Parse signature preview with generate_text_for_display()	2017-01-06 01:06:06 +01:00
Marc Alexander	af4f477a1b	[ticket/14961] Also translate "learn more" link ... PHPBB3-14961	2017-01-06 01:04:14 +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	0a68593dd2	[ticket/14949] Pass full notification array and post data for updating ... PHPBB3-14949	2017-01-05 23:39:30 +01:00
Marc Alexander	0c6c94e527	Merge branch '3.1.x' into 3.2.x	2017-01-04 22:16:24 +01:00
Marc Alexander	77b3f36992	Merge pull request #4532 from senky/ticket/14662 ... [ticket/14662] Add memberlist_team_username_prepend/append	2017-01-04 22:15:37 +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	c6746ab3cd	[ticket/14946] Make sure to pass integers to max() ... PHPBB3-14946	2017-01-04 21:40:46 +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	cae30929ea	Merge branch '3.1.x' into 3.2.x	2017-01-04 20:31:45 +01:00
Marc Alexander	2f6993fa81	Merge pull request #4595 from DavidIQ/ticket/14941 ... [ticket/14941] Apply changes individually for MySQL fulltext search	2017-01-04 20:31:41 +01:00
Marc Alexander	655d40679d	Merge pull request #4614 from marc1706/ticket/14838 ... [ticket/14838] Add missing method to mock'ed feed	2017-01-04 20:11:58 +01:00