Skip to content

Commit

Permalink
Release v1.6.0 (#247)
Browse files Browse the repository at this point in the history
* Remove site-validator-cli, its dependencies are vulnerable

* Bump jose from 4.8.1 to 4.9.3

Bumps [jose](https://github.com/panva/jose) from 4.8.1 to 4.9.3.
- [Release notes](https://github.com/panva/jose/releases)
- [Changelog](https://github.com/panva/jose/blob/main/CHANGELOG.md)
- [Commits](panva/jose@v4.8.1...v4.9.3)

---
updated-dependencies:
- dependency-name: jose
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* Expiration jusqu'au

* Changer par date d'expiration

* Fix message

* Update lib/emailer.js

* Update lib/emailer.js

* Update views/confCreated.ejs

* Apply suggestions from code review

* use "participants" instead of "personnes"

* Extra mentions of expiration date in emails

* Bump minimist from 1.2.5 to 1.2.7

Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.7.
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](minimistjs/minimist@v1.2.5...v1.2.7)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump moment-timezone from 0.5.32 to 0.5.38

Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.32 to 0.5.38.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](moment/moment-timezone@0.5.32...0.5.38)

---
updated-dependencies:
- dependency-name: moment-timezone
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump got and nodemon

Removes [got](https://github.com/sindresorhus/got). It's no longer used after updating ancestor dependency [nodemon](https://github.com/remy/nodemon). These dependencies need to be updated together.


Removes `got`

Updates `nodemon` from 2.0.6 to 2.0.20
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v2.0.6...v2.0.20)

---
updated-dependencies:
- dependency-name: got
  dependency-type: indirect
- dependency-name: nodemon
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump ansi-regex from 3.0.0 to 3.0.1

Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](chalk/ansi-regex@v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump nanoid and mocha

Bumps [nanoid](https://github.com/ai/nanoid) to 3.3.3 and updates ancestor dependency [mocha](https://github.com/mochajs/mocha). These dependencies need to be updated together.


Updates `nanoid` from 3.1.12 to 3.3.3
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](ai/nanoid@3.1.12...3.3.3)

Updates `mocha` from 8.2.1 to 10.1.0
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
- [Commits](mochajs/mocha@v8.2.1...v10.1.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
- dependency-name: mocha
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump to 1.6.0

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Estelle Comment <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Nov 17, 2022
1 parent b8405a1 commit 88263bb
Show file tree
Hide file tree
Showing 7 changed files with 835 additions and 12,287 deletions.
12 changes: 6 additions & 6 deletions lib/emailer.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const html = await ejs.renderFile(path.join(__dirname, "../views/emails/confWebA
return await sendMail(
config.MAIL_SENDER_EMAIL,
email,
`CONFIDENTIEL : Lien de modération de votre conférence téléphonique ${conferenceDay ? `du ${format.formatFrenchDate(new Date(conferenceDay))} ` : "" }`,
`CONFIDENTIEL : Lien de modération de votre conférence téléphonique ${conferenceDay ? `expirant le ${format.formatFrenchDate(new Date(conferenceDay))} ` : "" }`,
html,
)
} catch (err) {
Expand Down Expand Up @@ -120,7 +120,7 @@ module.exports.sendConfCreatedEmail = async function (

let expirationInfo = ""
if (conferenceDay) {
expirationInfo = `Ce numéro de conférence sera actif toute la journée du ${format.formatFrenchDate(new Date(conferenceDay))} et expirera à minuit heure locale (${format.GMTString(userTimezoneOffset)}).`
expirationInfo = `Ce numéro de conférence sera actif jusqu'au ${format.formatFrenchDate(new Date(conferenceDay))} et expirera à minuit heure locale (${format.GMTString(userTimezoneOffset)}).`
} else {
expirationInfo = `Ce numéro de conférence est actif pendant ${format.formatMinutesInHours(durationInMinutes)}. Il expirera ${format.formatFrenchDateTime(freeAt)}.`
}
Expand All @@ -136,10 +136,10 @@ module.exports.sendConfCreatedEmail = async function (
<div class="paragraph">
<div>
Votre conférence téléphonique
Votre numéro de conférence téléphonique
<a href="${config.HOSTNAME_WITH_PROTOCOL}">${config.APP_NAME}</a>
${conferenceDay ? `du ${format.formatFrenchDate(new Date(conferenceDay))} ` : "" }
est réservée. Elle pourra accueillir jusqu'à 50 personnes.
${conferenceDay ? `valide jusqu'au ${format.formatFrenchDate(new Date(conferenceDay))} ` : "" }
est réservé. Elle pourra accueillir jusqu'à 50 participants.
</div>
<div>Pour vous y connecter : <div>
<ul>
Expand Down Expand Up @@ -168,7 +168,7 @@ module.exports.sendConfCreatedEmail = async function (
return await sendMail(
config.MAIL_SENDER_EMAIL,
toEmail,
`Votre conférence téléphonique ${conferenceDay ? `du ${format.formatFrenchDate(new Date(conferenceDay))} ` : "" }est réservée`,
`Votre conférence téléphonique ${conferenceDay ? `expirant le ${format.formatFrenchDate(new Date(conferenceDay))} ` : "" }est réservée`,
html,
)
} catch (err) {
Expand Down
Loading

0 comments on commit 88263bb

Please sign in to comment.