aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11327] Adjust tests for new reset password changesMarc Alexander2019-08-102-3/+5
| | | | PHPBB3-11327
* [ticket/11327] Clean up code a bitMarc Alexander2019-08-103-22/+24
| | | | PHPBB3-11327
* [ticket/11327] Update tests to reflect changesMarc Alexander2019-08-102-35/+62
| | | | PHPBB3-11327
* [ticket/11327] Finish up initial version of password reset systemMarc Alexander2019-08-104-63/+111
| | | | PHPBB3-11327
* [ticket/11327] Rename UCP reset password templateMarc Alexander2019-08-101-0/+0
| | | | PHPBB3-11327
* [ticket/11327] Continue with implementation of password reset functionalityMarc Alexander2019-08-102-122/+135
| | | | PHPBB3-11327
* [ticket/11327] Adjust wording of forgot password emailMarc Alexander2019-08-092-11/+7
| | | | PHPBB3-11327
* [ticket/11327] Rename email file to forgot passwordMarc Alexander2019-08-091-0/+0
| | | | PHPBB3-11327
* [ticket/11327] Split up into forgot password and reset passwordMarc Alexander2019-08-095-8/+161
| | | | PHPBB3-11327
* [ticket/11327] Add reset token columns & config settingMarc Alexander2019-08-091-0/+48
| | | | PHPBB3-11327
* [ticket/11327] Adjust display of page titleMarc Alexander2019-08-081-4/+1
| | | | PHPBB3-11327
* [ticket/11327] Refactor ucp_remind to reset_password controllerMarc Alexander2019-08-081-40/+109
| | | | PHPBB3-11327
* [ticket/11327] Move UCP remind functionality to a controller for password resetMarc Alexander2019-08-087-3/+31
| | | | PHPBB3-11327
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-08-071-2/+2
|\
| * Merge pull request #5647 from 3D-I/ticket/16119Marc Alexander2019-08-071-2/+2
| |\ | | | | | | | | | [ticket/16119] Prevent error message for Poll Title
| | * [ticket/16119] Prevent error message for Poll Title3D-I2019-08-061-2/+2
| |/ | | | | | | PHPBB3-16119
* | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-311-1/+1
|\ \ | |/
| * Merge pull request #5641 from EA117/ticket/16040Marc Alexander2019-07-311-1/+1
| |\ | | | | | | | | | [ticket/16040] Forum list won't display topic icons containing a space.
| | * [ticket/16040] Forum list won't display topic icons containing a space.EA1172019-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #5644 from marc1706/ticket/16115Marc Alexander2019-07-301-0/+2
|\ \ \ | | | | | | | | | | | | [ticket/16115] Add PHP 7.4snapshot to travis CI build matrix
| * | | [ticket/16115] Add PHP 7.4snapshot to travis CI build matrixMarc Alexander2019-07-291-0/+2
| | | | | | | | | | | | | | | | PHPBB3-16115
* | | | Merge branch '3.2.x' into 3.3.xDerky2019-07-302-2/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #5628 from marc1706/ticket/16101Derky2019-07-302-2/+4
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16101] Add Referrer-Policy header to phpBB's headers
| | * | | [ticket/16101] Add Referrer-Policy header to phpBB's headersMarc Alexander2019-07-202-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-16101
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-294-0/+24
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #5633 from kasimi/ticket/16108Marc Alexander2019-07-294-0/+24
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16108] Add topiclist_row_topic_by_author_before|after
| | * | | | [ticket/16108] Use twig syntax in template eventMarc Alexander2019-07-273-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16108
| | * | | | [ticket/16108] Add topiclist_row_topic_by_author_before|afterkasimi2019-07-234-0/+24
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-16108
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-292-0/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #5632 from kasimi/ticket/16107Marc Alexander2019-07-292-0/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16107] Add mcp_move_destination_forum_before|after
| | * | | | [ticket/16107] Use twig syntax for eventMarc Alexander2019-07-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16107
| | * | | | [ticket/16107] Add mcp_move_destination_forum_before|afterkasimi2019-07-232-0/+16
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-16107
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-291-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #5635 from EA117/ticket/16066Marc Alexander2019-07-291-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16066] Fix FORM_INVALID always returned for banned user.
| | * | | | [ticket/16066] Fix FORM_INVALID always returned for banned user.EA1172019-07-281-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-290-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #5638 from marc1706/ticket/16112Marc Alexander2019-07-292-55/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16112] Update composer dependencies for 3.2.x
* | \ \ \ \ Merge pull request #5639 from marc1706/ticket/16112-3.3.xMarc Alexander2019-07-292-166/+171
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16112] Update composer dependencies for 3.3.x
| * \ \ \ \ \ Merge branch 'ticket/16112' into ticket/16112-3.3.xMarc Alexander2019-07-282-166/+171
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | [ticket/16112] Update composer dependencies for 3.2.xMarc Alexander2019-07-282-55/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16112
* | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-291-0/+32
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge pull request #5627 from senky/ticket/16097Marc Alexander2019-07-291-0/+32
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/16097] Add core.viewtopic_gen_sort_selects_before
| | * | | | [ticket/16097] Correctly classify sort_days as intJakub Senko2019-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16097
| | * | | | [ticket/16097] Add core.viewtopic_gen_sort_selects_beforeJakub Senko2019-07-081-0/+32
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-16097
* | | | | Merge pull request #5636 from marc1706/ticket/15886Marc Alexander2019-07-292-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | [ticket/15886] Use getMockBuilder instead of removed getMock()
| * | | | [ticket/15886] Use getMockBuilder instead of removed getMock()Marc Alexander2019-07-282-3/+3
|/ / / / | | | | | | | | | | | | PHPBB3-15886
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-281-7/+7
|\ \ \ \ | |/ / /
| * | | Merge pull request #5494 from mrgoldy/ticket/15885Marc Alexander2019-07-281-7/+7
| |\ \ \ | | | | | | | | | | | | | | | [ticket/15885] Display group rank on memberlist_body
| | * | | [ticket/15885] Display group rank on memberlist_bodymrgoldy2019-01-021-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-15885
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-2810-74/+595
|\ \ \ \ \ | |/ / / /