1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 04:24:56 +02:00

3229 Commits

Author SHA1 Message Date
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
7f8182fbb5
Merge branch '3.3.x' 2019-08-17 11:02:23 +02:00
Marc Alexander
7dd822942a
Merge branch '3.2.x' into 3.3.x 2019-08-17 11:02:16 +02:00
Marc Alexander
9a992a4866
Merge pull request #5656 from 3D-I/ticket/16019
[ticket/16019] Deny prosilver's uninstallation
2019-08-17 11:02:08 +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
Marc Alexander
93a472f08e
Merge pull request #5654 from 3D-I/ticket/16080
[ticket/16080] ACP - Provide meaningful error msg for deleted installed style
2019-08-15 10:47:29 +02:00
3D-I
6de0c7bc66 [ticket/16019] Amend explanation
PHPBB3-16019
2019-08-14 20:09:13 +02:00
3D-I
3975983481 [ticket/16019] Short explanation
PHPBB3-16019
2019-08-14 18:47:17 +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
a8f2b461d4 [ticket/16019] Short array syntax and tabulation
PHPBB3-16019
2019-08-14 05:29:11 +02:00
3D-I
6a79083c43 [ticket/16019] Rewamp ACP_STYLES_EXPLAIN
PHPBB3-16019
2019-08-14 05:08:26 +02:00
3D-I
3fbdb2f345 [ticket/16019] Deny prosilver's uninstallation
PHPBB3-16019
2019-08-13 04:31:07 +02:00
Marc Alexander
e84aee3662
Merge branch '3.3.x' 2019-08-12 21:40:22 +02:00
Marc Alexander
c0bd3122e0
Merge branch '3.2.x' into 3.3.x 2019-08-12 21:40:17 +02:00
Marc Alexander
89e95941b1
Merge pull request #5650 from 3D-I/ticket/16127
[ticket/16127] Add UI for email $max_chunk_size
2019-08-12 21:40:09 +02: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
Marc Alexander
1e699453ea
Merge branch '3.3.x' 2019-08-11 20:45:01 +02:00
Marc Alexander
54fff02f95
Merge branch '3.2.x' into 3.3.x 2019-08-11 20:44:57 +02:00
Marc Alexander
0a5d167441
Merge pull request #5648 from 3D-I/ticket/16109
[ticket/16109] Fix Custom Profile Field visibility's explain
2019-08-11 20:44:53 +02:00
Marc Alexander
dbcc4043b9
Merge branch '3.3.x' 2019-08-11 17:15:55 +02:00
Marc Alexander
96335c0402
Merge branch '3.2.x' into 3.3.x 2019-08-11 17:15:50 +02:00
3D-I
d18e547332 [ticket/15897] Fix Emojis' SQL Error in Attachment Comment
PHPBB3-15897
2019-08-10 21:02:45 +02:00
3D-I
b6e5a5fca8 [ticket/16127] Minimum 1 and rephrasing.
PHPBB3-16127
2019-08-08 01:33:16 +02:00
3D-I
82a04debca [ticket/16127] Add UI for email $max_chunk_size
PHPBB3-16127
2019-08-07 22:28:40 +02:00
3D-I
170dc2a63b [ticket/16109] Fix Custom Profile Field visibility's explain
PHPBB3-16109
2019-08-06 02:39:02 +02:00
Marc Alexander
627c8b75b1
Merge branch '3.3.x' 2019-07-21 21:12:11 +02:00
Marc Alexander
5d2e144624
Merge branch '3.2.x' into 3.3.x 2019-07-21 21:12:07 +02:00
Marc Alexander
17c6cd3676
Merge pull request #5562 from senky/ticket/15961
[ticket/15961] Use newer TLS in SMTP
2019-07-21 21:12:00 +02:00
Marc Alexander
102ea13e5d Merge branch '3.3.x' 2019-06-17 15:32:31 +02:00
Marc Alexander
6d4fdb1f15 Merge branch '3.2.x' into 3.3.x 2019-06-17 15:32:07 +02:00
Marc Alexander
ab6fd30d0d Merge pull request #5608 from senky/ticket/15967
[ticket/15967] Improve admin activate email wording
2019-06-17 15:31:42 +02:00
Marc Alexander
3d8218e9d6 Merge branch '3.3.x' 2019-06-17 10:27:02 +02:00
Marc Alexander
30f522351e Merge branch '3.2.x' into 3.3.x 2019-06-17 10:26:33 +02:00
Marc Alexander
7f50c26941 Merge pull request #5622 from 3D-I/ticket/15211
[ticket/15211] Fix Emoji characters in forum name
2019-06-17 10:26:04 +02:00
Marc Alexander
2d80fc3c4a Merge branch '3.3.x' 2019-06-17 10:12:23 +02:00
Marc Alexander
fc8d0c54e9 Merge branch '3.2.x' into 3.3.x 2019-06-17 10:11:57 +02:00
Marc Alexander
c0917c2862 Merge pull request #5600 from senky/ticket/16047
[ticket/16047] Improve wording for PM permissions
2019-06-17 10:11:31 +02:00
3D-I
608cf00aea [ticket/15211] Wording
PHPBB3-15211
2019-06-12 15:05:12 +02:00
3D-I
aad8ffff51 [ticket/15211] Fix Emoji characters in forum name
PHPBB3-15211
2019-06-11 05:44:17 +02:00
Jakub Senko
79d033082e
[ticket/16047] Improve wording for PM permissions
PHPBB3-16047
2019-06-08 20:03:51 +02:00
Marc Alexander
acc5f7d4f1
Merge branch '3.3.x' 2019-06-06 21:59:35 +02:00
Marc Alexander
bc59342e1a
Merge branch '3.2.x' into 3.3.x 2019-06-06 21:59:30 +02:00
Marc Alexander
4f44145301
Merge pull request #5603 from senky/ticket/16000
[ticket/16000] Link to php's date()
2019-06-06 21:59:25 +02:00
Marc Alexander
2c3e3245cd
Merge branch '3.3.x' 2019-06-04 22:21:58 +02:00
Marc Alexander
99d83673f5
Merge branch '3.2.x' into 3.3.x 2019-06-04 22:21:52 +02:00
Jakub Senko
25176d4588
[ticket/15967] Improve admin activate email wording
PHPBB3-15967
2019-06-04 20:07:12 +02:00