1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-12 23:44:32 +02:00
Commit Graph

11513 Commits

Author SHA1 Message Date
Marc Alexander
a7eb80b83b Merge branch '3.2.x' 2018-11-28 23:26:01 +01:00
Marc Alexander
f8e1c66e81 Merge pull request #5449 from senky/ticket/15878
[ticket/15878] Add attachments to ucp_pm_view_message
2018-11-28 23:25:56 +01:00
Marc Alexander
685397c32e Merge branch '3.2.x' 2018-11-28 23:21:50 +01:00
Marc Alexander
c89f4500f0 Merge pull request #5443 from toxyy/ticket/15872
[ticket/15872] Add show_user_activity to display_user_activity_modify_actives
2018-11-28 23:21:46 +01:00
battye
101829b4dc [ticket/15883] Add error for invalid usernames being added to a group
Update the ACP and the UCP so that when bulk adding users to a group,
if invalid usernames are submitted alongside valid usernames then a
message will be displayed to inform the user what the invalid usernames
are.

PHPBB3-15883
2018-11-26 13:08:57 +00:00
Marc Alexander
2778c9b76b Merge branch '3.2.x' 2018-11-25 11:10:28 +01:00
rxu
79e6636092 [ticket/15881] Reset login keys for account reactivation after password update
PHPBB3-15881
2018-11-24 11:31:32 +07:00
Jakub Senko
22b8b45f28 [ticket/15878] Add attachments to ucp_pm_view_message
PHPBB3-15878
2018-11-19 15:35:26 +01:00
Marc Alexander
9f69d42f99 Merge branch '3.2.x' 2018-11-18 20:00:15 +01:00
Marc Alexander
6c5578a65b Merge pull request #5445 from 3D-I/ticket/15873
[ticket/15873] Add core.mcp_report_template_data
2018-11-18 20:00:07 +01:00
Marc Alexander
20fc2b7c2e Merge branch '3.2.x' 2018-11-18 12:26:10 +01:00
Marc Alexander
5b3eb2d61c Merge pull request #5442 from rxu/ticket/15871
[ticket/15871] Fix PHP 7.1+ warning in ACP extensions module
2018-11-18 12:24:16 +01:00
3D-I
fcd916cc4f [ticket/15873] Add core.mcp_report_template_data
PHPBB3-15873
2018-11-18 12:22:06 +01:00
Marc Alexander
4036b2620b Merge branch '3.2.x' 2018-11-17 22:18:13 +01:00
rxu
da9da88d11 [ticket/15875] Fix PHP fatal error on BBCode parsing
PHPBB3-15875
2018-11-18 01:33:56 +07:00
rxu
af1e8901e5 [ticket/15871] Add $php_ini to the class properties list
PHPBB3-15871
2018-11-15 21:01:17 +07:00
Alec
a2480f992d [ticket/15872] Add show_user_activity to display_user_activity_modify_actives
Add config option for toggling most active forum & topic in the user profile.

A bool was added to display_user_activity_modify_actives to achieve this.

PHPBB3-15872
2018-11-12 01:54:11 -05:00
rxu
b03da3a9b2 [ticket/15871] Use php_ini service
PHPBB3-15871
2018-11-11 20:36:49 +07:00
Marc Alexander
06a3bfd203 Merge branch '3.2.x' 2018-11-11 14:03:27 +01:00
Marc Alexander
7801bac09a Merge branch 'prep-release-3.2.4' into 3.2.x 2018-11-11 12:22:20 +01:00
rxu
720477a9da [ticket/15871] Fix PHP 7.1+ warning in ACR extensions module
PHPBB3-15871
2018-11-11 15:24:08 +07:00
Marc Alexander
36a8e48083 [prep-release-3.2.4] Update version numbers for 3.2.4 release 2018-11-10 21:19:49 +01:00
Marc Alexander
0dfbb60bc3 Merge pull request #42 from phpbb/ticket/security/227
[ticket/security/227] Replace ImageMagick support with thumbnail event
2018-11-10 17:04:00 +01:00
Marc Alexander
65226168ee Merge pull request #5434 from rubencm/ticket/15860
[ticket/15860] Fix format of backup files
2018-11-10 17:01:34 +01:00
Derky
5c695d709e [ticket/security/227] Change thumbnail_created event version to 3.2.4
SECURITY-227
2018-11-04 23:17:49 +01:00
Derky
e2d26e102d [ticket/security/227] Remove "no thumbnail support" message
SECURITY-227
2018-11-04 23:10:44 +01:00
Ruben Calvo
31703585cb [ticket/15860] Unique_id() return 16 characters again
PHPBB3-15860
2018-10-31 10:41:57 +00:00
Ruben Calvo
fa1fd316fe [ticket/15860] Fix regexp
PHPBB3-15860
2018-10-30 22:56:20 +00:00
Marc Alexander
bab86aac7f [ticket/15860] Limit regexp to expected formats
PHPBB3-15860
2018-10-30 20:49:14 +00:00
Ruben Calvo
1f14f7c327 [ticket/15860] Fix format of backup files
PHPBB3-15860
2018-10-30 11:18:34 +00:00
Marc Alexander
f4063e475d [3.2.x] Update versions to 3.2.5-dev 2018-10-28 21:55:08 +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
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
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
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
994e9c5c5b Merge branch '3.2.x' 2018-10-27 23:48:59 +02:00