Commit Graph

4838 Commits

Author SHA1 Message Date
mike12345567 e9bb17dd8a Fixing cluster mode in docker-compose setups, we weren't copying across the pm2 config that was needed to achieve this. 2024-02-15 12:47:27 +00:00
Peter Clement 8857ca989f
Merge branch 'master' into fix/custom-branding-issue 2024-02-09 16:06:26 +00:00
Peter Clement f1da6d5f87 Fix for custom branding not appearing on login 2024-02-09 15:26:57 +00:00
Sam Rose 77b3d479a0
Update dd-trace to 5.2.0. 2024-02-09 12:01:37 +00:00
Adria Navarro 573096e869
Merge branch 'master' into revert-12934-revert-12930-revert-12929-revert-12769-isolated-vm 2024-02-08 18:15:36 +01:00
Sam Rose 8e9db069e5
Remove all uses of test.com in the code, replace them with example.com and create a lint rule to prevent this in future. 2024-02-08 16:32:14 +00:00
Adria Navarro 2c4601440f Merge branch 'master' into revert-12934-revert-12930-revert-12929-revert-12769-isolated-vm 2024-02-06 17:53:22 +01:00
Martin McKeaveney b17bd4d8fd merge 2024-02-02 17:00:09 -03:00
Adria Navarro 8dfcc3aeb1
Revert "Revert "Migrate from `vm` to `isolated-vm`"" 2024-02-02 12:02:09 +01:00
dependabot[bot] 163c10c71e
Bump nodemailer from 6.7.2 to 6.9.9 in /packages/worker
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.7.2 to 6.9.9.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.7.2...v6.9.9)

---
updated-dependencies:
- dependency-name: nodemailer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-02 09:58:15 +00:00
Sam Rose 332a201ae7
Revert "Migrate from `vm` to `isolated-vm`" 2024-02-02 09:51:46 +00:00
Adria Navarro 45ea6a6fd6
Revert "Revert "Migrate from `vm` to `isolated-vm`"" 2024-02-01 16:47:41 +01:00
Adria Navarro 16749ec3dd
Revert "Migrate from `vm` to `isolated-vm`" 2024-02-01 16:30:34 +01:00
Adria Navarro 623b4f5dab
Merge branch 'master' into isolated-vm 2024-01-31 10:47:08 +01:00
mike12345567 21a8d44ec7 Adding a 'SESSION_EXPIRY_SECONDS' environment variable which can be set on the services to configure how long before an idle user is logged out. 2024-01-25 16:22:39 +00:00
Adria Navarro d7b5aa08db nodemon, don't watch tests 2024-01-23 17:33:52 +01:00
jvcalderon 09b75c3924 Recalculate creators count on plan downgrade 2024-01-23 13:21:54 +01:00
Adria Navarro 09d8951fc3
Merge branch 'master' into isolated-vm 2024-01-18 14:21:13 +01:00
Michael Drury a6d9601f07
Merge branch 'master' into fix/dd-trace-version 2024-01-17 11:29:42 +00:00
Adria Navarro a4959e2762
Merge branch 'master' into isolated-vm 2024-01-16 12:46:56 +01:00
Adria Navarro e42784b5e9 Use system lock 2024-01-16 11:49:34 +01:00
Adria Navarro 7e50986a2e Remove unnecessary get 2024-01-16 11:28:35 +01:00
Adria Navarro 0cce142571 Use lock to prevent race conditions on invite 2024-01-16 11:20:27 +01:00
Adria Navarro 0ed8464aab Display error on wrong password 2024-01-16 11:07:03 +01:00
mike12345567 b370e2a0e5 Updating dd-trace to 5.0.0 across all packages now that the memory leak is solved, this also removes the erronous message on startup describing DataDog startup problems. 2024-01-15 17:44:52 +00:00
Martin McKeaveney a34ae9e2e2 merge with master 2024-01-08 16:44:32 +00:00
Sam Rose 58abca62de
work in progress: replace vm2 and vm with isolated-vm 2024-01-05 13:48:20 +00:00
Adria Navarro a052f8873d Register paths on ts-node from worker 2024-01-04 13:57:10 +01:00
Adria Navarro 7413fd96a8
Merge branch 'master' into chore/node-20 2024-01-03 14:15:21 +01:00
Martin McKeaveney 57cf6dec94 merge 2024-01-03 11:43:27 +00:00
Adria Navarro 3ce3f6b5ac Fix flakiness test 2024-01-03 12:42:52 +01:00
Adria Navarro 8b866a53c8 Clean 2024-01-03 12:11:25 +01:00
Adria Navarro 4db5d9dab2 Lint 2024-01-03 12:08:18 +01:00
Adria Navarro b09f941027 Fix tests 2024-01-03 12:06:23 +01:00
Adria Navarro b45717a1e1 Move password checks to db 2024-01-03 12:00:25 +01:00
Adria Navarro 874c3f9dd4 Fix tests 2024-01-03 11:41:57 +01:00
Adria Navarro ba2b54f842 Use env variables instead of checking if isdev 2024-01-03 10:12:22 +01:00
Adria Navarro 0685caf8a2 Validate password in backend-core 2024-01-02 15:23:12 +01:00
Adria Navarro e50cc35140 Validate password on admin creation 2024-01-02 13:23:08 +01:00
Adria Navarro 7b9fadc3ba Validate password on reset 2024-01-02 13:05:48 +01:00
Adria Navarro 1633284f9d Bubble up error 2024-01-02 13:02:24 +01:00
Adria Navarro c94c3d09dc
Merge branch 'master' into vulnerability/budi-7794-invalidate-session-on-password-reset 2024-01-02 12:25:42 +01:00
Adria Navarro d1ffe24269 Invalidate session on password update 2023-12-29 16:54:47 +01:00
Adria Navarro f74264c1c8 Add tests 2023-12-29 16:37:34 +01:00
Adria Navarro dcacd6bf17 Add basic test 2023-12-29 16:07:26 +01:00
Adria Navarro f722f9e2d6 Invalidate reset code once used 2023-12-29 15:06:04 +01:00
Adria Navarro fede6dc3e4 Fix flaky scim test 2023-12-29 11:12:31 +01:00
Adria Navarro a6537e66c3 Set scim config on beforeall 2023-12-29 10:26:03 +01:00
Martin McKeaveney 8f1470f5a5 merge with master 2023-12-22 17:08:32 +00:00
Adria Navarro a3e371edff Update docker versions 2023-12-22 15:05:42 +01:00