mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 17:40:43 +01:00
Code Issues Releases Wiki Activity
31,497 Commits 18 Branches 191 Tags
Commit Graph

31497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
d880443ea2 Merge branch '3.2.x' into 3.3.x 2019-07-31 07:50:23 +02:00
Marc Alexander
5307da11b6 Merge pull request #5641 from EA117/ticket/16040 
[ticket/16040] Forum list won't display topic icons containing a space.
 2019-07-31 07:50:16 +02:00
Marc Alexander
b4d4709726
Merge pull request #5644 from marc1706/ticket/16115 
[ticket/16115] Add PHP 7.4snapshot to travis CI build matrix
 2019-07-30 20:42:22 +02:00
Derky
2f85fc53dc Merge branch '3.2.x' into 3.3.x 2019-07-30 07:39:16 +02:00
Derky
6ada02b060 Merge pull request #5628 from marc1706/ticket/16101 
[ticket/16101] Add Referrer-Policy header to phpBB's headers
 2019-07-30 07:34:13 +02:00
Marc Alexander
90722a3c66
Merge branch '3.2.x' into 3.3.x 2019-07-29 21:45:18 +02:00
Marc Alexander
a02524e7fc
Merge pull request #5633 from kasimi/ticket/16108 
[ticket/16108] Add topiclist_row_topic_by_author_before|after
 2019-07-29 21:45:13 +02:00
Marc Alexander
2e634e9f96
Merge branch '3.2.x' into 3.3.x 2019-07-29 21:43:37 +02:00
Marc Alexander
207b678896
Merge pull request #5632 from kasimi/ticket/16107 
[ticket/16107] Add mcp_move_destination_forum_before|after
 2019-07-29 21:43:32 +02:00
Marc Alexander
e086d4039e
Merge branch '3.2.x' into 3.3.x 2019-07-29 21:38:18 +02:00
Marc Alexander
51205febe3
Merge pull request #5635 from EA117/ticket/16066 
[ticket/16066] Fix FORM_INVALID always returned for banned user.
 2019-07-29 21:38:13 +02:00
Marc Alexander
d4e623ffee
Merge branch '3.2.x' into 3.3.x 2019-07-29 21:31:12 +02:00
Marc Alexander
6078f58343
Merge pull request #5639 from marc1706/ticket/16112-3.3.x 
[ticket/16112] Update composer dependencies for 3.3.x
 2019-07-29 21:30:56 +02:00
Marc Alexander
6440f97a4f
Merge pull request #5638 from marc1706/ticket/16112 
[ticket/16112] Update composer dependencies for 3.2.x
 2019-07-29 21:30:53 +02:00
Marc Alexander
be3a58aff1
Merge branch '3.2.x' into 3.3.x 2019-07-29 20:48:28 +02:00
Marc Alexander
0ffd0d1924
Merge pull request #5627 from senky/ticket/16097 
[ticket/16097] Add core.viewtopic_gen_sort_selects_before
 2019-07-29 20:48:23 +02:00
Marc Alexander
eaf42f3c72
[ticket/16115] Add PHP 7.4snapshot to travis CI build matrix 
PHPBB3-16115
 2019-07-29 20:46:35 +02:00
Jakub Senko
cd6a0026d5
[ticket/16097] Correctly classify sort_days as int 
PHPBB3-16097
 2019-07-29 08:22:19 +02:00
Marc Alexander
189f3fd68e Merge pull request #5636 from marc1706/ticket/15886 
[ticket/15886] Use getMockBuilder instead of removed getMock()
 2019-07-29 08:21:10 +02:00
Dark❶
221a91a26f
[ticket/16114] mcp_topic_postrow_post_details_author_username_{append/prepend} 
PHPBB3-16114
 2019-07-29 03:22:04 +05:30
Dark❶
cd75b712d4
[ticket/16113] Add core.mcp_topic_modify_sql_ary 
PHPBB3-16113
 2019-07-29 03:13:29 +05:30
Dark❶
b30822ea80
[ticket/16114] mcp_topic_postrow_post_details_author_username_{append/prepend} 
PHPBB3-16114
 2019-07-29 02:57:24 +05:30
EA117
81fd854983 [ticket/16040] Forum list won't display topic icons containing a space. 
Change proSilver's viewforum_body.html template to be in line with existing
viewtopic_body.html behavior, in which the topic icon path will be surrounded
in quotes, and presence of a space in the topic icon file name will not fail.

PHPBB3-16040
 2019-07-28 16:21:10 -05:00
Marc Alexander
7543508570
Merge branch 'ticket/16112' into ticket/16112-3.3.x 2019-07-28 23:11:52 +02:00
Marc Alexander
4084939620
[ticket/16112] Update composer dependencies for 3.2.x 
PHPBB3-16112
 2019-07-28 22:33:47 +02:00
EA117
792882ef63 [ticket/16054] Restore ability to login from any template. 
Moving the login form's add_form_key() work into page_header(), so that the
template variables required for presenting a login form are again available
to any template that chooses to consume them.

