diff --git a/.pnp.cjs b/.pnp.cjs
index 413c58add..a7d080358 100644
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -66,8 +66,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1"],\
["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.11.0"],\
["file-saver", "npm:2.0.5"],\
- ["highcharts", "npm:11.0.0"],\
- ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.15.1"],\
+ ["highcharts", "npm:11.0.1"],\
+ ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.16.0"],\
["ical.js", "npm:1.5.0"],\
["jquery", "npm:3.6.4"],\
["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.1"],\
@@ -85,7 +85,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.35"],\
["pinia-plugin-persist", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.0.0"],\
["pug", "npm:3.0.2"],\
- ["sass", "npm:1.62.0"],\
+ ["sass", "npm:1.62.1"],\
["seedrandom", "npm:3.0.5"],\
["select2", "npm:4.1.0-rc.0"],\
["select2-bootstrap-5-theme", "npm:1.3.0"],\
@@ -710,10 +710,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]\
]],\
["@html-validate/stylish", [\
- ["npm:3.0.0", {\
- "packageLocation": "./.yarn/cache/@html-validate-stylish-npm-3.0.0-6d9dccafda-818efd25ac.zip/node_modules/@html-validate/stylish/",\
+ ["npm:4.0.1", {\
+ "packageLocation": "./.yarn/cache/@html-validate-stylish-npm-4.0.1-a5ee83fd48-89c83ea1ae.zip/node_modules/@html-validate/stylish/",\
"packageDependencies": [\
- ["@html-validate/stylish", "npm:3.0.0"],\
+ ["@html-validate/stylish", "npm:4.0.1"],\
["kleur", "npm:4.1.4"]\
],\
"linkType": "HARD"\
@@ -749,6 +749,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
"linkType": "HARD"\
}]\
]],\
+ ["@isaacs/cliui", [\
+ ["npm:8.0.2", {\
+ "packageLocation": "./.yarn/cache/@isaacs-cliui-npm-8.0.2-f4364666d5-4a473b9b32.zip/node_modules/@isaacs/cliui/",\
+ "packageDependencies": [\
+ ["@isaacs/cliui", "npm:8.0.2"],\
+ ["string-width", "npm:5.1.2"],\
+ ["string-width-cjs", [\
+ "string-width",\
+ "npm:4.2.3"\
+ ]],\
+ ["strip-ansi", "npm:7.0.1"],\
+ ["strip-ansi-cjs", [\
+ "strip-ansi",\
+ "npm:6.0.1"\
+ ]],\
+ ["wrap-ansi", "npm:8.1.0"],\
+ ["wrap-ansi-cjs", [\
+ "wrap-ansi",\
+ "npm:7.0.0"\
+ ]]\
+ ],\
+ "linkType": "HARD"\
+ }]\
+ ]],\
["@istanbuljs/schema", [\
["npm:0.1.3", {\
"packageLocation": "./.yarn/cache/@istanbuljs-schema-npm-0.1.3-466bd3eaaa-5282759d96.zip/node_modules/@istanbuljs/schema/",\
@@ -2191,6 +2215,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
"linkType": "HARD"\
}]\
]],\
+ ["@pkgjs/parseargs", [\
+ ["npm:0.11.0", {\
+ "packageLocation": "./.yarn/cache/@pkgjs-parseargs-npm-0.11.0-cd2a3fe948-6ad6a00fc4.zip/node_modules/@pkgjs/parseargs/",\
+ "packageDependencies": [\
+ ["@pkgjs/parseargs", "npm:0.11.0"]\
+ ],\
+ "linkType": "HARD"\
+ }]\
+ ]],\
["@popperjs/core", [\
["npm:2.11.5", {\
"packageLocation": "./.yarn/cache/@popperjs-core-npm-2.11.5-a338f16bd4-fd7f9dca3f.zip/node_modules/@popperjs/core/",\
@@ -2240,10 +2273,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
],\
"linkType": "SOFT"\
}],\
- ["virtual:d22c98c1f150b6cd2212951e0d5e5eca241afaecf062b8a793cb3ffe4d0a3aff9d159d72ffde9bbd904c342c7b582857ee4fddf2bda76bdcb7a33a9aef5741d5#npm:2.0.0", {\
- "packageLocation": "./.yarn/__virtual__/@sidvind-better-ajv-errors-virtual-da221d8654/0/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip/node_modules/@sidvind/better-ajv-errors/",\
+ ["virtual:681f166fa525f4703ee9c1e8e4559a36bfdac9fdcbccdfeb239624a192c2aaee56211c254f7093e696cd71a2eaed6484d2ba2bb9ec45b8d53cb66b299a635a53#npm:2.0.0", {\
+ "packageLocation": "./.yarn/__virtual__/@sidvind-better-ajv-errors-virtual-2b217b84ce/0/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip/node_modules/@sidvind/better-ajv-errors/",\
"packageDependencies": [\
- ["@sidvind/better-ajv-errors", "virtual:d22c98c1f150b6cd2212951e0d5e5eca241afaecf062b8a793cb3ffe4d0a3aff9d159d72ffde9bbd904c342c7b582857ee4fddf2bda76bdcb7a33a9aef5741d5#npm:2.0.0"],\
+ ["@sidvind/better-ajv-errors", "virtual:681f166fa525f4703ee9c1e8e4559a36bfdac9fdcbccdfeb239624a192c2aaee56211c254f7093e696cd71a2eaed6484d2ba2bb9ec45b8d53cb66b299a635a53#npm:2.0.0"],\
["@babel/code-frame", "npm:7.16.7"],\
["@types/ajv", null],\
["ajv", "npm:8.11.0"],\
@@ -2702,6 +2735,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["ansi-regex", "npm:5.0.1"]\
],\
"linkType": "HARD"\
+ }],\
+ ["npm:6.0.1", {\
+ "packageLocation": "./.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip/node_modules/ansi-regex/",\
+ "packageDependencies": [\
+ ["ansi-regex", "npm:6.0.1"]\
+ ],\
+ "linkType": "HARD"\
}]\
]],\
["ansi-styles", [\
@@ -2727,6 +2767,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["ansi-styles", "npm:5.2.0"]\
],\
"linkType": "HARD"\
+ }],\
+ ["npm:6.2.1", {\
+ "packageLocation": "./.yarn/cache/ansi-styles-npm-6.2.1-d43647018c-ef940f2f0c.zip/node_modules/ansi-styles/",\
+ "packageDependencies": [\
+ ["ansi-styles", "npm:6.2.1"]\
+ ],\
+ "linkType": "HARD"\
}]\
]],\
["anymatch", [\
@@ -4061,6 +4108,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
"linkType": "HARD"\
}]\
]],\
+ ["eastasianwidth", [\
+ ["npm:0.2.0", {\
+ "packageLocation": "./.yarn/cache/eastasianwidth-npm-0.2.0-c37eb16bd1-7d00d7cd8e.zip/node_modules/eastasianwidth/",\
+ "packageDependencies": [\
+ ["eastasianwidth", "npm:0.2.0"]\
+ ],\
+ "linkType": "HARD"\
+ }]\
+ ]],\
["ee-first", [\
["npm:1.1.1", {\
"packageLocation": "./.yarn/cache/ee-first-npm-1.1.1-33f8535b39-1b4cac778d.zip/node_modules/ee-first/",\
@@ -4086,6 +4142,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["emoji-regex", "npm:8.0.0"]\
],\
"linkType": "HARD"\
+ }],\
+ ["npm:9.2.2", {\
+ "packageLocation": "./.yarn/cache/emoji-regex-npm-9.2.2-e6fac8d058-8487182da7.zip/node_modules/emoji-regex/",\
+ "packageDependencies": [\
+ ["emoji-regex", "npm:9.2.2"]\
+ ],\
+ "linkType": "HARD"\
}]\
]],\
["encodeurl", [\
@@ -4944,6 +5007,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["signal-exit", "npm:3.0.7"]\
],\
"linkType": "HARD"\
+ }],\
+ ["npm:3.1.1", {\
+ "packageLocation": "./.yarn/cache/foreground-child-npm-3.1.1-77e78ed774-139d270bc8.zip/node_modules/foreground-child/",\
+ "packageDependencies": [\
+ ["foreground-child", "npm:3.1.1"],\
+ ["cross-spawn", "npm:7.0.3"],\
+ ["signal-exit", "npm:4.0.2"]\
+ ],\
+ "linkType": "HARD"\
}]\
]],\
["fresh", [\
@@ -5084,6 +5156,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]\
]],\
["glob", [\
+ ["npm:10.2.4", {\
+ "packageLocation": "./.yarn/cache/glob-npm-10.2.4-49f715fccc-29845faaa1.zip/node_modules/glob/",\
+ "packageDependencies": [\
+ ["glob", "npm:10.2.4"],\
+ ["foreground-child", "npm:3.1.1"],\
+ ["jackspeak", "npm:2.2.0"],\
+ ["minimatch", "npm:9.0.0"],\
+ ["minipass", "npm:6.0.1"],\
+ ["path-scurry", "npm:1.9.1"]\
+ ],\
+ "linkType": "HARD"\
+ }],\
["npm:7.2.3", {\
"packageLocation": "./.yarn/cache/glob-npm-7.2.3-2d866d17a5-29452e97b3.zip/node_modules/glob/",\
"packageDependencies": [\
@@ -5108,17 +5192,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["once", "npm:1.4.0"]\
],\
"linkType": "HARD"\
- }],\
- ["npm:9.3.5", {\
- "packageLocation": "./.yarn/cache/glob-npm-9.3.5-2f602083f0-94b093adbc.zip/node_modules/glob/",\
- "packageDependencies": [\
- ["glob", "npm:9.3.5"],\
- ["fs.realpath", "npm:1.0.0"],\
- ["minimatch", "npm:8.0.4"],\
- ["minipass", "npm:4.2.8"],\
- ["path-scurry", "npm:1.6.4"]\
- ],\
- "linkType": "HARD"\
}]\
]],\
["glob-parent", [\
@@ -5285,10 +5358,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]\
]],\
["highcharts", [\
- ["npm:11.0.0", {\
- "packageLocation": "./.yarn/cache/highcharts-npm-11.0.0-df56f18474-f173287d41.zip/node_modules/highcharts/",\
+ ["npm:11.0.1", {\
+ "packageLocation": "./.yarn/cache/highcharts-npm-11.0.1-05a14e3887-773a7b8765.zip/node_modules/highcharts/",\
"packageDependencies": [\
- ["highcharts", "npm:11.0.0"]\
+ ["highcharts", "npm:11.0.1"]\
],\
"linkType": "HARD"\
}]\
@@ -5312,20 +5385,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]\
]],\
["html-validate", [\
- ["npm:7.15.1", {\
- "packageLocation": "./.yarn/cache/html-validate-npm-7.15.1-d33032fed7-c22d20c4cc.zip/node_modules/html-validate/",\
+ ["npm:7.16.0", {\
+ "packageLocation": "./.yarn/cache/html-validate-npm-7.16.0-ceaf62fb08-cce9a9e8f7.zip/node_modules/html-validate/",\
"packageDependencies": [\
- ["html-validate", "npm:7.15.1"]\
+ ["html-validate", "npm:7.16.0"]\
],\
"linkType": "SOFT"\
}],\
- ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.15.1", {\
- "packageLocation": "./.yarn/__virtual__/html-validate-virtual-d22c98c1f1/0/cache/html-validate-npm-7.15.1-d33032fed7-c22d20c4cc.zip/node_modules/html-validate/",\
+ ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.16.0", {\
+ "packageLocation": "./.yarn/__virtual__/html-validate-virtual-681f166fa5/0/cache/html-validate-npm-7.16.0-ceaf62fb08-cce9a9e8f7.zip/node_modules/html-validate/",\
"packageDependencies": [\
- ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.15.1"],\
+ ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.16.0"],\
["@babel/code-frame", "npm:7.16.7"],\
- ["@html-validate/stylish", "npm:3.0.0"],\
- ["@sidvind/better-ajv-errors", "virtual:d22c98c1f150b6cd2212951e0d5e5eca241afaecf062b8a793cb3ffe4d0a3aff9d159d72ffde9bbd904c342c7b582857ee4fddf2bda76bdcb7a33a9aef5741d5#npm:2.0.0"],\
+ ["@html-validate/stylish", "npm:4.0.1"],\
+ ["@sidvind/better-ajv-errors", "virtual:681f166fa525f4703ee9c1e8e4559a36bfdac9fdcbccdfeb239624a192c2aaee56211c254f7093e696cd71a2eaed6484d2ba2bb9ec45b8d53cb66b299a635a53#npm:2.0.0"],\
["@types/jest", null],\
["@types/jest-diff", null],\
["@types/jest-snapshot", null],\
@@ -5333,7 +5406,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["ajv", "npm:8.11.0"],\
["deepmerge", "npm:4.2.2"],\
["espree", "npm:9.3.2"],\
- ["glob", "npm:9.3.5"],\
+ ["glob", "npm:10.2.4"],\
["ignore", "npm:5.2.0"],\
["jest", null],\
["jest-diff", null],\
@@ -5923,6 +5996,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
"linkType": "HARD"\
}]\
]],\
+ ["jackspeak", [\
+ ["npm:2.2.0", {\
+ "packageLocation": "./.yarn/cache/jackspeak-npm-2.2.0-5383861524-d8cd5be4f0.zip/node_modules/jackspeak/",\
+ "packageDependencies": [\
+ ["jackspeak", "npm:2.2.0"],\
+ ["@isaacs/cliui", "npm:8.0.2"],\
+ ["@pkgjs/parseargs", "npm:0.11.0"]\
+ ],\
+ "linkType": "HARD"\
+ }]\
+ ]],\
["jest-diff", [\
["npm:27.5.1", {\
"packageLocation": "./.yarn/cache/jest-diff-npm-27.5.1-818e549196-8be27c1e1e.zip/node_modules/jest-diff/",\
@@ -6307,10 +6391,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
],\
"linkType": "HARD"\
}],\
- ["npm:9.0.1", {\
- "packageLocation": "./.yarn/cache/lru-cache-npm-9.0.1-5b18452606-48e31a2a05.zip/node_modules/lru-cache/",\
+ ["npm:9.1.1", {\
+ "packageLocation": "./.yarn/cache/lru-cache-npm-9.1.1-765199cb01-4d703bb9b6.zip/node_modules/lru-cache/",\
"packageDependencies": [\
- ["lru-cache", "npm:9.0.1"]\
+ ["lru-cache", "npm:9.1.1"]\
],\
"linkType": "HARD"\
}]\
@@ -6411,10 +6495,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
],\
"linkType": "HARD"\
}],\
- ["npm:8.0.4", {\
- "packageLocation": "./.yarn/cache/minimatch-npm-8.0.4-bf57f0e98a-2e46cffb86.zip/node_modules/minimatch/",\
+ ["npm:9.0.0", {\
+ "packageLocation": "./.yarn/cache/minimatch-npm-9.0.0-c6737cb1be-7bd57899ed.zip/node_modules/minimatch/",\
"packageDependencies": [\
- ["minimatch", "npm:8.0.4"],\
+ ["minimatch", "npm:9.0.0"],\
["brace-expansion", "npm:2.0.1"]\
],\
"linkType": "HARD"\
@@ -6438,17 +6522,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
],\
"linkType": "HARD"\
}],\
- ["npm:4.2.8", {\
- "packageLocation": "./.yarn/cache/minipass-npm-4.2.8-f05abfe254-7f4914d529.zip/node_modules/minipass/",\
+ ["npm:6.0.1", {\
+ "packageLocation": "./.yarn/cache/minipass-npm-6.0.1-634723433e-1df70bb565.zip/node_modules/minipass/",\
"packageDependencies": [\
- ["minipass", "npm:4.2.8"]\
- ],\
- "linkType": "HARD"\
- }],\
- ["npm:5.0.0", {\
- "packageLocation": "./.yarn/cache/minipass-npm-5.0.0-c64fb63c92-425dab2887.zip/node_modules/minipass/",\
- "packageDependencies": [\
- ["minipass", "npm:5.0.0"]\
+ ["minipass", "npm:6.0.1"]\
],\
"linkType": "HARD"\
}]\
@@ -7027,12 +7104,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]\
]],\
["path-scurry", [\
- ["npm:1.6.4", {\
- "packageLocation": "./.yarn/cache/path-scurry-npm-1.6.4-6d612a3f34-bd5262b51d.zip/node_modules/path-scurry/",\
+ ["npm:1.9.1", {\
+ "packageLocation": "./.yarn/cache/path-scurry-npm-1.9.1-b9d6b1c5bf-28caa788f1.zip/node_modules/path-scurry/",\
"packageDependencies": [\
- ["path-scurry", "npm:1.6.4"],\
- ["lru-cache", "npm:9.0.1"],\
- ["minipass", "npm:5.0.0"]\
+ ["path-scurry", "npm:1.9.1"],\
+ ["lru-cache", "npm:9.1.1"],\
+ ["minipass", "npm:6.0.1"]\
],\
"linkType": "HARD"\
}]\
@@ -7674,8 +7751,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1"],\
["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.11.0"],\
["file-saver", "npm:2.0.5"],\
- ["highcharts", "npm:11.0.0"],\
- ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.15.1"],\
+ ["highcharts", "npm:11.0.1"],\
+ ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.16.0"],\
["ical.js", "npm:1.5.0"],\
["jquery", "npm:3.6.4"],\
["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.1"],\
@@ -7693,7 +7770,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.35"],\
["pinia-plugin-persist", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.0.0"],\
["pug", "npm:3.0.2"],\
- ["sass", "npm:1.62.0"],\
+ ["sass", "npm:1.62.1"],\
["seedrandom", "npm:3.0.5"],\
["select2", "npm:4.1.0-rc.0"],\
["select2-bootstrap-5-theme", "npm:1.3.0"],\
@@ -7777,10 +7854,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
],\
"linkType": "HARD"\
}],\
- ["npm:1.62.0", {\
- "packageLocation": "./.yarn/cache/sass-npm-1.62.0-bf9dbdfb5f-d5f606aa25.zip/node_modules/sass/",\
+ ["npm:1.62.1", {\
+ "packageLocation": "./.yarn/cache/sass-npm-1.62.1-c16d65fd28-1b1b3584b3.zip/node_modules/sass/",\
"packageDependencies": [\
- ["sass", "npm:1.62.0"],\
+ ["sass", "npm:1.62.1"],\
["chokidar", "npm:3.5.3"],\
["immutable", "npm:4.0.0"],\
["source-map-js", "npm:1.0.2"]\
@@ -7955,6 +8032,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["signal-exit", "npm:3.0.7"]\
],\
"linkType": "HARD"\
+ }],\
+ ["npm:4.0.2", {\
+ "packageLocation": "./.yarn/cache/signal-exit-npm-4.0.2-e3f0e8ed25-41f5928431.zip/node_modules/signal-exit/",\
+ "packageDependencies": [\
+ ["signal-exit", "npm:4.0.2"]\
+ ],\
+ "linkType": "HARD"\
}]\
]],\
["sisteransi", [\
@@ -8110,6 +8194,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["strip-ansi", "npm:6.0.1"]\
],\
"linkType": "HARD"\
+ }],\
+ ["npm:5.1.2", {\
+ "packageLocation": "./.yarn/cache/string-width-npm-5.1.2-bf60531341-7369deaa29.zip/node_modules/string-width/",\
+ "packageDependencies": [\
+ ["string-width", "npm:5.1.2"],\
+ ["eastasianwidth", "npm:0.2.0"],\
+ ["emoji-regex", "npm:9.2.2"],\
+ ["strip-ansi", "npm:7.0.1"]\
+ ],\
+ "linkType": "HARD"\
}]\
]],\
["string.prototype.trimend", [\
@@ -8154,6 +8248,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["ansi-regex", "npm:5.0.1"]\
],\
"linkType": "HARD"\
+ }],\
+ ["npm:7.0.1", {\
+ "packageLocation": "./.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip/node_modules/strip-ansi/",\
+ "packageDependencies": [\
+ ["strip-ansi", "npm:7.0.1"],\
+ ["ansi-regex", "npm:6.0.1"]\
+ ],\
+ "linkType": "HARD"\
}]\
]],\
["strip-bom", [\
@@ -8520,7 +8622,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["less", null],\
["postcss", "npm:8.4.23"],\
["rollup", "npm:3.21.6"],\
- ["sass", "npm:1.62.0"],\
+ ["sass", "npm:1.62.1"],\
["stylus", null],\
["sugarss", null],\
["terser", null]\
@@ -8808,6 +8910,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["strip-ansi", "npm:6.0.1"]\
],\
"linkType": "HARD"\
+ }],\
+ ["npm:8.1.0", {\
+ "packageLocation": "./.yarn/cache/wrap-ansi-npm-8.1.0-26a4e6ae28-371733296d.zip/node_modules/wrap-ansi/",\
+ "packageDependencies": [\
+ ["wrap-ansi", "npm:8.1.0"],\
+ ["ansi-styles", "npm:6.2.1"],\
+ ["string-width", "npm:5.1.2"],\
+ ["strip-ansi", "npm:7.0.1"]\
+ ],\
+ "linkType": "HARD"\
}]\
]],\
["wrappy", [\
diff --git a/.yarn/cache/@html-validate-stylish-npm-3.0.0-6d9dccafda-818efd25ac.zip b/.yarn/cache/@html-validate-stylish-npm-3.0.0-6d9dccafda-818efd25ac.zip
deleted file mode 100644
index 5ed78286f..000000000
Binary files a/.yarn/cache/@html-validate-stylish-npm-3.0.0-6d9dccafda-818efd25ac.zip and /dev/null differ
diff --git a/.yarn/cache/@html-validate-stylish-npm-4.0.1-a5ee83fd48-89c83ea1ae.zip b/.yarn/cache/@html-validate-stylish-npm-4.0.1-a5ee83fd48-89c83ea1ae.zip
new file mode 100644
index 000000000..c7eff4b6c
Binary files /dev/null and b/.yarn/cache/@html-validate-stylish-npm-4.0.1-a5ee83fd48-89c83ea1ae.zip differ
diff --git a/.yarn/cache/@isaacs-cliui-npm-8.0.2-f4364666d5-4a473b9b32.zip b/.yarn/cache/@isaacs-cliui-npm-8.0.2-f4364666d5-4a473b9b32.zip
new file mode 100644
index 000000000..d19176fad
Binary files /dev/null and b/.yarn/cache/@isaacs-cliui-npm-8.0.2-f4364666d5-4a473b9b32.zip differ
diff --git a/.yarn/cache/@pkgjs-parseargs-npm-0.11.0-cd2a3fe948-6ad6a00fc4.zip b/.yarn/cache/@pkgjs-parseargs-npm-0.11.0-cd2a3fe948-6ad6a00fc4.zip
new file mode 100644
index 000000000..96f576f7d
Binary files /dev/null and b/.yarn/cache/@pkgjs-parseargs-npm-0.11.0-cd2a3fe948-6ad6a00fc4.zip differ
diff --git a/.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip b/.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip
new file mode 100644
index 000000000..088e552d0
Binary files /dev/null and b/.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip differ
diff --git a/.yarn/cache/ansi-styles-npm-6.2.1-d43647018c-ef940f2f0c.zip b/.yarn/cache/ansi-styles-npm-6.2.1-d43647018c-ef940f2f0c.zip
new file mode 100644
index 000000000..aa1bdfde1
Binary files /dev/null and b/.yarn/cache/ansi-styles-npm-6.2.1-d43647018c-ef940f2f0c.zip differ
diff --git a/.yarn/cache/eastasianwidth-npm-0.2.0-c37eb16bd1-7d00d7cd8e.zip b/.yarn/cache/eastasianwidth-npm-0.2.0-c37eb16bd1-7d00d7cd8e.zip
new file mode 100644
index 000000000..10385995a
Binary files /dev/null and b/.yarn/cache/eastasianwidth-npm-0.2.0-c37eb16bd1-7d00d7cd8e.zip differ
diff --git a/.yarn/cache/emoji-regex-npm-9.2.2-e6fac8d058-8487182da7.zip b/.yarn/cache/emoji-regex-npm-9.2.2-e6fac8d058-8487182da7.zip
new file mode 100644
index 000000000..e6b0ab4d8
Binary files /dev/null and b/.yarn/cache/emoji-regex-npm-9.2.2-e6fac8d058-8487182da7.zip differ
diff --git a/.yarn/cache/foreground-child-npm-3.1.1-77e78ed774-139d270bc8.zip b/.yarn/cache/foreground-child-npm-3.1.1-77e78ed774-139d270bc8.zip
new file mode 100644
index 000000000..a288850fb
Binary files /dev/null and b/.yarn/cache/foreground-child-npm-3.1.1-77e78ed774-139d270bc8.zip differ
diff --git a/.yarn/cache/glob-npm-10.2.4-49f715fccc-29845faaa1.zip b/.yarn/cache/glob-npm-10.2.4-49f715fccc-29845faaa1.zip
new file mode 100644
index 000000000..f9f2284bf
Binary files /dev/null and b/.yarn/cache/glob-npm-10.2.4-49f715fccc-29845faaa1.zip differ
diff --git a/.yarn/cache/glob-npm-9.3.5-2f602083f0-94b093adbc.zip b/.yarn/cache/glob-npm-9.3.5-2f602083f0-94b093adbc.zip
deleted file mode 100644
index 403339530..000000000
Binary files a/.yarn/cache/glob-npm-9.3.5-2f602083f0-94b093adbc.zip and /dev/null differ
diff --git a/.yarn/cache/highcharts-npm-11.0.0-df56f18474-f173287d41.zip b/.yarn/cache/highcharts-npm-11.0.1-05a14e3887-773a7b8765.zip
similarity index 71%
rename from .yarn/cache/highcharts-npm-11.0.0-df56f18474-f173287d41.zip
rename to .yarn/cache/highcharts-npm-11.0.1-05a14e3887-773a7b8765.zip
index aafe06820..c953a6456 100644
Binary files a/.yarn/cache/highcharts-npm-11.0.0-df56f18474-f173287d41.zip and b/.yarn/cache/highcharts-npm-11.0.1-05a14e3887-773a7b8765.zip differ
diff --git a/.yarn/cache/html-validate-npm-7.15.1-d33032fed7-c22d20c4cc.zip b/.yarn/cache/html-validate-npm-7.15.1-d33032fed7-c22d20c4cc.zip
deleted file mode 100644
index 9aa2e58c1..000000000
Binary files a/.yarn/cache/html-validate-npm-7.15.1-d33032fed7-c22d20c4cc.zip and /dev/null differ
diff --git a/.yarn/cache/html-validate-npm-7.16.0-ceaf62fb08-cce9a9e8f7.zip b/.yarn/cache/html-validate-npm-7.16.0-ceaf62fb08-cce9a9e8f7.zip
new file mode 100644
index 000000000..21317c53e
Binary files /dev/null and b/.yarn/cache/html-validate-npm-7.16.0-ceaf62fb08-cce9a9e8f7.zip differ
diff --git a/.yarn/cache/jackspeak-npm-2.2.0-5383861524-d8cd5be4f0.zip b/.yarn/cache/jackspeak-npm-2.2.0-5383861524-d8cd5be4f0.zip
new file mode 100644
index 000000000..224a2f61a
Binary files /dev/null and b/.yarn/cache/jackspeak-npm-2.2.0-5383861524-d8cd5be4f0.zip differ
diff --git a/.yarn/cache/lru-cache-npm-9.0.1-5b18452606-48e31a2a05.zip b/.yarn/cache/lru-cache-npm-9.0.1-5b18452606-48e31a2a05.zip
deleted file mode 100644
index d1a8bac43..000000000
Binary files a/.yarn/cache/lru-cache-npm-9.0.1-5b18452606-48e31a2a05.zip and /dev/null differ
diff --git a/.yarn/cache/lru-cache-npm-9.1.1-765199cb01-4d703bb9b6.zip b/.yarn/cache/lru-cache-npm-9.1.1-765199cb01-4d703bb9b6.zip
new file mode 100644
index 000000000..5d688f763
Binary files /dev/null and b/.yarn/cache/lru-cache-npm-9.1.1-765199cb01-4d703bb9b6.zip differ
diff --git a/.yarn/cache/minimatch-npm-8.0.4-bf57f0e98a-2e46cffb86.zip b/.yarn/cache/minimatch-npm-8.0.4-bf57f0e98a-2e46cffb86.zip
deleted file mode 100644
index 8fbf0b8dc..000000000
Binary files a/.yarn/cache/minimatch-npm-8.0.4-bf57f0e98a-2e46cffb86.zip and /dev/null differ
diff --git a/.yarn/cache/minimatch-npm-9.0.0-c6737cb1be-7bd57899ed.zip b/.yarn/cache/minimatch-npm-9.0.0-c6737cb1be-7bd57899ed.zip
new file mode 100644
index 000000000..ef764d9b7
Binary files /dev/null and b/.yarn/cache/minimatch-npm-9.0.0-c6737cb1be-7bd57899ed.zip differ
diff --git a/.yarn/cache/minipass-npm-4.2.8-f05abfe254-7f4914d529.zip b/.yarn/cache/minipass-npm-4.2.8-f05abfe254-7f4914d529.zip
deleted file mode 100644
index 625abfa9b..000000000
Binary files a/.yarn/cache/minipass-npm-4.2.8-f05abfe254-7f4914d529.zip and /dev/null differ
diff --git a/.yarn/cache/minipass-npm-5.0.0-c64fb63c92-425dab2887.zip b/.yarn/cache/minipass-npm-5.0.0-c64fb63c92-425dab2887.zip
deleted file mode 100644
index c49ee93fb..000000000
Binary files a/.yarn/cache/minipass-npm-5.0.0-c64fb63c92-425dab2887.zip and /dev/null differ
diff --git a/.yarn/cache/minipass-npm-6.0.1-634723433e-1df70bb565.zip b/.yarn/cache/minipass-npm-6.0.1-634723433e-1df70bb565.zip
new file mode 100644
index 000000000..db17726e1
Binary files /dev/null and b/.yarn/cache/minipass-npm-6.0.1-634723433e-1df70bb565.zip differ
diff --git a/.yarn/cache/path-scurry-npm-1.6.4-6d612a3f34-bd5262b51d.zip b/.yarn/cache/path-scurry-npm-1.6.4-6d612a3f34-bd5262b51d.zip
deleted file mode 100644
index ade21d893..000000000
Binary files a/.yarn/cache/path-scurry-npm-1.6.4-6d612a3f34-bd5262b51d.zip and /dev/null differ
diff --git a/.yarn/cache/path-scurry-npm-1.9.1-b9d6b1c5bf-28caa788f1.zip b/.yarn/cache/path-scurry-npm-1.9.1-b9d6b1c5bf-28caa788f1.zip
new file mode 100644
index 000000000..3d6b3d39e
Binary files /dev/null and b/.yarn/cache/path-scurry-npm-1.9.1-b9d6b1c5bf-28caa788f1.zip differ
diff --git a/.yarn/cache/sass-npm-1.62.0-bf9dbdfb5f-d5f606aa25.zip b/.yarn/cache/sass-npm-1.62.0-bf9dbdfb5f-d5f606aa25.zip
deleted file mode 100644
index c05555763..000000000
Binary files a/.yarn/cache/sass-npm-1.62.0-bf9dbdfb5f-d5f606aa25.zip and /dev/null differ
diff --git a/.yarn/cache/sass-npm-1.62.1-c16d65fd28-1b1b3584b3.zip b/.yarn/cache/sass-npm-1.62.1-c16d65fd28-1b1b3584b3.zip
new file mode 100644
index 000000000..745da7a17
Binary files /dev/null and b/.yarn/cache/sass-npm-1.62.1-c16d65fd28-1b1b3584b3.zip differ
diff --git a/.yarn/cache/signal-exit-npm-4.0.2-e3f0e8ed25-41f5928431.zip b/.yarn/cache/signal-exit-npm-4.0.2-e3f0e8ed25-41f5928431.zip
new file mode 100644
index 000000000..60c1f70c3
Binary files /dev/null and b/.yarn/cache/signal-exit-npm-4.0.2-e3f0e8ed25-41f5928431.zip differ
diff --git a/.yarn/cache/string-width-npm-5.1.2-bf60531341-7369deaa29.zip b/.yarn/cache/string-width-npm-5.1.2-bf60531341-7369deaa29.zip
new file mode 100644
index 000000000..bd8840565
Binary files /dev/null and b/.yarn/cache/string-width-npm-5.1.2-bf60531341-7369deaa29.zip differ
diff --git a/.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip b/.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip
new file mode 100644
index 000000000..84c011395
Binary files /dev/null and b/.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip differ
diff --git a/.yarn/cache/wrap-ansi-npm-8.1.0-26a4e6ae28-371733296d.zip b/.yarn/cache/wrap-ansi-npm-8.1.0-26a4e6ae28-371733296d.zip
new file mode 100644
index 000000000..2ee78f31c
Binary files /dev/null and b/.yarn/cache/wrap-ansi-npm-8.1.0-26a4e6ae28-371733296d.zip differ
diff --git a/ietf/doc/templatetags/ballot_icon.py b/ietf/doc/templatetags/ballot_icon.py
index 19e59c34c..9ddb3833a 100644
--- a/ietf/doc/templatetags/ballot_icon.py
+++ b/ietf/doc/templatetags/ballot_icon.py
@@ -189,8 +189,7 @@ def state_age_colored(doc):
except IndexError:
state_datetime = datetime.datetime(1990, 1, 1, tzinfo=datetime.timezone.utc)
days = (timezone.now() - state_datetime).days
- # loosely based on
- # https://trac.ietf.org/trac/iesg/wiki/PublishPath
+ # loosely based on the Publish Path page at the iesg wiki
if iesg_state == "lc":
goal1 = 30
goal2 = 30
diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
index ba7a3ee51..39c8bf19b 100644
--- a/ietf/doc/views_doc.py
+++ b/ietf/doc/views_doc.py
@@ -491,9 +491,9 @@ def document_main(request, name, rev=None, document_html=False):
simple_diff_revisions = None
if document_html:
diff_revisions=get_diff_revisions(request, name, doc if isinstance(doc,Document) else doc.doc)
- simple_diff_revisions = [t[1] for t in diff_revisions]
+ simple_diff_revisions = [t[1] for t in diff_revisions if t[0] == doc.name]
simple_diff_revisions.reverse()
- if not doc.is_rfc() and rev != doc.rev:
+ if rev and rev != doc.rev:
# No DocHistory was found matching rev - snapshot will be false
# and doc will be a Document object, not a DocHistory
snapshot = True
@@ -851,6 +851,7 @@ def document_raw_id(request, name, rev=None, ext=None):
raise Http404
def document_html(request, name, rev=None):
+ requested_rev = rev
found = fuzzy_find_documents(name, rev)
num_found = found.documents.count()
if num_found == 0:
@@ -861,7 +862,7 @@ def document_html(request, name, rev=None):
doc = found.documents.get()
rev = found.matched_rev
- if doc.is_rfc() and rev is None:
+ if not requested_rev and doc.is_rfc(): # Someone asked for /doc/html/8989
if not name.startswith('rfc'):
return redirect('ietf.doc.views_doc.document_html', name=doc.canonical_name())
@@ -871,7 +872,7 @@ def document_html(request, name, rev=None):
if not os.path.exists(doc.get_file_name()):
raise Http404("File not found: %s" % doc.get_file_name())
- return document_main(request, name=doc.canonical_name(), rev=doc.rev if not doc.is_rfc() else None, document_html=True)
+ return document_main(request, name=doc.name if requested_rev else doc.canonical_name(), rev=doc.rev if requested_rev or not doc.is_rfc() else None, document_html=True)
def document_pdfized(request, name, rev=None, ext=None):
diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index 43101cd37..6ca77a0e1 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -731,7 +731,7 @@ class BulkAssignmentTests(TestCase):
r = self.client.post(unassigned_url, postdict)
self.assertEqual(r.status_code,302)
self.assertEqual(expected_ending_head_of_rotation, policy.default_reviewer_rotation_list()[0])
- self.assertMailboxContains(outbox, subject='Last Call assignment', text='Requested by', count=4)
+ self.assertMailboxContains(outbox, subject='Last Call', text='Requested by', count=4)
class ResetNextReviewerInTeamTests(TestCase):
diff --git a/ietf/meeting/management/commands/create_test_meeting.py b/ietf/meeting/management/commands/create_test_meeting.py
index c857d6da8..e48a8d66a 100644
--- a/ietf/meeting/management/commands/create_test_meeting.py
+++ b/ietf/meeting/management/commands/create_test_meeting.py
@@ -14,7 +14,7 @@
# can be translated to the newly expanded Constraint objects.
#
# This work was done in the context of the new meeting constraints modelling:
-# https://trac.ietf.org/trac/ietfdb/wiki/MeetingConstraints
+# https://github.com/ietf-tools/datatracker/wiki/MeetingConstraints
# Note that aside from Constraint objects, as created below, there is also
# business logic that applies to all sessions, which is to be implemented
# in the automatic schedule builder.
diff --git a/ietf/meeting/management/commands/generate_schedule.py b/ietf/meeting/management/commands/generate_schedule.py
index f4fc5e4a9..c9279fb25 100644
--- a/ietf/meeting/management/commands/generate_schedule.py
+++ b/ietf/meeting/management/commands/generate_schedule.py
@@ -1,6 +1,6 @@
# Copyright The IETF Trust 2021, All Rights Reserved
# For an overview of this process and context, see:
-# https://trac.ietf.org/trac/ietfdb/wiki/MeetingConstraints
+# https://github.com/ietf-tools/datatracker/wiki/MeetingConstraints
from __future__ import absolute_import, print_function, unicode_literals
import calendar
diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py
index abb2fb777..e69afe5ca 100644
--- a/ietf/meeting/tests_js.py
+++ b/ietf/meeting/tests_js.py
@@ -831,7 +831,7 @@ class EditMeetingScheduleTests(IetfSeleniumTestCase):
def test_session_constraint_hints(self):
"""Selecting a session should mark conflicting sessions
- To test for recurrence of https://trac.ietf.org/trac/ietfdb/ticket/3327 need to have some constraints that
+ To test for recurrence of https://github.com/ietf-tools/datatracker/issues/3327 need to have some constraints that
do not conflict. Testing with only violated constraints does not exercise the code adequately.
"""
meeting = MeetingFactory(type_id='ietf', date=date_today(), populate_schedule=False)
diff --git a/ietf/redirects/views.py b/ietf/redirects/views.py
index af8cbf555..af4e89826 100644
--- a/ietf/redirects/views.py
+++ b/ietf/redirects/views.py
@@ -48,7 +48,7 @@ def redirect(request, path="", script=""):
pass # it's ok, request didn't have 'command'.
except:
pass # strange exception like the one described in
- # https://trac.ietf.org/trac/ietfdb/ticket/179?
+ # https://github.com/ietf-tools/datatracker/issues/179
# just ignore the command string.
if cmd is not None:
remove_args.append('command')
diff --git a/ietf/review/policies.py b/ietf/review/policies.py
index 63ebab29e..e834891f7 100644
--- a/ietf/review/policies.py
+++ b/ietf/review/policies.py
@@ -23,7 +23,7 @@ from ietf.utils import log
"""
This file contains policies regarding reviewer queues.
The policies are documented in more detail on:
-https://trac.ietf.org/trac/ietfdb/wiki/ReviewerQueuePolicy
+https://github.com/ietf-tools/datatracker/wiki/ReviewerQueuePolicy
Terminology used here should match terminology used in that document.
"""
diff --git a/ietf/review/tests_policies.py b/ietf/review/tests_policies.py
index 9a73fda3c..d1d26997b 100644
--- a/ietf/review/tests_policies.py
+++ b/ietf/review/tests_policies.py
@@ -840,7 +840,7 @@ class AssignmentOrderResolverTests(TestCase):
self.assertEqual(len(ranking), 2)
self.assertEqual(ranking[0]['email'], reviewer_high.email())
self.assertEqual(ranking[1]['email'], reviewer_low.email())
- # These scores follow the ordering of https://trac.ietf.org/trac/ietfdb/wiki/ReviewerQueuePolicy,
+ # These scores follow the ordering of https://github.com/ietf-tools/datatracker/wiki/ReviewerQueuePolicy,
self.assertEqual(ranking[0]['scores'], [ 1, 1, 1, 1, 1, 1, 0, 0, -1])
self.assertEqual(ranking[1]['scores'], [-1, -1, -1, -1, -1, -1, -91, -2, 0])
self.assertEqual(ranking[0]['label'], 'Test Reviewer-high: unavailable indefinitely (Can do follow-ups); requested to be selected next for assignment; reviewed document before; wishes to review document; #2; 1 no response, 1 partially complete, 1 fully completed')
diff --git a/ietf/review/utils.py b/ietf/review/utils.py
index 032b1fd41..1e9a237b5 100644
--- a/ietf/review/utils.py
+++ b/ietf/review/utils.py
@@ -308,7 +308,7 @@ def email_review_assignment_change(request, review_assignment, subject, msg, by,
doc=review_assignment.review_request.doc,
group=review_assignment.review_request.team,
review_assignment=review_assignment,
- skip_review_secretary=not notify_secretary,
+ skip_secretary=not notify_secretary,
skip_review_reviewer=not notify_reviewer,
skip_review_requested_by=not notify_requested_by,
)
@@ -328,11 +328,11 @@ def email_review_request_change(request, review_req, subject, msg, by, notify_se
was done by that party."""
(to, cc) = gather_address_lists(
'review_req_changed',
- skipped_recipients=[Person.objects.get(name="(System)").formatted_email(), by.email_address()],
+ skipped_recipients=[Person.objects.get(name="(System)").formatted_email()],
doc=review_req.doc,
group=review_req.team,
review_request=review_req,
- skip_review_secretary=not notify_secretary,
+ skip_secretary=not notify_secretary,
skip_review_reviewer=not notify_reviewer,
skip_review_requested_by=not notify_requested_by,
)
@@ -430,9 +430,9 @@ def assign_review_request_to_reviewer(request, review_req, reviewer, add_skip=Fa
email_review_request_change(
request, review_req,
- "%s %s assignment: %s" % (review_req.team.acronym.capitalize(), review_req.type.name,review_req.doc.name),
+ "For %s, %s %s review by %s assigned: %s" % (reviewer.person.name, review_req.team.acronym.capitalize(), review_req.type.name, review_req.deadline, review_req.doc.name),
msg ,
- by=request.user.person, notify_secretary=False, notify_reviewer=True, notify_requested_by=False)
+ by=request.user.person, notify_secretary=True, notify_reviewer=True, notify_requested_by=True)
def close_review_request(request, review_req, close_state, close_comment=''):
diff --git a/ietf/static/css/document_html.scss b/ietf/static/css/document_html.scss
index ff693259f..32a1b9e4d 100644
--- a/ietf/static/css/document_html.scss
+++ b/ietf/static/css/document_html.scss
@@ -6,6 +6,9 @@ $btn-font-family: inherit !default;
$nav-link-font-weight: inherit !default;
$tooltip-margin: inherit !default;
+$font-family-sans-serif: "Inter", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+$font-family-monospace: "Noto Sans Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+
@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/maps";
diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss
index 26cd31fce..88c9cbda0 100644
--- a/ietf/static/css/ietf.scss
+++ b/ietf/static/css/ietf.scss
@@ -10,13 +10,15 @@ $enable-negative-margins: true;
$popover-max-width: 100%;
-// Only import what we need:
-
-@import "bootstrap/scss/variables";
+// Override default fonts
$font-family-sans-serif: "Inter", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
$font-family-monospace: "Noto Sans Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+// Only import what we need:
+
+@import "bootstrap/scss/variables";
+
$h1-font-size: $font-size-base * 2.2;
$h2-font-size: $font-size-base * 1.8;
$h3-font-size: $font-size-base * 1.6;
diff --git a/ietf/templates/doc/document_html.html b/ietf/templates/doc/document_html.html
index 7ee8f8124..78863b840 100644
--- a/ietf/templates/doc/document_html.html
+++ b/ietf/templates/doc/document_html.html
@@ -18,6 +18,8 @@
{% endif %}
+
+
{% if request.COOKIES.pagedeps == 'inline' %}
@@ -28,10 +30,7 @@
{% endif %}
{% endif %}
-
+
{% include "base/icons.html" %}
{% include "doc/opengraph.html" %}
- {% analytical_head_bottom %}
+ {% analytical_head_bottom %}