Commit graph

11381 commits

Author SHA1 Message Date
Marc Alexander
c41efac6b7
Merge branch '3.3.x' 2019-07-28 10:38:42 +02:00
Marc Alexander
5a76d541a2
Merge branch '3.2.x' into 3.3.x 2019-07-28 10:38:38 +02:00
Marc Alexander
ae62bc4642
Merge pull request #5575 from rubencm/ticket/14459
[ticket/14459] Check language input for group and fix template logic
2019-07-28 10:38:33 +02:00
rubencm
c281604d0b [ticket/14459] Use language property
PHPBB3-14459
2019-07-27 23:52:01 +00:00
rubencm
acb5794d50 [ticket/14459] Rename variable
PHPBB3-14459
2019-07-27 15:15:58 +00:00
Marc Alexander
f3cad544e7
Merge branch '3.3.x' 2019-07-27 16:21:03 +02:00
Marc Alexander
812edebfb7
Merge branch '3.2.x' into 3.3.x 2019-07-27 16:20:58 +02:00
Marc Alexander
65ff149fc9
Merge pull request #5601 from senky/ticket/16013
[ticket/16013] Allow admins to use disallowed username
2019-07-27 16:20:53 +02:00
Marc Alexander
703f86941c
Merge branch '3.3.x' 2019-07-27 14:57:39 +02:00
Marc Alexander
3433f61ccb
Merge branch '3.2.x' into 3.3.x 2019-07-27 14:57:34 +02:00
Marc Alexander
d06e9745c2
Merge pull request #5631 from kasimi/ticket/16106
[ticket/16106] Add core.mcp_main_before
2019-07-27 14:57:30 +02:00
Marc Alexander
c8d07fef5e
Merge branch '3.3.x' 2019-07-27 14:38:09 +02:00
Marc Alexander
84fdba604d
Merge branch '3.2.x' into 3.3.x 2019-07-27 14:38:02 +02:00
Marc Alexander
1b4f82cd1d
Merge pull request #5630 from 3D-I/ticket/16103
[ticket/16103] Add core.pm_modify_message_subject
2019-07-27 14:37:58 +02:00
Marc Alexander
d6293db147
Merge branch '3.3.x' 2019-07-23 21:18:31 +02:00
Marc Alexander
c382536f47
Merge branch '3.2.x' into 3.3.x 2019-07-23 21:18:27 +02:00
Marc Alexander
b59e101d8d
Merge pull request #5610 from espipj/ticket/16070
[ticket/16070] Remove support for WebSTAR and Xitami
2019-07-23 21:18:22 +02:00
kasimi
a12d93b8b8
[ticket/16106] Add core.mcp_main_before
PHPBB3-16106
2019-07-23 21:13:08 +02:00
Marc Alexander
edd3472fcb
Merge branch '3.3.x' 2019-07-23 21:08:59 +02:00
Marc Alexander
b5e6f34cd9
Merge branch '3.2.x' into 3.3.x 2019-07-23 21:08:54 +02:00
Marc Alexander
a4ad94ef5c
Merge pull request #5624 from senky/ticket/16089
[ticket/16089] Add core.confirm_box_ajax_before
2019-07-23 21:08:50 +02:00
Marc Alexander
cd7a8a7ca1
Merge branch '3.3.x' 2019-07-22 21:32:02 +02:00
Marc Alexander
b2c5f8fb48
Merge branch '3.2.x' into 3.3.x 2019-07-22 21:31:57 +02:00
Marc Alexander
d738397e6f
Merge pull request #5606 from senky/ticket/15976
[ticket/15976] Reset user_passchg only if user changed password
2019-07-22 21:31:53 +02:00
Marc Alexander
21442388ff
Merge branch '3.3.x' 2019-07-22 20:55:13 +02:00
Marc Alexander
204e3b1fe0
Merge branch '3.2.x' into 3.3.x 2019-07-22 20:55:06 +02:00
Marc Alexander
6559bb9511
Merge pull request #5572 from dark-1/ticket/16023
[ticket/16023] Add core.message_history_modify_template_vars
2019-07-22 20:55:00 +02:00
Jakub Senko
90dcd1a0f4
[ticket/16089] Add core.confirm_box_ajax_before
PHPBB3-16089
2019-07-22 08:19:32 +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
3D-I
2f8b9fb549 [ticket/16103] Add core.pm_modify_message_subject
PHPBB3-16103
2019-07-20 20:35:25 +02:00
rubencm
6787f6706e [ticket/14459] Fix
PHPBB3-14459
2019-06-25 16:37:16 +00:00
rubencm
0184865c5c [ticket/14459] Uppercase string to try to match language keys
PHPBB3-14459
2019-06-25 16:33:38 +00:00
rubencm
e0395fa2f2 [ticket/14459] Uppercase string to try to match language keys
PHPBB3-14459
2019-06-25 16:29:51 +00:00
rubencm
6876fcb46a [ticket/14459] Remove unused variables
PHPBB3-14459
2019-06-25 15:59:12 +00:00
rubencm
caa767e5a8 [ticket/14459] Fix template logic
PHPBB3-14459
2019-06-21 23:32:22 +00:00
rubencm
caf5ee42fd [ticket/14459] Fix rebase
PHPBB3-14459
2019-06-20 01:46:52 +00:00
rubencm
d0b50b9ca1 [ticket/14459] Check language input for group
PHPBB3-14459
2019-06-20 01:45:36 +00:00
Marc Alexander
6941b3934d
Merge pull request #5582 from paul999/ticket/16043
Make sure $phpbb_container is not null before trying to get anything …
2019-06-19 07:35:43 +02:00
Paul Sohier
4be13baef9 [ticket/16043] Check if not null before getting anything from the container
This is only happening when there is basicly an error during
init of the container.

PHPBB3-16043
2019-06-18 10:30:31 +02:00
Marc Alexander
6bcfeea6cb Merge branch '3.3.x' 2019-06-17 15:28:35 +02:00
Marc Alexander
5cef0d2035 Merge branch '3.2.x' into 3.3.x 2019-06-17 15:28:10 +02:00
Marc Alexander
70f09a60c7 Merge pull request #5620 from senky/ticket/16075
[ticket/16075] Fix warning in PM filter
2019-06-17 15:27:45 +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
670a606d11 Merge branch '3.3.x' 2019-06-17 10:21:36 +02:00
Marc Alexander
a6803e6a18 Merge branch '3.2.x' into 3.3.x 2019-06-17 10:21:09 +02:00
Marc Alexander
2a0b38cac0 Merge pull request #5604 from senky/ticket/15984
[ticket/15984] Use private cache-control
2019-06-17 10:20:36 +02:00