Fix conflicts #3339
Merged
Fix conflicts #3339
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Show correct server id when it is updated * Remove guild id caching from Discord class
* Add ability to change password via UserCP * Convert change password to modal * Use correct language string and revert accidental deleting of button * Additional permission check
* Fix TinyMCE spoiler plugin url * Support subdirectories Co-authored-by: Supercrafter100 <58982133+supercrafter100@users.noreply.github.com>
* Update discord.tpl * Reduce indentation Co-authored-by: Sam <samerton@users.noreply.github.com>
* Various performance improvements * Remove debug * Remove more debug * Improve StaffCP total users widget
* Apply rate limiting to forgot password * Update modules/Core/pages/forgot_password.php Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com> * remove unused variable * Use static function * Allow two attempts per minute * Update forgot_password.php Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
* Fix post editing Default to an empty array if the variable is null * Default empty array with array_reduce * Use default value to `array_reduce` Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
* Create release script * Produce upgrade zip * Remove temp directory afterwards
* Fix MySQL `IN` clause string interpolation in Forum `getLatestDiscussions` * Fix $limit being applied * Remove comments
* Fix `setSetting` cache not being updated * Use reference * Fix minecraft panel page using outdated constant Co-authored-by: Robin <robin+git@rkslot.nl>
* Allow browser scripts to bypass force_2fa redirects so secret doesn't get regenerated * Remove space Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
* Release 2.0.3 * Create links to PRs * Add date --------- Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
Release/2.0.3
…kport Run release script with oldest suppported PHP version (backport)
supercrafter100
approved these changes
Apr 30, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.