Commit graph

33667 commits

Author SHA1 Message Date
Marc Alexander
5849fb69a4
Merge branch '3.2.x' 2018-10-28 21:57:28 +01:00
Marc Alexander
f4063e475d
[3.2.x] Update versions to 3.2.5-dev 2018-10-28 21:55:08 +01:00
Marc Alexander
e64f96bf27
Merge branch 'prep-release-3.2.4' into 3.2.x 2018-10-28 21:52:51 +01:00
Marc Alexander
02fd679b26
[prep-release-3.2.4] Update changelog for 3.2.4-RC1 2018-10-28 20:27:10 +01:00
Marc Alexander
46bc335524
[prep-release-3.2.4] Add migration for 3.2.4-RC1 2018-10-28 20:19:07 +01:00
Marc Alexander
448d67cc30
[prep-release-3.2.4] Update versions for 3.2.4 2018-10-28 20:13:54 +01:00
Marc Alexander
d55cdc3546
[prep-release-3.2.4] Update versions for 3.2.4-RC1 2018-10-28 20:13:01 +01:00
Dark❶
9e375f32eb [ticket/15858] Unapproved User(s) appearing as Guest in Team Page
PHPBB3-15858
2018-10-29 00:28:43 +05:30
Marc Alexander
649b35fdcc
Merge branch '3.2.x' 2018-10-28 19:49:44 +01:00
Marc Alexander
ed64a69760
Merge pull request #4223 from senky/ticket/10432
[ticket/10432] Don't require username when user forgets password
2018-10-28 19:49:38 +01:00
Ruben Calvo
a7a0bccc81 Merge branch '3.2.x' 2018-10-28 17:02:36 +00:00
Ruben Calvo
dc109b1952 Merge remote-tracking branch 'marc/ticket/15857' into 3.2.x 2018-10-28 17:00:58 +00:00
Marc Alexander
09f17a438e
[ticket/15857] Add rubencm to CREDITS.txt
[ci skip]

