1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-10 14:34:39 +02:00
Commit Graph

11774 Commits

Author SHA1 Message Date
Marc Alexander
d56597b02f Merge branch '3.3.x' 2020-04-29 22:21:23 +02:00
Marc Alexander
a65877cd7e Merge branch '3.2.x' into 3.3.x 2020-04-29 22:21:14 +02:00
Marc Alexander
e30d10288d Merge pull request #5918 from dark-1/ticket/16411
[ticket/16411] Add vars to notification core events
2020-04-29 22:21:05 +02:00
Marc Alexander
f3598d2f4d Merge pull request #5934 from kasimi/ticket/16425
[ticket/16425] Add event core.generate_smilies_modify_sql
2020-04-22 19:28:54 +02:00
Marc Alexander
f888e730b0 Merge branch '3.3.x' 2020-04-22 14:52:48 +02:00
Marc Alexander
691496af3c Merge pull request #5934 from kasimi/ticket/16425
[ticket/16425] Add event core.generate_smilies_modify_sql
2020-04-22 14:52:29 +02:00
Dark❶
e0a7676c3f [ticket/16411] Add vars to notification core events
PHPBB3-16411
2020-04-22 10:32:29 +05:30
kasimi
09ce2ab70e [ticket/16425] Added @since 3.3.1-RC1
PHPBB3-16425
2020-04-21 23:47:09 +02:00
Marc Alexander
699a89c57b Merge branch '3.3.x' 2020-04-21 22:03:44 +02:00
Marc Alexander
52f50287e9 Merge branch '3.2.x' into 3.3.x 2020-04-21 22:03:33 +02:00
Marc Alexander
0f51a85d8f Merge pull request #5958 from kasimi/ticket/16453
[ticket/16453] Load permission lang files before core.permissions
2020-04-21 22:03:07 +02:00
Marc Alexander
3d6c92a19b Merge branch '3.3.x' 2020-04-21 21:41:25 +02:00
Marc Alexander
da77c9e744 Merge branch '3.2.x' into 3.3.x 2020-04-21 21:41:16 +02:00
Marc Alexander
c251ab51c0 Merge pull request #5936 from dark-1/ticket/16429
[ticket/16429] Add vars to 2 ACP User core events
2020-04-21 21:41:07 +02:00
Marc Alexander
8de73183e8 Merge branch '3.3.x' 2020-04-21 21:21:49 +02:00
Marc Alexander
ebc889baea Merge branch '3.2.x' into 3.3.x 2020-04-21 21:21:38 +02:00
Marc Alexander
14cd51056b Merge pull request #5933 from kasimi/ticket/16424
[ticket/16424] Add base_url to generate_smilies events
2020-04-21 21:21:25 +02:00
Marc Alexander
4c529c4bbb Merge branch '3.3.x' 2020-04-21 20:46:23 +02:00
Marc Alexander
7e8ef278fe Merge pull request #5919 from AlfredoRamos/ticket/16338
[ticket/16338] Add DuckDuckGo bot
2020-04-21 20:46:14 +02:00
kasimi
573a1b7d35 [ticket/16453] Load permission lang files before core.permissions
PHPBB3-16453
2020-04-21 14:14:33 +02:00
Marc Alexander
e566ff10b4 Merge branch '3.3.x' 2020-04-16 20:49:27 +02:00
Marc Alexander
6b47cbb4c5 Merge pull request #5860 from JoshyPHP/ticket/16361
[ticket/16361] Change the link shortener
2020-04-16 20:49:15 +02:00
mrgoldy
782ab7f9c1 Merge branch '3.3.x' 2020-04-14 16:27:10 +02:00
mrgoldy
51be1ad2c1 Merge branch '3.2.x' into 3.3.x 2020-04-14 16:27:04 +02:00
mrgoldy
15a7a77bb6 Merge pull request #5924 from 3D-I/ticket/16416
[ticket/16416] Fix non-numeric value encountered - ACP attachments
2020-04-14 16:26:58 +02:00
mrgoldy
2632997017 Merge branch '3.3.x' 2020-04-14 16:19:16 +02:00
mrgoldy
f68bdb9e08 Merge branch '3.2.x' into 3.3.x 2020-04-14 16:19:10 +02:00
mrgoldy
b4a900c993 Merge pull request #5925 from 3D-I/ticket/16418
[ticket/16418] Fix non-numeric value - ACP board start date
2020-04-14 16:19:04 +02:00
kasimi
d927154217 [ticket/16425] Removed whitespace
PHPBB3-16425
2020-04-09 17:12:06 +02:00
Marc Alexander
c0a95e8e25 Merge branch '3.3.x' 2020-04-08 21:39:38 +02:00
Marc Alexander
8566f81d4f Merge pull request #5900 from mrgoldy/ticket/16180
[ticket/16180] Allow adding message to test email
2020-04-08 21:39:32 +02:00
Dark❶
f4c45f3f21 [ticket/16429] Add vars to 2 ACP User core events
PHPBB3-16429
2020-04-07 12:39:52 +05:30
Alfredo Ramos
99dbea1469 [ticket/16338] Add DuckDuckGo bot
PHPBB3-16338
2020-04-06 16:02:20 -05:00
kasimi
6cab639d8e [ticket/16425] Added table alias
PHPBB3-16425
2020-04-05 16:02:32 +02:00
kasimi
21dbabe6f2 [ticket/16425] Add event core.generate_smilies_modify_sql
PHPBB3-16425
2020-04-05 11:12:21 +02:00
kasimi
fe9254790c [ticket/16424] Add base_url to generate_smilies events
PHPBB3-16424
2020-04-05 11:10:53 +02:00
Marc Alexander
315deeb0bc Merge branch '3.3.x' 2020-03-29 20:48:44 +02:00
Marc Alexander
6e89799b05 Merge branch '3.2.x' into 3.3.x 2020-03-29 20:48:38 +02:00
Marc Alexander
8877688ee4 Merge pull request #5901 from mrgoldy/ticket/16122
[ticket/16122] Display user rank in MCP user notes
2020-03-29 20:48:32 +02:00
3D-I
39c6d11ed6 [ticket/16418] Fix non-numeric value - ACP board start date
PHPBB3-16418
2020-03-28 15:34:06 +01:00
3D-I
5b5a29849e [ticket/16416] Fix non-numeric value encountered - ACP attachments settings
PHPBB3-16416
2020-03-26 11:27:37 +01:00
3D-I
b9123cad7c [ticket/16416] Fix non-numeric value encountered - ACP attachments settings
PHPBB3-16416
2020-03-26 00:58:24 +01:00
Marc Alexander
eae537ab14 Merge branch '3.3.x' 2020-03-22 18:03:55 +01:00
Marc Alexander
d7435d02d3 Merge branch '3.2.x' into 3.3.x 2020-03-22 18:03:50 +01:00
Marc Alexander
3539f9372d Merge pull request #5891 from mrgoldy/ticket/16391
[ticket/16391] Add extensions info_acp_ lang file to MCP logs
2020-03-22 18:03:45 +01:00
Dark❶
2c0509a5c7 [ticket/16411] Add vars to notification core events
PHPBB3-16411
2020-03-22 03:40:37 +05:30
Dark❶
443b931b36 [ticket/16411] Add vars to notification core events
PHPBB3-16411
2020-03-22 01:47:53 +05:30
Marc Alexander
b91dd633ae Merge branch '3.3.x' 2020-03-16 21:53:25 +01:00
Marc Alexander
20490b0618 Merge branch '3.2.x' into 3.3.x 2020-03-16 21:53:21 +01:00
Marc Alexander
8b1f69c1a3 Merge pull request #5893 from mrgoldy/ticket/15275
[ticket/15275] Fix IP lookup pagination
2020-03-16 21:53:16 +01:00