Marc Alexander
a24a8a6757
Merge branch '3.2.x'
2018-01-25 18:44:22 +01:00
Marc Alexander
c89051eb28
Merge pull request #5103 from JoshyPHP/ticket/15531
...
[ticket/15531] Log malformed BBCodes
2018-01-25 18:23:09 +01:00
Marc Alexander
ca537a691d
Merge branch '3.2.x'
2018-01-24 19:16:28 +01:00
Marc Alexander
928a8c0e89
Merge pull request #5100 from senky/ticket/15528
...
[ticket/15528] Display style phpBB version
2018-01-24 19:16:24 +01:00
Marc Alexander
ef0680fd19
Merge branch '3.2.x'
2018-01-24 18:32:19 +01:00
Jakub Senko
277f4efcc7
[ticket/15514] Improve SMTP_SERVER lang key
...
PHPBB3-15514
2018-01-24 13:34:23 +01:00
Jakub Senko
233a07ceda
[ticket/15528] Rename column label
...
PHPBB3-15528
2018-01-22 22:04:23 +01:00
JoshyPHP
531d9dfa1f
[ticket/15531] Log malformed BBCodes
...
PHPBB3-15531
2018-01-22 03:34:47 +01:00
Jakub Senko
abe218c34a
[ticket/15528] Display style phpBB version
...
PHPBB3-15528
2018-01-21 10:54:07 +01:00
Derky
c94c2a1ec2
Merge branch '3.2.x'
2017-12-27 19:32:20 +01:00
Marc Alexander
9567162295
[ticket/15322] Adjust language variables as suggested
...
PHPBB3-15322
2017-12-27 13:31:09 +01:00
Marc Alexander
4bbda5bc45
[ticket/15322] Adjust email language and move force sender setting
...
PHPBB3-15322
2017-12-16 18:32:55 +01:00
Marc Alexander
4e045ed767
[ticket/15322] Try to make new email setting more readable
...
PHPBB3-15322
2017-12-13 21:31:07 +01:00
Marc Alexander
9f055e1af3
[ticket/15322] Add config setting for -f parameter & remove mail function name
...
The -f parameter can now be added via configuration in the ACP. Addtionally,
the config setting for the mail function name has been removed.
PHPBB3-15322
2017-12-11 21:56:21 +01:00
Marc Alexander
4523eb0812
Merge branch '3.2.x'
2017-11-01 21:33:40 +01:00
Marc Alexander
c3cc6bcbac
Merge pull request #4977 from rxu/ticket/15384
...
[ticket/15384] Add linebreaks to SMTP/Jabber configuration option explanations
2017-11-01 21:33:35 +01:00
Marc Alexander
e86afe6799
[ticket/15384] Use html5 version of <br> instead of xhtml one
...
PHPBB3-15384
2017-11-01 20:08:45 +01:00
Marc Alexander
e157d8890b
Merge pull request #5020 from marc1706/ticket/15424
...
[ticket/15424] Multiple typo fixes in docs & comments
2017-11-01 12:27:13 +01:00
Marc Alexander
6259789e02
Merge branch '3.2.x'
2017-11-01 10:40:01 +01:00
Marc Alexander
a6c5204cbd
Merge pull request #4973 from DavidIQ/ticket/15372
...
[ticket/15372] Add permission for listing topics without being able to read them
2017-11-01 10:39:56 +01:00
Marc Alexander
c6e8a5ddee
Merge branch '3.2.x'
2017-10-31 15:51:24 +01:00
Marc Alexander
200562548e
Merge pull request #4980 from senky/ticket/15381
...
[ticket/15381] Better explain CONTACT_US_ENABLE_EXPLAIN
2017-10-31 15:51:20 +01:00
Marc Alexander
f5467c560a
Merge branch '3.2.x'
2017-10-31 14:17:32 +01:00
Marc Alexander
78610f0406
Merge pull request #4975 from senky/ticket/15273
...
[ticket/15273] Better explain cookie path
2017-10-31 14:17:28 +01:00
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
David Colón
dc5267728b
[ticket/15372] Add and handle f_list_topics permission
2017-10-26 16:09:01 -04:00
Jakub Senko
99374731d1
[ticket/15381] Better explain CONTACT_US_ENABLE_EXPLAIN
...
PHPBB3-15381
2017-10-02 12:17:04 +02:00
rxu
c5e8b759c1
[ticket/15384] Add linebreaks to SMTP/Jabber configuration option explanations
...
PHPBB3-15384
2017-10-02 10:55:25 +07:00
Jakub Senko
402b7a0973
[ticket/15273] Better explain cookie path
...
PHPBB3-15273
2017-09-28 13:53:59 +02:00
Rubén Calvo
cb350e20e1
[ticket/15289] Add permission for storage
...
PHPBB3-15289
2017-09-10 11:55:05 +02:00
Rubén Calvo
d7b1018110
[ticket/15289] Language fixes
...
PHPBB3-15289
2017-09-08 16:53:20 +02:00
Rubén Calvo
c785bfa00e
[ticket/15289] Fix comment typo
...
PHPBB3-15289
2017-09-08 16:25:18 +02:00
Rubén Calvo
4c9670363c
[ticket/15289] Improve error messages
...
PHPBB3-15289
2017-09-08 16:25:18 +02:00
Rubén Calvo
c5f3dec2f2
[ticket/15289] Update acp storage
...
PHPBB3-15289
2017-09-08 16:25:18 +02:00
Rubén Calvo
19b99a0770
[ticket/15289] Add twig extension to generate inputs from the template
...
PHPBB3-15289
2017-09-08 16:22:10 +02:00
Rubén Calvo
737a8f9f7d
[ticket/15289] Update acp module
...
PHPBB3-15289
2017-09-08 16:22:10 +02:00
Rubén Calvo
ba9f082bf4
[ticket/15289] Add acp module
...
PHPBB3-15289
2017-09-08 16:22:10 +02:00
Oliver Schramm
aa15e61e4c
Merge branch '3.2.x'
2017-09-08 13:53:38 +02:00
Jim Mossing Holsteyn
563fc6ed6c
[ticket/15352] Descriptions are not using in categories
...
PHPBB3-15352
2017-09-08 13:50:42 +02:00
Marc Alexander
f101532c09
Merge branch '3.2.x'
2017-07-16 21:42:30 +02:00
Marc Alexander
34e9b4d066
Merge pull request #35 from phpbb/ticket/security-203-rhea
...
[ticket/security-203] Fully validate version check data in version helper -- Rhea
2017-07-16 15:29:35 +02:00
Marc Alexander
4ed45c4e12
Merge pull request #32 from phpbb/ticket/security-203
...
[ticket/security-203] Fully validate version check data in version helper
2017-07-16 11:17:36 +02:00
Marc Alexander
976d799ff2
Merge branch '3.2.x'
2017-06-24 21:42:54 +02:00
Marc Alexander
b59073cf3e
Merge pull request #4794 from lr94/ticket/15176
...
[ticket/15176] Add setting for user activity display limit.
2017-06-24 21:42:39 +02:00
Marc Alexander
509ea30aa2
Merge branch '3.2.x'
2017-06-05 11:02:49 +02:00
Marc Alexander
346c784bf3
Merge branch '3.1.x' into 3.2.x
2017-06-05 11:02:30 +02:00
Marc Alexander
a6939fcb8e
Merge pull request #4784 from rubencm/ticket/15150
...
[ticket/15150] Add Jabber SSL context configuration options
2017-06-05 11:00:38 +02:00
Marc Alexander
47231fe435
Merge branch '3.2.x'
2017-04-26 19:08:30 -04:00
Matt Friedman
95f61af798
[ticket/15198] Add PHP version to board stats in the ACP
...
PHPBB3-15198
2017-04-26 09:40:15 -07:00
Tristan Darricau
69571f9cef
[ticket/11150] Fix comments
...
PHPBB3-11150
2017-04-23 21:01:15 +02:00
