merge: update branch with latest dev #6012
Merged
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
* add migration * Update authenticate.js * unit test * refactor * add slowBruteForceRateLimiter * fix tests * comments * generate types * refactor tupaia rate limiter * mocking * update tests * clean up * fix tests * Update OneTimeLogin.js * Update authenticate.test.js * update ip key * Update authenticate.js * Update LoginRoute.ts * update X-Forwarded-For * forward ip address * add x-real-ip * logging * trust proxy * add public ip * update orchestration server * add proxy to config * use older version of public-ip * update central server * remove console logs * update type for custom headers * temp rollback ip changes * fix(auth): RN-1108: Securely read client ip for rate limiting (#5962) * forward client ip to auth server when logging in * set trust proxy in central server * Update ApiBuilder.ts * Update createApp.js * Update authenticate.js * finish merge * Update createApp.js * Update errors.test.ts * Update ConsecutiveFailsRateLimiter.js * Update 20241122034517-addLoginAttemptsTable-modifies-schema.js * Update servers.env.example * Update createApp.js --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com>
* Update ReportsPage.tsx * Update ReportsPage.tsx * Update ReportsPage.tsx * Update packages/datatrak-web/src/views/ReportsPage.tsx Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com> * Update packages/datatrak-web/src/views/ReportsPage.tsx Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com> * Update packages/datatrak-web/src/views/ReportsPage.tsx Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com> * Update ReportsPage.tsx --------- Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com> Co-authored-by: Andrew <vanbeekandrew@gmail.com>
avaek
merged commit 90f95de
into
rn-249-xname-aka-x-axis-label-not-exporting
53 checks passed
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.