PHPBB3-16054
 2019-07-28 15:15:39 -05:00
Marc Alexander
e1962acd4e
[ticket/15886] Use getMockBuilder instead of removed getMock() 
PHPBB3-15886
 2019-07-28 21:53:04 +02:00
EA117
636fc7fad7 [ticket/16066] Fix FORM_INVALID always returned for banned user. 
After the introduction of add_form_key() and check_form_key() calls to
login_box() in phpBB 3.2.6 and later, if a banned user attempts to login,
they receive a "The submitted form was invalid. Try submitting again."
Instead of the message indicating that they are banned, and why.

This is happening because check_ban() actually calls into login_box()
recursively, but after the $user->session_id has been switched to a new
session ID for the logging-on user.  Therefore, now that check_form_key()
has been introduced to login_box(), it is impossible for check_form_key()
to succeed during this recursive call.

Fix is to make login_box()'s use of check_form_key() conditional on whether
IN_CHECK_BAN is defined, so that the recursive call does not attempt to
re-validate the form_key again.  Note the form_key has already been
successfully verified by the original call into login_box(), prior to calling
into check_ban() and attempting to recursively call login_box().  So the
protection of why check_form_key() was added is still intact with this change.

PHPBB3-16066
 2019-07-28 12:25:54 -05:00
Marc Alexander
710a0b3ea3
Merge branch '3.2.x' into 3.3.x 2019-07-28 17:55:30 +02:00
Marc Alexander
b53f95e577
Merge pull request #5494 from mrgoldy/ticket/15885 
[ticket/15885] Display group rank on memberlist_body
 2019-07-28 17:55:25 +02:00
Nekstati
6b04fda0f3
[ticket/15467] Fix JS for permissions setting 
PHPBB3-15467
 2019-07-28 22:47:01 +07:00
Marc Alexander
2df9230902
Merge branch '3.2.x' into 3.3.x 2019-07-28 17:18:40 +02:00
Marc Alexander
f567b2bb69
Merge pull request #5459 from mrgoldy/ticket/15886 
[ticket/15886] Group helper functions
 2019-07-28 15:31:09 +02:00
Dark❶
8ac4f955ca
[ticket/16111] Add core.message_history_modify_sql_ary 
PHPBB3-16111
 2019-07-28 18:36:37 +05:30
Dark❶
01d0457f67
[ticket/16111] Add core.message_history_modify_sql_ary 
PHPBB3-16111
 2019-07-28 18:06:16 +05:30
Dark❶
5cd0aad3c6
[ticket/16111] Add core.message_history_modify_sql_ary 
PHPBB3-16111
 2019-07-28 17:51:17 +05:30
rxu
4d640555ef [ticket/15467] Fix JS for permissions setting 
PHPBB3-15467
 2019-07-28 18:34:35 +07:00
Marc Alexander
cf96967677
[ticket/15886] Fix minor code style issues 
PHPBB3-15886
 2019-07-28 12:21:46 +02:00
Marc Alexander
423345d517
Merge pull request #5557 from senky/ticket/15088 
[ticket/15088] Avoid code repetitions in extension manager
 2019-07-28 10:40:58 +02:00
Marc Alexander
5a76d541a2
Merge branch '3.2.x' into 3.3.x 2019-07-28 10:38:38 +02:00
Marc Alexander
ae62bc4642
Merge pull request #5575 from rubencm/ticket/14459 
[ticket/14459] Check language input for group and fix template logic
 2019-07-28 10:38:33 +02:00
rubencm
c281604d0b [ticket/14459] Use language property 
PHPBB3-14459
 2019-07-27 23:52:01 +00:00
Marc Alexander
065feb3ff9
[ticket/15088] Ensure phpBB version is set in tests 
PHPBB3-15088
 2019-07-27 21:32:54 +02:00
rubencm
acb5794d50 [ticket/14459] Rename variable 
PHPBB3-14459
 2019-07-27 15:15:58 +00:00
Jakub Senko
b0334d6b4f
[ticket/15088] Avoid code repetitions in extension manager 
PHPBB3-15088
 2019-07-27 16:51:56 +02:00
Marc Alexander
ee51bf26fa
Merge pull request #5566 from JoshyPHP/ticket/16017 
[ticket/16017] Add support for Argon2id as default password hashing
 2019-07-27 16:30:25 +02:00
Marc Alexander
812edebfb7
Merge branch '3.2.x' into 3.3.x 2019-07-27 16:20:58 +02:00
Marc Alexander
65ff149fc9
Merge pull request #5601 from senky/ticket/16013 
[ticket/16013] Allow admins to use disallowed username
 2019-07-27 16:20:53 +02:00
Marc Alexander
31192fc08e
Merge branch '3.2.x' into 3.3.x 2019-07-27 16:18:41 +02:00
Marc Alexander
79bcb20ac5
Merge pull request #5626 from cpeel/ticket/16096 
[ticket/16096] Use InnoDB fulltext limits for InnoDB tables
 2019-07-27 16:18:37 +02:00