539 commits

Author	SHA1	Message	Date
Marc Alexander	8737fbac0d	Merge branch '3.3.x'	2019-10-07 21:31:52 +02:00
Marc Alexander	6f48b3c044	Merge branch '3.2.x' into 3.3.x	2019-10-07 21:31:47 +02:00
Marc Alexander	c75c13e555	Merge pull request #5671 from 3D-I/ticket/16144 ... [ticket/16144] Fallback to board's default style	2019-10-07 21:31:42 +02:00
Marc Alexander	dc0374eca3	Merge branch '3.3.x'	2019-09-25 17:13:06 +02:00
Jakub Senko	d7dd91d0e2	[ticket/15564] Improve wording since captcha can be invisible now ... PHPBB3-15564	2019-09-24 14:04:32 +02:00
Marc Alexander	17fe7baa38	Merge branch '3.3.x'	2019-09-20 22:23:18 +02:00
Marc Alexander	a7c02304a5	Merge branch '3.2.x' into 3.3.x	2019-09-20 22:23:06 +02:00
3D-I	3e23adf030	[ticket/16144] Provide extra fallback to board's default style for $user ... PHPBB3-16144	2019-09-01 09:20:22 +02:00
Christian Schnegelberger	b0465a6202	[ticket/16136] Implement extended explaination ... PHPBB3-16136	2019-08-22 18:37:23 +02:00
Christian Schnegelberger	29a77ea10d	[ticket/16136] Reword sentence for account already linked ... PHPBB3-16136	2019-08-19 20:41:27 +02:00
Marc Alexander	0bf84e5803	Merge branch '3.3.x'	2019-08-17 11:15:00 +02:00
Marc Alexander	d4652c1b20	Merge branch '3.2.x' into 3.3.x	2019-08-17 11:14:00 +02:00
Marc Alexander	e59af343b8	Merge pull request #5658 from rubencm/ticket/13175 ... [ticket/13175] Check if account is already linked when using OAuth	2019-08-17 11:13:51 +02:00
Marc Alexander	607077af9a	Merge branch '3.3.x'	2019-08-15 10:47:38 +02:00
Marc Alexander	f5f03d24e9	Merge branch '3.2.x' into 3.3.x	2019-08-15 10:47:34 +02:00
rubencm	ecb39bc435	[ticket/13175] Check if account is already linked when using OAuth ... PHPBB3-13175	2019-08-14 14:51:19 +00:00
3D-I	37de0f96d1	[ticket/16080] Use placeholder ... PHPBB3-16080	2019-08-12 21:15:54 +02:00
3D-I	964c212f03	[ticket/16080] Provide a meaningful error message for deleted installed style ... PHPBB3-16080	2019-08-12 01:20:33 +02:00
Rubén Calvo	4f5a8f6983	[ticket/15255] Move language strings from acp/common to common ... PHPBB3-15255	2019-05-09 19:01:00 +02:00
luzpaz	a9a28859d4	[ticket/15424] Multiple typo fixes in docs & comments ... Fixed typos in some docs, guidelines, some non-user-facing files. PHPBB3-15424	2019-05-08 22:20:56 +02:00
Marc Alexander	c044f44db2	Merge branch '3.2.x'	2019-04-13 12:38:48 +02:00
battye	59a84a71be	[ticket/15917] Special unapproved topics message ... For forums that have no approved posts but also have topics awaiting approval, to avoid the inconsistency of saying 'no posts' alongside a positive post count. PHPBB3-15917	2019-02-13 06:57:29 +00:00
Marc Alexander	649b35fdcc	Merge branch '3.2.x'	2018-10-28 19:49:44 +01:00
Jakub Senko	1d2a654ad7	[ticket/10432] Fix errors and address privacy concern ... PHPBB3-10432	2018-10-28 10:12:13 +01:00
Marc Alexander	fa6a6a8fcf	Merge pull request #5328 from rubencm/ticket/15255 ... [ticket/15255] Move language strings from acp/common to common	2018-09-18 08:57:21 +02:00
Rubén Calvo	da77d04dd9	[ticket/15255] Move language strings from acp/common to common ... PHPBB3-15255	2018-08-30 21:18:16 +02:00
Rubén Calvo	5fbe929a1d	[ticket/15692] Check if argument is a valid resource ... PHPBB3-15692	2018-08-20 12:05:29 +02:00
Tristan Darricau	4829dfe487	Merge branch '3.2.x' ... * 3.2.x: [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:40:26 +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	c6a35237a2	[ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY ... PHPBB3-15676	2018-05-31 09:31:33 +02:00
Marc Alexander	09718a565b	Merge branch '3.2.x'	2018-02-19 21:27:07 +01:00
Akbar	bee9ddbfdf	[ticket/12579] Add "BUTTON_" strings for Post and PM buttons ... PHPBB3-12579	2018-02-13 16:09:30 +05:30
luzpaz	e13ba99c81	[ticket/15424] Multiple typo fixes in docs & comments ... Fixed typos in some docs, guidelines, some non-user-facing files. PHPBB3-15424	2017-10-29 12:44:01 +01:00
Máté Bartus	10f487fbf6	Merge branch '3.2.x'	2017-09-10 15:18:06 +02:00
Oliver Schramm	a29048abd6	[ticket/14933] Make "route not found" more user-friendly ... PHPBB3-14933	2017-09-09 17:08:27 +02:00
Michael Miday	dca07283e9	[ticket/15354] Use Lang Var ... PHPBB3-15354	2017-09-09 11:20:05 +02:00
Oliver Schramm	aa15e61e4c	Merge branch '3.2.x'	2017-09-08 13:53:38 +02:00
Crizzo	4dfd12d5b2	[ticket/15350] Changes outdated wiki-link to new docs/ ... PHPBB3-15350	2017-09-07 15:05:53 +02:00
Rubén Calvo	d89df35959	[ticket/15305] Throw exception if stream_copy_to_stream() fail ... PHPBB3-15305	2017-08-23 17:18:53 +02:00
Rubén Calvo	8ffb14b305	[ticket/15305] Add streams ... PHPBB3-15305	2017-08-23 17:18:53 +02:00
Rubén Calvo	e41d4b0d0c	[ticket/15287] Launch exception if storage is not available ... PHPBB3-15287	2017-07-24 09:42:29 +02:00
Rubén Calvo	8bbec30748	[ticket/15253] Add language strings ... PHPBB3-15253	2017-07-20 19:55:52 +02:00
Tristan Darricau	88b32580dc	[ticket/11150] Add Remove && Update buttons ... PHPBB3-11150	2017-04-23 21:01:04 +02:00
Rubén Calvo	74f1b19dfe	[ticket/14974] make cookie notice configurable via language files ... PHPBB3-14974	2017-03-13 03:09:35 +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	03be94c1f7	Merge branch '3.1.x' into 3.2.x	2017-01-04 17:44:11 +01:00
Marc Alexander	7cad25e4cb	[ticket/14838] Do not query full attachments table in feeds ... The fetch_attachments() will also now throw a runtime exception if a feed tries to do this nonetheless. PHPBB3-14838	2017-01-03 22:56:42 +01:00
Jakub Senko	33d1d19f97	[ticket/14586] Add OAuth1 support ... PHPBB3-14586	2016-05-30 13:02:49 +02:00
Marc Alexander	465eabbc65	Merge branch '3.1.x' into 3.2.x	2016-03-27 12:34:49 +02:00