1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 16:40:21 +01:00

34298 Commits

Author SHA1 Message Date
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
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
Marc Alexander
c390b353c6
Merge branch '3.3.x' 2020-05-02 13:49:04 +02:00
Marc Alexander
b29a011186
Merge branch '3.2.x' into 3.3.x 2020-05-02 12:05:07 +02:00
Marc Alexander
20d64270a4
Merge pull request #5943 from mrgoldy/ticket/15560
[ticket/15560] Correct redirect on perma-deleting posts
2020-05-02 12:04:30 +02:00
Marc Alexander
8b79aae6dd
Merge branch '3.3.x' 2020-05-01 16:41:12 +02:00
Marc Alexander
15c1975f6e
Merge pull request #5948 from hanakin/ticket/16439
[ticket/16439] fix post target h3 color
2020-05-01 16:40:54 +02:00
Marc Alexander
74b2f2de9c
Merge branch '3.3.x' 2020-05-01 16:19:57 +02:00
Marc Alexander
008e313652
Merge pull request #5909 from marc1706/ticket/14754
[ticket/14754] Only one email notification per topic
2020-05-01 16:19:36 +02:00
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
a0c8df6679
[ticket/14754] Add effectively_installed() to migration
PHPBB3-14754
2020-04-29 22:14:04 +02:00
Marc Alexander
e59d514ed3
Merge branch '3.3.x' 2020-04-29 21:52:01 +02:00
Marc Alexander
a43cdbac54
Merge pull request #5902 from mrgoldy/ticket/15937
[ticket/15937] Google reCAPTCHA v3 Plugin
2020-04-29 21:51:52 +02:00
Marc Alexander
f75020d594
Merge branch '3.3.x' 2020-04-29 21:47:54 +02:00
Marc Alexander
0cf4212835
Merge branch '3.2.x' into 3.3.x 2020-04-29 21:47:12 +02:00
Marc Alexander
c11cb57c66
Merge pull request #5896 from mrgoldy/ticket/16310
[ticket/16310] Fix soft delete check when editing a post
2020-04-29 20:53:55 +02:00
hanakin
2fd174d7cf [ticket/16439] small cleanup
PHPBB3-16439
2020-04-24 10:09:56 -10:00
Marc Alexander
457cf411ef
Merge branch '3.3.x' 2020-04-23 21:58:40 +02:00
Marc Alexander
009bc4a1a3
Merge branch '3.2.x' into 3.3.x 2020-04-23 21:58:32 +02:00
Marc Alexander
a12b70468f
Merge pull request #5931 from ansavin/ticket/16367
[ticket/16367] Add charset to Content-Type response header in feed controller
2020-04-23 21:58:18 +02:00
ansavin
8c8655863e [ticket/16367] Add charset to Content-Type response header in feed controller
PHPBB3-16367
2020-04-23 22:00:57 +03:00
kasimi
e174f1475f
[ticket/16449] Don't close void elements
PHPBB3-16449
2020-04-23 12:07:29 +02:00
kasimi
cdd3441ead
[ticket/16449] Use short array syntax
PHPBB3-16449
2020-04-23 11:00:45 +02:00
kasimi
20f68ef013
[ticket/16449] Rename template variable PRE to S_PRE_STEP
PHPBB3-16449
2020-04-23 11:00:13 +02:00
kasimi
976516a559
[ticket/16449] Removed L_ prefix from CONFIRM_MESSAGE
PHPBB3-16449
2020-04-23 10:31:52 +02:00
kasimi
39b0ac4fda
[ticket/16449] Fixed indentations
PHPBB3-16449
2020-04-23 10:26:37 +02:00