30321 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tristan Darricau	f5e3394550	Merge pull request #5261 from senky/ticket/15670 ... [ticket/15670] Group forum permission: Can see forum gives NO SQL ERROR * github.com:/phpbb/phpbb: [ticket/15670] Fix SQL error when !f_list_topics and f_read	2018-07-08 18:35:29 +02:00
Tristan Darricau	fca72a0f6a	Merge pull request #5262 from senky/ticket/15606 ... [ticket/15606] Hide viewprofile link when unavailable * github.com:/phpbb/phpbb: [ticket/15606] Hide viewprofile link when unavailable	2018-07-08 18:34:12 +02:00
Tristan Darricau	be15d8718d	Merge pull request #5269 from 3D-I/ticket/15705 ... [ticket/15705] fix phpbbcli language vs PHP * github.com:/phpbb/phpbb: [ticket/15705] fix phpbbcli language vs PHP	2018-07-08 18:24:55 +02:00
Tristan Darricau	b0df5e31cf	Merge pull request #5277 from ghostal/ticket/15717 ... [ticket/15717] Using correct variable for log entry * github.com:/phpbb/phpbb: [ticket/15717] Using correct variable for log entry	2018-07-08 18:21:45 +02:00
Tristan Darricau	3d4cc025e0	Merge pull request #5278 from hubaishan/ticket/15673 ... [ticket/15673] Fix Duplicated links in QuickLinks and main nav bar * github.com:/phpbb/phpbb: [ticket/15673] Fix Duplicated links in QuickLinks and main nav bar	2018-07-08 18:19:39 +02:00
Tristan Darricau	5542070169	Merge pull request #5198 from kasimi/ticket/15637 ... [ticket/15637] Extract multi-line PHP event descriptions * github.com:/phpbb/phpbb: [ticket/15637] Remove trailing space from description [ticket/15637] Preserve line breaks in event descriptions [ticket/15637] Updated test fixture to include complete event description [ticket/15637] Remove trailing space from description [ticket/15637] Fixed removing white-spaces from description line [ticket/15637] Extract all lines before the first @tag [ticket/15637] Extract multi-line PHP event descriptions	2018-07-08 18:14:20 +02:00
Tristan Darricau	777443d95c	Merge pull request #5157 from kasimi/ticket/15583 ... [ticket/15583] Update session time in AJAX request only once a minute * github.com:/phpbb/phpbb: [ticket/15583] Update session time in AJAX request only once a minute [ticket/15583] Update session time in AJAX request only once a minute	2018-07-08 18:06:16 +02:00
Tristan Darricau	9db4983f03	Merge pull request #5185 from SupSuper/ticket/15611 ... [ticket/15611] Fix misaligned text in responsive user profile * github.com:/phpbb/phpbb: [ticket/15611] Fix misaligned text in responsive user profile	2018-07-08 18:03:59 +02:00
Tristan Darricau	ed48b5f226	Merge pull request #5214 from ioannisbat/patch-1 ... [ticket/15638] Add word-break for overflowing. * github.com:/phpbb/phpbb: [ticket/15638] Add word-break for overflowing.	2018-07-08 17:52:32 +02:00
Tristan Darricau	219e85c4e0	Merge pull request #5217 from Zoddo/ticket/15656 ... [ticket/15656] Add "View post" link in the mod logs on the ACP * github.com:/phpbb/phpbb: [ticket/15656] Add "View post" link in the mod logs on the ACP	2018-07-08 17:48:10 +02:00
Tristan Darricau	7f266a3664	Merge pull request #5229 from hubaishan/ticket/15613 ... [ticket/15613] Fix Notification dropdown said to be not RTL compliant * github.com:/phpbb/phpbb: [ticket/15613] Fix Notification dropdown said to be not RTL compliant	2018-07-08 17:42:14 +02:00
Tristan Darricau	bc7b998632	Merge branch 'prep-release-3.2.3' into 3.2.x ... * prep-release-3.2.3: [ticket/15676] Use paragraphs and classes as suggested by hanakin [ticket/15676] Use twig syntax [ticket/15676] Simplify link text and use privacy link in cookie notice [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY	2018-07-08 17:38:27 +02:00
Tristan Darricau	43d7f15a25	Merge pull request #5231 from marc1706/ticket/15676 ... [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY * github.com:/phpbb/phpbb: [ticket/15676] Use paragraphs and classes as suggested by hanakin [ticket/15676] Use twig syntax [ticket/15676] Simplify link text and use privacy link in cookie notice [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY	2018-07-08 17:38:27 +02:00
kasimi	eedcb3bbe1	[ticket/15637] Remove trailing space from description ... PHPBB3-15637	2018-07-07 22:41:40 +02:00
kasimi	245f4df47c	[ticket/15637] Preserve line breaks in event descriptions ... PHPBB3-15637	2018-07-07 21:25:43 +02:00
kasimi	517c601482	[ticket/15637] Updated test fixture to include complete event description ... PHPBB3-15637	2018-07-07 20:13:49 +02:00
kasimi	83a8280554	[ticket/15637] Remove trailing space from description ... PHPBB3-15637	2018-07-07 20:12:35 +02:00
kasimi	1c8570d0f5	[ticket/15637] Fixed removing white-spaces from description line ... PHPBB3-15637	2018-07-07 16:10:23 +02:00
kasimi	21faf69d31	[ticket/15637] Extract all lines before the first @tag ... PHPBB3-15637	2018-07-07 16:09:29 +02:00
hubaishan	27aba29d74	[ticket/15673] Fix Duplicated links in QuickLinks and main nav bar ... Add required class to common.css PHPBB3-15673	2018-07-04 16:40:53 +03:00
Alex Miles	a6fb2a6b8e	[ticket/15717] Using correct variable for log entry ... PHPBB3-15717	2018-07-04 01:23:30 +01:00
3D-I	49c1904823	[ticket/15705] fix phpbbcli language vs PHP ... PHPBB3-15705	2018-06-23 20:10:33 +02:00
Marc Alexander	9b56a28be0	Merge branch 'prep-release-3.2.3' into 3.2.x	2018-06-20 22:11:15 +02:00
Marc Alexander	0925a22062	Merge pull request #5233 from rxu/ticket/15678 ... [ticket/15678] Fix PHP warning in filesystem.php	2018-06-20 22:08:37 +02:00
Marc Alexander	2f3bd918ac	[ticket/15676] Use paragraphs and classes as suggested by hanakin ... PHPBB3-15676	2018-06-20 21:50:49 +02:00
Marc Alexander	754945e6ff	Merge pull request #5259 from rubencm/ticket/15695 ... [ticket/15695] Fix gen_rand_string returning less characters than expected	2018-06-19 13:32:10 +02:00
Rubén Calvo	d4d8aec02a	[ticket/15695] Fix gen_rand_string returning less characters than expected ... PHPBB3-15695	2018-06-18 22:38:14 +02:00
Jakub Senko	f4a6a2c2d7	[ticket/15606] Hide viewprofile link when unavailable ... PHPBB3-15606	2018-06-18 18:53:41 +02:00
Jakub Senko	6deae170bd	[ticket/15670] Fix SQL error when !f_list_topics and f_read ... PHPBB3-15670	2018-06-18 18:38:53 +02:00
Marc Alexander	02cbb864a5	Merge pull request #5245 from rubencm/ticket/15693 ... [ticket/15693] Fix get_rand_string()	2018-06-17 15:44:28 +02:00
Marc Alexander	7245bc9977	Merge branch 'prep-release-3.2.3' into 3.2.x	2018-06-17 15:40:00 +02:00
Marc Alexander	ecf19b13c8	Merge pull request #5218 from senky/ticket/15657 ... [ticket/15657] Add MCP queue events	2018-06-17 15:38:08 +02:00
Marc Alexander	aea56fcf57	Merge pull request #5246 from marc1706/ticket/15633 ... [ticket/15633] Double space to single space	2018-06-17 15:35:17 +02:00
scootergrisen	90e4eb2451	[ticket/15633] Double space to single space ... Value of GROUP_MAX_RECIPIENTS_EXPLAIN key contains double space. This removes one of the spaces. PHPBB3-15633	2018-06-17 14:10:22 +02:00
Marc Alexander	ec87cc1f3e	Merge pull request #5190 from Crizz0/ticket/15627 ... [ticket/15627] Reword the YES_ACCURATE_PM_BUTTON incl explaination	2018-06-17 13:27:06 +02:00
Marc Alexander	ff171f3a3b	Merge pull request #5158 from kasimi/ticket/15586 ... [ticket/15586] Fixed adding module the automatic way without specifying modes	2018-06-17 11:35:08 +02:00
Marc Alexander	9e50e52fa5	[ticket/15693] Update tests to reflect changes to gen_rand_string() ... PHPBB3-15693	2018-06-17 11:01:11 +02:00
Rubén Calvo	f75c400db4	[ticket/15693] Fix get_rand_string() ... PHPBB3-15693	2018-06-15 19:22:35 +02:00
Marc Alexander	8b7ae7c796	Merge branch 'prep-release-3.2.3' into 3.2.x	2018-06-12 22:35:06 +02:00
Marc Alexander	57cb513b8b	Merge pull request #5191 from Crizz0/ticket/15630 ... [ticket/15630] ACP_COOKIE_SETTINGS_EXPLAIN change <b> to <strong>	2018-06-12 22:34:25 +02:00
Marc Alexander	2aa9fc07d3	Merge branch 'prep-release-3.2.3' into 3.2.x	2018-06-12 22:24:16 +02:00
Marc Alexander	6369637fbf	Merge pull request #5192 from Crizz0/ticket/15629 ... [ticket/15629] Add info to RECAPTCHA_LANG and change to en-GB	2018-06-12 22:22:47 +02:00
Marc Alexander	94d64c672e	Merge branch 'prep-release-3.2.3' into 3.2.x	2018-06-12 22:10:05 +02:00
Marc Alexander	32eb2f427c	Merge pull request #5226 from rubencm/ticket/15504 ... [ticket/15504] Fix warning message	2018-06-12 22:06:55 +02:00
kasimi	8283f2393a	[ticket/15583] Update session time in AJAX request only once a minute ... PHPBB3-15583	2018-06-06 10:40:29 +02:00
rxu	bd91b6be87	[ticket/15678] Fix PHP warning in filesystem.php ... PHPBB3-15678	2018-06-01 22:51:53 +07:00
rxu	645ceb1bfe	[ticket/15548] Fix dead link in ACP_COOKIE_SETTINGS_EXPLAIN language entry ... PHPBB3-15548	2018-06-01 14:50:07 +02:00
Marc Alexander	7284bf5883	[ticket/15676] Use twig syntax ... PHPBB3-15676	2018-05-31 22:26:17 +02:00
Marc Alexander	25a46ef4b3	[ticket/15676] Simplify link text and use privacy link in cookie notice ... PHPBB3-15676	2018-05-31 22:15:36 +02:00
Marc Alexander	b5a79d9a9d	Merge branch 'prep-release-3.2.3' into 3.2.x	2018-05-31 19:51:55 +02:00