Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main -> prod pour des déploiements heureux #279

Merged
merged 48 commits into from
Nov 28, 2023
Merged

Merge main -> prod pour des déploiements heureux #279

Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
8a73e03
Backmerge branch 'prod' into main after release v1.15.2
estellecomment Jul 12, 2022
83c01ca
Remove site-validator-cli, its dependencies are vulnerable
estellecomment Jul 12, 2022
14055ce
Merge pull request #237 from betagouv/fix/remove-site-validator-cli
estellecomment Jul 12, 2022
4648b9c
Bump jose from 4.8.1 to 4.9.3
dependabot[bot] Sep 16, 2022
f264126
Expiration jusqu'au
jdauphant Oct 28, 2022
6f69bd8
Changer par date d'expiration
jdauphant Oct 28, 2022
0f1e71a
Fix message
jdauphant Oct 28, 2022
abe6a81
Update lib/emailer.js
jdauphant Oct 28, 2022
00d4070
Update lib/emailer.js
jdauphant Oct 28, 2022
a762406
Update views/confCreated.ejs
jdauphant Oct 28, 2022
329825b
Apply suggestions from code review
jdauphant Oct 30, 2022
1b25aa8
use "participants" instead of "personnes"
estellecomment Nov 9, 2022
96a4dee
Extra mentions of expiration date in emails
estellecomment Nov 9, 2022
217c53f
Merge pull request #239 from betagouv/dependabot/npm_and_yarn/jose-4.9.3
estellecomment Nov 9, 2022
6f9a57f
Bump minimist from 1.2.5 to 1.2.7
dependabot[bot] Nov 9, 2022
efe08c3
Bump moment-timezone from 0.5.32 to 0.5.38
dependabot[bot] Nov 9, 2022
516fce7
Bump got and nodemon
dependabot[bot] Nov 9, 2022
d00359a
Merge pull request #241 from betagouv/dependabot/npm_and_yarn/minimis…
estellecomment Nov 9, 2022
2bc1d8b
Merge pull request #244 from betagouv/dependabot/npm_and_yarn/got-and…
estellecomment Nov 9, 2022
7d424fb
Merge pull request #243 from betagouv/dependabot/npm_and_yarn/moment-…
estellecomment Nov 9, 2022
37fde28
Bump ansi-regex from 3.0.0 to 3.0.1
dependabot[bot] Nov 9, 2022
8cbae15
Merge pull request #242 from betagouv/dependabot/npm_and_yarn/ansi-re…
estellecomment Nov 9, 2022
cba9123
Bump nanoid and mocha
dependabot[bot] Nov 9, 2022
2dcb187
Merge pull request #245 from betagouv/dependabot/npm_and_yarn/nanoid-…
estellecomment Nov 9, 2022
5926910
Merge pull request #240 from betagouv/valide-pendant-x-jours
jdauphant Nov 16, 2022
3a2ab7f
Bump to 1.6.0
jdauphant Nov 16, 2022
88ed240
Bump knex from 0.21.12 to 2.4.0 (#256)
dependabot[bot] Apr 18, 2023
a732b37
Bump cookiejar from 2.1.2 to 2.1.4 (#257)
dependabot[bot] Apr 18, 2023
b617ad6
Bump minimatch from 3.0.4 to 3.1.2 (#259)
dependabot[bot] Jun 8, 2023
0a04039
Bump express from 4.17.1 to 4.17.3 (#252)
dependabot[bot] Jun 8, 2023
53b99ab
Bump jsonwebtoken from 8.5.1 to 9.0.0 (#253)
dependabot[bot] Jun 8, 2023
0a02950
Changement email de sondage (#249)
jdauphant Jun 8, 2023
2e3e71c
Bump decode-uri-component from 0.2.0 to 0.2.2 (#250)
dependabot[bot] Jun 8, 2023
0e7d5d6
Bump json5 and tsconfig-paths (#254)
dependabot[bot] Jun 8, 2023
56216d8
Bump json5 from 1.0.1 to 1.0.2 (#255)
dependabot[bot] Jun 8, 2023
e7137c5
upgrade package-lock.json to 2.0 (#261)
BenoitSerrano Jun 12, 2023
9eb2a6e
Mise à jour des CGU (#264)
tut-tuuut Nov 7, 2023
dffde3d
Merge branch 'prod' into main
tut-tuuut Nov 8, 2023
4fdff8e
Upgrade version number
tut-tuuut Nov 8, 2023
6ea059d
Merge release 1.6.1 into prod (#267)
tut-tuuut Nov 13, 2023
4a29215
Bump word-wrap from 1.2.3 to 1.2.5 (#268)
dependabot[bot] Nov 13, 2023
88023f1
Ask for more recent node versions in Github Actions (#273)
tut-tuuut Nov 22, 2023
0b8e996
Corrige des fautes de grammaire dans un e-mail (#272)
tut-tuuut Nov 22, 2023
72e37ad
Bump @babel/traverse from 7.12.9 to 7.23.3 (#269)
dependabot[bot] Nov 22, 2023
7aeb0e5
do not send unnecessary fields to front (#262)
BenoitSerrano Nov 22, 2023
aa99496
Corriger la documentation de déploiement #271 (#275)
tut-tuuut Nov 27, 2023
6cd5fea
Merge branch 'main' into ahr/back-merge-from-prod-to-main
tut-tuuut Nov 28, 2023
4d52df0
Rapatriement des modifs prod dans main (#278)
tut-tuuut Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.