PHPBB3-15857
2018-10-28 17:50:29 +01:00
Marc Alexander
f7056d232b
Merge branch '3.2.x' 2018-10-28 16:32:51 +01:00
Marc Alexander
68b3c5d1f0
Merge pull request #5408 from senky/ticket/15833
[ticket/15833] Add core.avatar_manager_avatar_delete_after event
2018-10-28 16:32:46 +01:00
Marc Alexander
fbb9b368d3
Merge branch '3.2.x' 2018-10-28 16:28:33 +01:00
Marc Alexander
60414dec86
Merge pull request #5415 from senky/ticket/15838
[ticket/15838] Add core.ucp_register_register_after
2018-10-28 16:28:28 +01:00
Marc Alexander
89d0d2828f
Merge branch '3.2.x' 2018-10-28 16:21:58 +01:00
Marc Alexander
2121b1274a
Merge pull request #5416 from senky/ticket/15839
[ticket/15839] Add core.ucp_login_link_template_after
2018-10-28 16:21:24 +01:00
Jakub Senko
ddc9e318d0
[ticket/10432] Improve PASSWORD_UPDATED_IF_EXISTED lang
PHPBB3-10432
2018-10-28 16:14:26 +01:00
Jakub Senko
6a35385308
[ticket/15833] Add core.avatar_manager_avatar_delete_after event
PHPBB3-15833
2018-10-28 14:19:33 +01:00
Marc Alexander
3f5c13db25
Merge branch '3.2.x' 2018-10-28 13:40:36 +01:00
Marc Alexander
96a68bcccb
Merge pull request #5414 from senky/ticket/15837
[ticket/15837] Add core.ucp_register_welcome_email_before
2018-10-28 13:40:30 +01:00
Marc Alexander
54f8adf4f3
Merge branch '3.2.x' 2018-10-28 13:30:44 +01:00
Marc Alexander
25d42b0f10
Merge pull request #5407 from senky/ticket/15832
[ticket/15832] Add core.acp_users_avatar_sql event
2018-10-28 13:30:33 +01:00
Marc Alexander
7bc61277c1
Merge branch '3.2.x' 2018-10-28 13:19:51 +01:00
Marc Alexander
99abb311c7
Merge pull request #5406 from senky/ticket/15831
[ticket/15831] Add core.acp_users_modify_signature_sql_ary event
2018-10-28 13:19:44 +01:00
Marc Alexander
8613a2d77f
Merge branch '3.2.x' 2018-10-28 12:08:51 +01:00
Marc Alexander
77b7d9ba69
Merge pull request #5404 from Elsensee/ticket/15830
[ticket/15830] Move event to a more useful place
2018-10-28 12:08:45 +01:00
Jakub Senko
1d2a654ad7
[ticket/10432] Fix errors and address privacy concern
PHPBB3-10432
2018-10-28 10:12:13 +01:00
Marc Alexander
002694e37b
Merge branch '3.2.x' 2018-10-28 00:16:23 +02:00
Marc Alexander
b5d36645f2
Merge pull request #5402 from 3D-I/ticket/15825
[ticket/15825] Add core.acp_manage_forums_move_content_sql_before
2018-10-28 00:16:18 +02:00
Marc Alexander
a78b3057ed
Merge branch '3.2.x' 2018-10-28 00:12:32 +02:00
Marc Alexander
41bafd4d7d
Merge pull request #5401 from dark-1/ticket/15827
[ticket/15827] Add *_username_{prepend/append} template events
2018-10-28 00:08:15 +02:00
Marc Alexander
097f7bd565
Merge branch '3.2.x' 2018-10-28 00:02:44 +02:00
Marc Alexander
d29d42d7b9
Merge pull request #5395 from hubaishan/ticket/15817
[ticket/15817] Fix installtion failed with Oracle
2018-10-28 00:02:38 +02:00
Marc Alexander
994e9c5c5b
Merge branch '3.2.x' 2018-10-27 23:48:59 +02:00
Marc Alexander
20393592d7
Merge pull request #5387 from senky/ticket/15593
[ticket/15593] Do not allow print view with direct URL
2018-10-27 23:48:53 +02:00
Marc Alexander
9038e9da7b
Merge branch '3.2.x' 2018-10-27 23:44:00 +02:00
Marc Alexander
0cded66ff2
Merge pull request #5380 from senky/ticket/15619
[ticket/15619] Always display CPF legend
2018-10-27 23:43:55 +02:00
Marc Alexander
23230d6b55
Merge branch '3.2.x' 2018-10-27 23:36:51 +02:00
Marc Alexander
a772949162
Merge pull request #5363 from Elsensee/ticket/14656
[ticket/14656] Add List-Unsubscribe header to emails
2018-10-27 23:36:45 +02:00
Marc Alexander
cf68f0bdd5
Merge branch '3.2.x' 2018-10-27 22:35:48 +02:00
Marc Alexander
628e5fbae6
Merge pull request #5399 from 3D-I/ticket/15826
[ticket/15826] Add core.mcp_main_fork_sql_after
2018-10-27 22:35:42 +02:00
Marc Alexander
9aae801eee
Merge branch '3.2.x' 2018-10-27 22:33:50 +02:00
Marc Alexander
7dbfc1e59c
Merge pull request #5424 from rubencm/ticket/15849
[ticket/15849] Stop using php4 constructors
2018-10-27 22:33:44 +02:00
Marc Alexander
11dfe7f18e
Merge branch '3.2.x' 2018-10-27 22:26:36 +02:00
Marc Alexander
042f47fc3f
Merge pull request #5420 from senky/ticket/15850
[ticket/15850] Fix "Duplicate entry" for notification types
2018-10-27 22:26:29 +02:00
3Di
379900b4ed
Merge pull request #2 from phpbb/3.2.x
3.2.x
2018-10-26 18:33:30 +02:00
Marc Alexander
ecf343f577
Merge branch 'master' into ticket/12629 2018-10-26 10:16:04 +02:00