Marc Alexander
bdf2e6f709
Merge branch '3.3.x'
2020-08-25 21:05:00 +02:00
Christian Schnegelberger
34d415a6b3
[ticket/16588] Updates link to plural rules from 3.2.x to 3.3.x
...
PHPBB3-16588
2020-08-25 12:11:56 +02:00
Marc Alexander
066d14ab3c
Merge branch '3.3.x'
2020-04-21 21:04:50 +02:00
Alfredo Ramos
43e3b3e328
[ticket/16315] Remove Google+ profile field
...
PHPBB3-16315
2020-03-24 22:16:51 -06:00
Marc Alexander
218d5dd75f
Merge branch '3.3.x'
2020-02-14 07:32:24 +01:00
Marc Alexander
49b4156cfd
Merge branch '3.2.x' into 3.3.x
2020-02-14 07:32:20 +01:00
mrgoldy
a6c5def4f4
[ticket/16344] Un-indent irrelevant language strings
...
PHPBB3-16344
2020-02-04 22:32:10 +01:00
mrgoldy
13f5997554
[ticket/16344] Move DOMAIN_NO_MX_RECORD_EMAIL to common.php
...
PHPBB3-16344
2020-02-04 19:16:43 +01:00
Marc Alexander
6b8ccbc379
Merge branch '3.3.x'
2020-01-22 21:21:13 +01:00
Marc Alexander
9b12a923f5
Merge branch '3.2.x' into 3.3.x
2020-01-22 21:21:07 +01:00
mrgoldy
e7c028eed6
[ticket/16332] Code and Quote language strings globally available
...
PHPBB3-16332
2020-01-21 14:30:12 +01:00
Marc Alexander
fb47ac5f33
Merge branch '3.3.x'
2020-01-03 11:07:45 +01:00
Marc Alexander
29c9621137
[ticket/16230] Improve wording of FILESYSTEM_CANNOT_ lang strings
...
PHPBB3-16230
2020-01-02 10:45:24 +01:00
Marc Alexander
0e0659cf34
Merge branch '3.3.x'
2019-11-22 10:56:37 +01:00
Marc Alexander
896b31272b
Merge pull request #5686 from v12mike/ticket/9837
...
[ticket/9837] Display unapproved posts to their authors
2019-11-22 10:56:33 +01:00
Marc Alexander
0a4cc5d201
[ticket/9837] Apply suggested changes by CHItA
...
PHPBB3-9837
2019-11-22 09:20:18 +01:00
v12mike
92362441bd
[ticket/9837] Make unapproved posts visible to posters
...
Add tests
Tidy up code
Improve user message formatting
PHPBB3-9837
2019-11-21 13:44:20 +01:00
v12mike
78a913581c
[ticket/9837] Display unapproved posts to posters
...
Add tests and improve style template
PHPBB3-9837
2019-11-21 13:44:20 +01:00
Marc Alexander
6574ff6b1d
Merge branch '3.3.x'
2019-11-16 14:22:15 +01:00
mrgoldy
0b39e4e854
[ticket/16008] Clean up phpBB OAuth system
...
PHPBB3-16008
2019-11-03 11:41:39 +01:00
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
