1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-23 17:10:53 +01:00

34331 Commits

Author SHA1 Message Date
Marc Alexander
ac2b8f2674
Merge branch '3.3.x' 2020-05-10 23:15:01 +02:00
Marc Alexander
1169e1915d
Merge pull request #5940 from mrgoldy/ticket/16434
[ticket/16434] Add forum id to advanced search in viewforum
2020-05-10 23:14:51 +02:00
mrgoldy
7e41902db5 Merge branch '3.3.x' 2020-05-07 23:21:56 +02:00
mrgoldy
919597bfcf Merge branch '3.2.x' into 3.3.x 2020-05-07 23:21:51 +02:00
mrgoldy
8a8403ff8a Merge pull request #5228 from ioannisbat/ticket/15672
[ticket/15672] Keep same format in Submit changes.
2020-05-07 23:21:45 +02:00
mrgoldy
7330cdee2c [ticket/15672] Readd config setting and correct HTML adjustment
PHPBB3-15672
2020-05-07 16:23:09 +02:00
ioannisbat
b8b6625872 [ticket/15672] Keep same format in Submit changes.
PHPBB3-15672
2020-05-07 16:14:51 +02:00
mrgoldy
82a20fed1c Merge branch '3.3.x' 2020-05-07 16:00:51 +02:00
mrgoldy
1b50650267 Merge branch '3.2.x' into 3.3.x 2020-05-07 15:59:41 +02:00
mrgoldy
6be65cb512 Merge pull request #5963 from dark-1/ticket/16463
[ticket/16463] Fix "acp_board.php" for "ACP_SUBMIT_CHANGES".
2020-05-07 15:56:01 +02:00
mrgoldy
209c72a97b Merge branch '3.3.x' 2020-05-04 22:53:34 +02:00
mrgoldy
cb0583df1d Merge branch '3.2.x' into 3.3.x 2020-05-04 22:53:29 +02:00
mrgoldy
56ddf5827f Merge pull request #5960 from rxu/ticket/16458
[ticket/16458] Add template events to acp_profile.html
2020-05-04 22:53:24 +02:00
mrgoldy
bde15d8539 Merge branch '3.3.x' 2020-05-04 22:51:05 +02:00
mrgoldy
9433ff449a Merge branch '3.2.x' into 3.3.x 2020-05-04 22:51:00 +02:00
mrgoldy
c44b366350 Merge pull request #5954 from kasimi/ticket/16448
[ticket/16448] Add event core.mcp_get_post_data_after
2020-05-04 22:50:54 +02:00
mrgoldy
e4e70fb263 Merge branch '3.3.x' 2020-05-04 22:48:40 +02:00
mrgoldy
0857237fbb Merge branch '3.2.x' into 3.3.x 2020-05-04 22:48:35 +02:00
mrgoldy
27a95675d0 Merge pull request #5952 from kasimi/ticket/16446
[ticket/16446] Add event core.message_history_modify_rowset
2020-05-04 22:48:29 +02:00
mrgoldy
8321aeb79f Merge branch '3.3.x' 2020-05-04 22:46:27 +02:00
mrgoldy
f74a4e6e9b Merge branch '3.2.x' into 3.3.x 2020-05-04 22:46:22 +02:00
mrgoldy
504901ccb6 Merge pull request #5950 from kasimi/ticket/16444
[ticket/16444] Add event core.ucp_pm_view_message_before
2020-05-04 22:46:17 +02:00
mrgoldy
01c2df01e8 Merge branch '3.3.x' 2020-05-04 22:44:18 +02:00
mrgoldy
281330b1d0 Merge branch '3.2.x' into 3.3.x 2020-05-04 22:44:13 +02:00
mrgoldy
48db45f85b Merge pull request #5949 from kasimi/ticket/16443
[ticket/16443] Add event core.ucp_pm_compose_modify_parse_after
2020-05-04 22:44:07 +02:00
Marc Alexander
6a934a21a5
Merge branch '3.3.x' 2020-05-04 22:34:09 +02:00
Marc Alexander
a414584f4b
Merge pull request #5955 from kasimi/ticket/16449
[ticket/16449] Remove AJAX actions for extension management
2020-05-04 22:31:08 +02:00
Marc Alexander
2fe7266bd2
Merge branch '3.3.x' 2020-05-04 20:37:48 +02:00
Marc Alexander
af97a8312c
Merge branch '3.2.x' into 3.3.x 2020-05-04 20:37:38 +02:00
Marc Alexander
a8d2b819c4
Merge pull request #5965 from mrgoldy/ticket/16467
[ticket/16467] Fix PostgreSQL connection password
2020-05-04 20:37:12 +02:00
mrgoldy
ed974c2c84 [ticket/16467] Fix PostgreSQL connection password
PHPBB3-16467
2020-05-04 11:49:45 +02:00
Marc Alexander
febfdf5458
Merge branch '3.3.x' 2020-05-03 16:06:54 +02:00
Marc Alexander
1a9c7fe9ca
Merge branch '3.2.x' into 3.3.x 2020-05-03 16:06:45 +02:00
Marc Alexander
38c3552908
Merge pull request #5953 from kasimi/ticket/16447
[ticket/16447] Add core.ucp_pm_compose_compose_pm_basic_info_query_after
2020-05-03 16:06:08 +02:00
Marc Alexander
dfe58088f0
Merge branch '3.3.x' 2020-05-03 14:05:56 +02:00
Marc Alexander
0bfe270078
Merge branch '3.2.x' into 3.3.x 2020-05-03 14:04:24 +02:00
Marc Alexander
8a4d7685f7
Merge pull request #5956 from kasimi/ticket/16450
[ticket/16450] Fix layout of ACP permission tabs
2020-05-03 14:03:50 +02:00
Marc Alexander
b303ecd3c6
Merge branch '3.3.x' 2020-05-03 11:06:35 +02:00
Marc Alexander
a88a68f8a6
Merge branch '3.2.x' into 3.3.x 2020-05-03 11:06:08 +02:00
Marc Alexander
9c590dae7b
Merge pull request #5961 from mrgoldy/ticket/16461
[ticket/16461] Update .gitignore to ignore node_modules and idea
2020-05-03 11:05:15 +02:00
Marc Alexander
220cbb7f91
Merge branch '3.3.x' 2020-05-03 11:01:54 +02:00
Marc Alexander
6fc6e7ced2
Merge pull request #5962 from marc1706/ticket/16462
[ticket/16462] Skip tests that require the LDAP extension
2020-05-03 11:01:36 +02:00
Dark❶
277f7d906d
[ticket/16463] Fix "acp_board.php" for "ACP_SUBMIT_CHANGES".
PHPBB3-16463
2020-05-03 11:56:48 +05:30
mrgoldy
0d8a406aae Merge branch '3.3.x' 2020-05-02 23:04:58 +02:00
mrgoldy
cdcb787991 Merge branch '3.2.x' into 3.3.x 2020-05-02 23:04:53 +02:00
mrgoldy
ae4575369c Merge pull request #5951 from hanakin/ticket/16445
[ticket/16445] remove un-semantic erroneous hr.divider from viewtopic_body
2020-05-02 23:04:47 +02:00
mrgoldy
93cc9987cf Merge branch '3.3.x' 2020-05-02 22:49:54 +02:00
mrgoldy
8ae115f9bd Merge pull request #5957 from rxu/ticket/16452
[ticket/16452] Upgrade to FontAwesome 5
2020-05-02 22:38:02 +02:00
Marc Alexander
d591b4d2da
[ticket/16462] Skip tests that require the LDAP extension
PHPBB3-16462
2020-05-02 21:55:55 +02:00
mrgoldy
be74893e02 [ticket/16461] Update .gitignore to ignore node_modules and idea
PHPBB3-16461
2020-05-02 15:35:01 +02:00