1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-08 09:53:33 +02:00

34106 Commits

Author SHA1 Message Date
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
mrgoldy
edd9633565 Merge branch '3.3.x' 2020-04-06 17:24:41 +02:00
mrgoldy
c7be5d25d0 Merge branch '3.2.x' into 3.3.x 2020-04-06 17:16:48 +02:00
mrgoldy
c990818200 Merge pull request #5908 from phpbb-es/ticket/16404
[ticket/16404] Small bug in prosilver
2020-04-06 17:16:43 +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
mrgoldy
c71d624a35 Merge branch '3.3.x' 2020-03-29 12:02:42 +02:00
mrgoldy
669c45125c Merge branch '3.2.x' into 3.3.x 2020-03-29 12:01:13 +02:00
mrgoldy
876dc581a8 Merge pull request #5928 from marc1706/ticket/16419
[ticket/16419] Add mrgoldy to CREDITS.txt
2020-03-29 11:59:23 +02:00
Marc Alexander
a267db851a
[ticket/16419] Add mrgoldy to CREDITS.txt
PHPBB3-16419
2020-03-29 11:23:05 +02: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
Marc Alexander
cfaa22494e
Merge branch '3.3.x' 2020-03-22 17:58:39 +01:00
Marc Alexander
0e15eb4f00
Merge branch '3.2.x' into 3.3.x 2020-03-22 17:58:34 +01:00
Marc Alexander
119261dc5d
Merge pull request #5912 from mrgoldy/ticket/16407
[ticket/16407] Fix MCP Post reported message
2020-03-22 17:58:29 +01:00
Marc Alexander
b42ee7d52e
Merge branch '3.3.x' 2020-03-21 17:17:30 +01:00
Marc Alexander
8c6ef3f0fd
Merge branch '3.2.x' into 3.3.x 2020-03-21 17:17:25 +01:00
Marc Alexander
0fa0013a69
Merge pull request #5915 from mrgoldy/ticket/16222
[ticket/16222] Fix timezone suggestion for 00:00
2020-03-21 17:17:19 +01:00
mrgoldy
c6412a186c [ticket/16222] Fix timezone suggestion for 00:00
PHPBB3-16222
2020-03-18 16:17:42 +00:00
Marc Alexander
0482df490e
Merge branch '3.3.x' 2020-03-17 17:48:42 +01:00
Marc Alexander
e72e6679a3
Merge branch '3.2.x' into 3.3.x 2020-03-17 17:48:37 +01:00
Marc Alexander
0788754a5f
Merge pull request #5911 from dark-1/ticket/16406
[ticket/16406] Fix Core Event of notification
2020-03-17 17:48:32 +01:00
mrgoldy
a37f95e7db [ticket/16407] Fix MCP Post reported message
PHPBB3-16407
2020-03-16 22:41:52 +01:00
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
Marc Alexander
5ab5b949d2
Merge branch '3.3.x' 2020-03-16 17:24:33 +01:00
Marc Alexander
f830f0f6df
Merge branch '3.2.x' into 3.3.x 2020-03-16 17:24:28 +01:00
Marc Alexander
4721a4ae19
Merge pull request #5899 from 3D-I/ticket/16400
[ticket/16400] Add posting_editor_* events
2020-03-16 17:24:23 +01:00
Marc Alexander
2fe453c64c
Merge branch '3.3.x' 2020-03-16 16:34:23 +01:00
Marc Alexander
c4a5099e56
Merge branch '3.2.x' into 3.3.x 2020-03-16 16:34:18 +01:00
Marc Alexander
be343298e8
Merge pull request #5890 from mrgoldy/ticket/15979
[ticket/15979] Fix restoring/deleting when editing soft-deleted post
2020-03-16 16:34:12 +01:00
Marc Alexander
48a8195e3a
Merge branch '3.3.x' 2020-03-16 15:54:31 +01:00
Marc Alexander
54017bcf63
Merge branch '3.2.x' into 3.3.x 2020-03-16 15:54:24 +01:00
Marc Alexander
90a4ea4f9b
Merge pull request #5889 from mrgoldy/ticket/15609
[ticket/15609] MCP Queue and Report forum and topic identifiers
2020-03-16 15:54:18 +01:00
Marc Alexander
d588a4baa8
Merge branch '3.3.x' 2020-03-16 14:19:56 +01:00
Marc Alexander
6b5cbe3768
Merge branch '3.2.x' into 3.3.x 2020-03-16 14:19:51 +01:00
Marc Alexander
46b4a74549
Merge pull request #5895 from 3D-I/ticket/16399
[ticket/16399] Fix Emoji in topic title for MCP split topic
2020-03-16 14:19:46 +01:00
Marc Alexander
cc58370371
Merge branch '3.3.x' 2020-03-15 19:34:43 +01:00
Marc Alexander
879362c5b5
Merge branch '3.2.x' into 3.3.x 2020-03-15 19:34:38 +01:00
Marc Alexander
1e7fc0f7df
Merge pull request #5903 from 3D-I/ticket/16403
[ticket/16403] Fix attachment icon in MCP reports
2020-03-15 19:34:33 +01:00
Marc Alexander
ffd7ebf05e
Merge branch '3.3.x' 2020-03-15 17:25:55 +01:00
Marc Alexander
8df557f621
Merge branch '3.2.x' into 3.3.x 2020-03-15 17:25:51 +01:00
Marc Alexander
8b8606349e
Merge pull request #5904 from 3D-I/ticket/13914
[ticket/13914] Cast to INT mixed style ID data in user setup
2020-03-15 17:25:46 +01:00
Marc Alexander
777f91bf39
Merge pull request #5910 from marc1706/ticket/16405
[ticket/16405] Update npm dependencies to latest versions
2020-03-15 17:11:14 +01:00
Marc Alexander
6951e970f3
Merge branch '3.3.x' 2020-03-15 16:52:41 +01:00
Marc Alexander
2b8b04dd55
Merge pull request #5898 from mrgoldy/ticket/16225
[ticket/16225] Display style version in ACP
2020-03-15 16:52:37 +01:00