diff --git a/dev/deploy-to-container/package-lock.json b/dev/deploy-to-container/package-lock.json index ab15f76d2..5352c6033 100644 --- a/dev/deploy-to-container/package-lock.json +++ b/dev/deploy-to-container/package-lock.json @@ -7,10 +7,10 @@ "name": "deploy-to-container", "dependencies": { "dockerode": "^3.3.5", - "fs-extra": "^11.1.0", + "fs-extra": "^11.1.1", "nanoid": "4.0.1", "nanoid-dictionary": "5.0.0-beta.1", - "slugify": "1.6.5", + "slugify": "1.6.6", "tar": "^6.1.13", "yargs": "^17.7.1" }, @@ -207,9 +207,9 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "node_modules/fs-extra": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", - "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -415,9 +415,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/slugify": { - "version": "1.6.5", - "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz", - "integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==", + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz", + "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==", "engines": { "node": ">=8.0.0" } @@ -782,9 +782,9 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "fs-extra": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", - "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -924,9 +924,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "slugify": { - "version": "1.6.5", - "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz", - "integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==" + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz", + "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==" }, "split-ca": { "version": "1.0.1", diff --git a/dev/deploy-to-container/package.json b/dev/deploy-to-container/package.json index 7eaea8220..ddb6bb531 100644 --- a/dev/deploy-to-container/package.json +++ b/dev/deploy-to-container/package.json @@ -3,10 +3,10 @@ "type": "module", "dependencies": { "dockerode": "^3.3.5", - "fs-extra": "^11.1.0", + "fs-extra": "^11.1.1", "nanoid": "4.0.1", "nanoid-dictionary": "5.0.0-beta.1", - "slugify": "1.6.5", + "slugify": "1.6.6", "tar": "^6.1.13", "yargs": "^17.7.1" }, diff --git a/dev/diff/package-lock.json b/dev/diff/package-lock.json index 517e5dc80..60cd6f840 100644 --- a/dev/diff/package-lock.json +++ b/dev/diff/package-lock.json @@ -10,7 +10,7 @@ "dockerode": "^3.3.5", "enquirer": "^2.3.6", "extract-zip": "^2.0.1", - "fs-extra": "^11.1.0", + "fs-extra": "^11.1.1", "got": "^12.6.0", "keypress": "^0.2.1", "listr2": "^5.0.8", @@ -448,9 +448,9 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "node_modules/fs-extra": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", - "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -1545,9 +1545,9 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "fs-extra": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", - "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", diff --git a/dev/diff/package.json b/dev/diff/package.json index 8a23da1ae..f748d9105 100644 --- a/dev/diff/package.json +++ b/dev/diff/package.json @@ -6,7 +6,7 @@ "dockerode": "^3.3.5", "enquirer": "^2.3.6", "extract-zip": "^2.0.1", - "fs-extra": "^11.1.0", + "fs-extra": "^11.1.1", "got": "^12.6.0", "keypress": "^0.2.1", "listr2": "^5.0.8", diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html index c5662bfc2..845cf0949 100644 --- a/ietf/templates/meeting/session_details_panel.html +++ b/ietf/templates/meeting/session_details_panel.html @@ -2,30 +2,32 @@ {% origin %} {% for session in sessions %} {% with item=session.official_timeslotassignment %} {% with timeslot=item.timeslot %} -

- {% if sessions|length > 1 %}Session {{ forloop.counter }} :{% endif %} - {% for time in session.times %} - {% if not forloop.first %},{% endif %} - {{ time|timezone:session.meeting.time_zone|dateformat:"l Y-m-d H:i T" }} - {% if time.tzinfo.zone != "UTC" %}({{ time|utc|dateformat:"H:i T" }}){% endif %} - {% endfor %} - {% if session.cancelled %} - Cancelled - {% else %} - {{ session.status }} +
+ {% if not session.cancelled %} +
+ {# see note in the included templates re: show_agenda parameter and required JS import #} + {% if meeting.type.slug == 'interim' %} + {% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False %} + {% else %} + {% include "meeting/session_buttons_include.html" with show_agenda=False item=session.official_timeslotassignment use_notes=session.meeting.use_notes %} + {% endif %} +
{% endif %} - {% if session.name %}: {{ session.name }}{% endif %} -

- {% if not session.cancelled %} -
- {# see note in the included templates re: show_agenda parameter and required JS import #} - {% if meeting.type.slug == 'interim' %} - {% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False %} +

+ {% if sessions|length > 1 %}Session {{ forloop.counter }} :{% endif %} + {% for time in session.times %} + {% if not forloop.first %},{% endif %} + {{ time|timezone:session.meeting.time_zone|dateformat:"l Y-m-d H:i T" }} + {% if time.tzinfo.zone != "UTC" %}({{ time|utc|dateformat:"H:i T" }}){% endif %} + {% endfor %} + {% if session.cancelled %} + Cancelled {% else %} - {% include "meeting/session_buttons_include.html" with show_agenda=False item=session.official_timeslotassignment use_notes=session.meeting.use_notes %} + {{ session.status }} {% endif %} -

- {% endif %} + {% if session.name %}: {{ session.name }}{% endif %} + + {% if session.agenda_note %}

{{ session.agenda_note }}

{% endif %} {% if can_manage_materials %} {% if session.current_status == 'sched' or session.current_status == 'schedw' %} diff --git a/playwright/package-lock.json b/playwright/package-lock.json index 376500a97..af20f841a 100644 --- a/playwright/package-lock.json +++ b/playwright/package-lock.json @@ -12,10 +12,10 @@ "luxon": "3.3.0", "ms": "2.1.3", "seedrandom": "3.0.5", - "slugify": "1.6.5" + "slugify": "1.6.6" }, "devDependencies": { - "@playwright/test": "1.31.2", + "@playwright/test": "1.32.1", "eslint": "8.36.0", "eslint-config-standard": "17.0.0", "eslint-plugin-import": "2.27.5", @@ -318,13 +318,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.31.2", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.31.2.tgz", - "integrity": "sha512-BYVutxDI4JeZKV1+ups6dt5WiqKhjBtIYowyZIJ3kBDmJgsuPKsqqKNIMFbUePLSCmp2cZu+BDL427RcNKTRYw==", + "version": "1.32.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.1.tgz", + "integrity": "sha512-FTwjCuhlm1qHUGf4hWjfr64UMJD/z0hXYbk+O387Ioe6WdyZQ+0TBDAc6P+pHjx2xCv1VYNgrKbYrNixFWy4Dg==", "dev": true, "dependencies": { "@types/node": "*", - "playwright-core": "1.31.2" + "playwright-core": "1.32.1" }, "bin": { "playwright": "cli.js" @@ -4311,9 +4311,9 @@ } }, "node_modules/playwright-core": { - "version": "1.31.2", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.31.2.tgz", - "integrity": "sha512-a1dFgCNQw4vCsG7bnojZjDnPewZcw7tZUNFN0ZkcLYKj+mPmXvg4MpaaKZ5SgqPsOmqIf2YsVRkgqiRDxD+fDQ==", + "version": "1.32.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.1.tgz", + "integrity": "sha512-KZYUQC10mXD2Am1rGlidaalNGYk3LU1vZqqNk0gT4XPty1jOqgup8KDP8l2CUlqoNKhXM5IfGjWgW37xvGllBA==", "dev": true, "bin": { "playwright": "cli.js" @@ -4971,9 +4971,9 @@ } }, "node_modules/slugify": { - "version": "1.6.5", - "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz", - "integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==", + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz", + "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==", "engines": { "node": ">=8.0.0" } @@ -6023,14 +6023,14 @@ } }, "@playwright/test": { - "version": "1.31.2", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.31.2.tgz", - "integrity": "sha512-BYVutxDI4JeZKV1+ups6dt5WiqKhjBtIYowyZIJ3kBDmJgsuPKsqqKNIMFbUePLSCmp2cZu+BDL427RcNKTRYw==", + "version": "1.32.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.1.tgz", + "integrity": "sha512-FTwjCuhlm1qHUGf4hWjfr64UMJD/z0hXYbk+O387Ioe6WdyZQ+0TBDAc6P+pHjx2xCv1VYNgrKbYrNixFWy4Dg==", "dev": true, "requires": { "@types/node": "*", "fsevents": "2.3.2", - "playwright-core": "1.31.2" + "playwright-core": "1.32.1" } }, "@pnpm/network.ca-file": { @@ -8975,9 +8975,9 @@ "dev": true }, "playwright-core": { - "version": "1.31.2", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.31.2.tgz", - "integrity": "sha512-a1dFgCNQw4vCsG7bnojZjDnPewZcw7tZUNFN0ZkcLYKj+mPmXvg4MpaaKZ5SgqPsOmqIf2YsVRkgqiRDxD+fDQ==", + "version": "1.32.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.1.tgz", + "integrity": "sha512-KZYUQC10mXD2Am1rGlidaalNGYk3LU1vZqqNk0gT4XPty1jOqgup8KDP8l2CUlqoNKhXM5IfGjWgW37xvGllBA==", "dev": true }, "prelude-ls": { @@ -9436,9 +9436,9 @@ "dev": true }, "slugify": { - "version": "1.6.5", - "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz", - "integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==" + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz", + "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==" }, "smart-buffer": { "version": "4.2.0", diff --git a/playwright/package.json b/playwright/package.json index 24d350eaa..a4155d4ae 100644 --- a/playwright/package.json +++ b/playwright/package.json @@ -7,7 +7,7 @@ "test:debug": "playwright test --debug" }, "devDependencies": { - "@playwright/test": "1.31.2", + "@playwright/test": "1.32.1", "eslint": "8.36.0", "eslint-config-standard": "17.0.0", "eslint-plugin-import": "2.27.5", @@ -23,6 +23,6 @@ "luxon": "3.3.0", "ms": "2.1.3", "seedrandom": "3.0.5", - "slugify": "1.6.5" + "slugify": "1.6.6" } }