trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Jens Langhammer 2021-05-06 13:16:22 +02:00
parent 73b87a5e3d 0386c0dd7b
commit e6fdec4c8e
5 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Pipfile.lock generated
View File

@ -116,17 +116,18 @@
}, },
"boto3": { "boto3": {
"hashes": [ "hashes": [
"sha256:d21af50e35ef2e941df03b4363bbec88909996144f530ba1611ab15156da7c40" "sha256:1db618cfe0e9d8c6ff4fc31ef4f9620bd72f472da0f3095f0be9372d77b671e9",
"sha256:61fe8cbb2d4bf1c9a69a73b3f2c68464e0ab587c9367b35f0ef691f372d5ce67"
], ],
"index": "pypi", "index": "pypi",
"version": "==1.17.66" "version": "==1.17.67"
}, },
"botocore": { "botocore": {
"hashes": [ "hashes": [
"sha256:01c24793df0f814e0b00f109972d4a3fbc54aa5f7edf2fc16c065c24f27e8974", "sha256:4666fb5bdf7d78c51d465bac7d9eb1d31c34be46990cd1ad2d1b338bbec8c049",
"sha256:455b2eff5c443393bc3bf898ea4fc0dc50151eba50f2bad6b48bedb1defe0310" "sha256:adb26d8bc65761b5a46744f67b7e7096dedb2071aff876e0962cd648f28e9a8f"
], ],
"version": "==1.20.66" "version": "==1.20.67"
}, },
"cachetools": { "cachetools": {
"hashes": [ "hashes": [
@ -311,11 +312,11 @@
}, },
"django": { "django": {
"hashes": [ "hashes": [
"sha256:95c13c750f1f214abadec92b82c2768a5e795e6c2ebd0b4126f895ce9efffcdd", "sha256:0a1d195ad65c52bf275b8277b3d49680bd1137a5f55039a806f25f6b9752ce3d",
"sha256:e2f73790c60188d3f94f08f644de249d956b3789161e7604509d128a13fb2fcc" "sha256:18dd3145ddbd04bf189ff79b9954d08fda5171ea7b57bf705789fea766a07d50"
], ],
"index": "pypi", "index": "pypi",
"version": "==3.2.1" "version": "==3.2.2"
}, },
"django-dbbackup": { "django-dbbackup": {
"hashes": [ "hashes": [
@ -1108,10 +1109,10 @@
}, },
"six": { "six": {
"hashes": [ "hashes": [
"sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
"sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
], ],
"version": "==1.15.0" "version": "==1.16.0"
}, },
"sqlparse": { "sqlparse": {
"hashes": [ "hashes": [
@ -1802,10 +1803,10 @@
}, },
"six": { "six": {
"hashes": [ "hashes": [
"sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
"sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
], ],
"version": "==1.15.0" "version": "==1.16.0"
}, },
"smmap": { "smmap": {
"hashes": [ "hashes": [

56
web/package-lock.json generated
View File

@ -27,13 +27,13 @@
"@sentry/browser": "^6.3.5", "@sentry/browser": "^6.3.5",
"@sentry/tracing": "^6.3.5", "@sentry/tracing": "^6.3.5",
"@types/chart.js": "^2.9.32", "@types/chart.js": "^2.9.32",
"@types/codemirror": "0.0.109", "@types/codemirror": "5.60.0",
"@types/grecaptcha": "^3.0.2", "@types/grecaptcha": "^3.0.2",
"@typescript-eslint/eslint-plugin": "^4.22.1", "@typescript-eslint/eslint-plugin": "^4.22.1",
"@typescript-eslint/parser": "^4.22.1", "@typescript-eslint/parser": "^4.22.1",
"@webcomponents/webcomponentsjs": "^2.5.0", "@webcomponents/webcomponentsjs": "^2.5.0",
"authentik-api": "file:api", "authentik-api": "file:api",
"babel-plugin-macros": "^3.0.1", "babel-plugin-macros": "^3.1.0",
"base64-js": "^1.5.1", "base64-js": "^1.5.1",
"chart.js": "^3.2.1", "chart.js": "^3.2.1",
"chartjs-adapter-moment": "^1.0.0", "chartjs-adapter-moment": "^1.0.0",
@ -44,8 +44,8 @@
"eslint-plugin-custom-elements": "0.0.2", "eslint-plugin-custom-elements": "0.0.2",
"eslint-plugin-lit": "^1.3.0", "eslint-plugin-lit": "^1.3.0",
"flowchart.js": "^1.15.0", "flowchart.js": "^1.15.0",
"lit-element": "^2.5.0", "lit-element": "^2.5.1",
"lit-html": "^1.4.0", "lit-html": "^1.4.1",
"moment": "^2.29.1", "moment": "^2.29.1",
"rapidoc": "^9.0.0", "rapidoc": "^9.0.0",
"rollup": "^2.47.0", "rollup": "^2.47.0",
@ -2538,9 +2538,9 @@
} }
}, },
"node_modules/@types/codemirror": { "node_modules/@types/codemirror": {
"version": "0.0.109", "version": "5.60.0",
"resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-0.0.109.tgz", "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.0.tgz",
"integrity": "sha512-cSdiHeeLjvGn649lRTNeYrVCDOgDrtP+bDDSFDd1TF+i0jKGPDRozno2NOJ9lTniso+taiv4kiVS8dgM8Jm5lg==", "integrity": "sha512-xgzXZyCzedLRNC67/Nn8rpBtTFnAsX2C+Q/LGoH6zgcpF/LqdNHJMHEOhqT1bwUcSp6kQdOIuKzRbeW9DYhEhg==",
"dependencies": { "dependencies": {
"@types/tern": "*" "@types/tern": "*"
} }
@ -3035,9 +3035,9 @@
} }
}, },
"node_modules/babel-plugin-macros": { "node_modules/babel-plugin-macros": {
"version": "3.0.1", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.0.1.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
"integrity": "sha512-CKt4+Oy9k2wiN+hT1uZzOw7d8zb1anbQpf7KLwaaXRCi/4pzKdFKHf7v5mvoPmjkmxshh7eKZQuRop06r5WP4w==", "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"cosmiconfig": "^7.0.0", "cosmiconfig": "^7.0.0",
@ -5567,17 +5567,17 @@
} }
}, },
"node_modules/lit-element": { "node_modules/lit-element": {
"version": "2.5.0", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.5.0.tgz", "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.5.1.tgz",
"integrity": "sha512-SS6Bmm7FYw/RVeD6YD3gAjrT0ss6rOQHaacUnDCyVE3sDuUpEmr+Gjl0QUHnD8+0mM5apBbnA60NkFJ2kqcOMA==", "integrity": "sha512-ogu7PiJTA33bEK0xGu1dmaX5vhcRjBXCFexPja0e7P7jqLhTpNKYRPmE+GmiCaRVAbiQKGkUgkh/i6+bh++dPQ==",
"dependencies": { "dependencies": {
"lit-html": "^1.1.1" "lit-html": "^1.1.1"
} }
}, },
"node_modules/lit-html": { "node_modules/lit-html": {
"version": "1.4.0", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.4.0.tgz", "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.4.1.tgz",
"integrity": "sha512-cgaqPSgqHRaTH/P1DnWD/dQxudtrHqD0xo1AoyOGJZir2rXgsvTg77z6Pitwk9B+kL23EakD62HV3x8sT01aWQ==" "integrity": "sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA=="
}, },
"node_modules/locate-path": { "node_modules/locate-path": {
"version": "5.0.0", "version": "5.0.0",
@ -10320,9 +10320,9 @@
} }
}, },
"@types/codemirror": { "@types/codemirror": {
"version": "0.0.109", "version": "5.60.0",
"resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-0.0.109.tgz", "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.0.tgz",
"integrity": "sha512-cSdiHeeLjvGn649lRTNeYrVCDOgDrtP+bDDSFDd1TF+i0jKGPDRozno2NOJ9lTniso+taiv4kiVS8dgM8Jm5lg==", "integrity": "sha512-xgzXZyCzedLRNC67/Nn8rpBtTFnAsX2C+Q/LGoH6zgcpF/LqdNHJMHEOhqT1bwUcSp6kQdOIuKzRbeW9DYhEhg==",
"requires": { "requires": {
"@types/tern": "*" "@types/tern": "*"
} }
@ -10696,9 +10696,9 @@
} }
}, },
"babel-plugin-macros": { "babel-plugin-macros": {
"version": "3.0.1", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.0.1.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
"integrity": "sha512-CKt4+Oy9k2wiN+hT1uZzOw7d8zb1anbQpf7KLwaaXRCi/4pzKdFKHf7v5mvoPmjkmxshh7eKZQuRop06r5WP4w==", "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
"requires": { "requires": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"cosmiconfig": "^7.0.0", "cosmiconfig": "^7.0.0",
@ -12737,17 +12737,17 @@
} }
}, },
"lit-element": { "lit-element": {
"version": "2.5.0", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.5.0.tgz", "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.5.1.tgz",
"integrity": "sha512-SS6Bmm7FYw/RVeD6YD3gAjrT0ss6rOQHaacUnDCyVE3sDuUpEmr+Gjl0QUHnD8+0mM5apBbnA60NkFJ2kqcOMA==", "integrity": "sha512-ogu7PiJTA33bEK0xGu1dmaX5vhcRjBXCFexPja0e7P7jqLhTpNKYRPmE+GmiCaRVAbiQKGkUgkh/i6+bh++dPQ==",
"requires": { "requires": {
"lit-html": "^1.1.1" "lit-html": "^1.1.1"
} }
}, },
"lit-html": { "lit-html": {
"version": "1.4.0", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.4.0.tgz", "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.4.1.tgz",
"integrity": "sha512-cgaqPSgqHRaTH/P1DnWD/dQxudtrHqD0xo1AoyOGJZir2rXgsvTg77z6Pitwk9B+kL23EakD62HV3x8sT01aWQ==" "integrity": "sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA=="
}, },
"locate-path": { "locate-path": {
"version": "5.0.0", "version": "5.0.0",

8
web/package.json
View File

@ -53,13 +53,13 @@
"@sentry/browser": "^6.3.5", "@sentry/browser": "^6.3.5",
"@sentry/tracing": "^6.3.5", "@sentry/tracing": "^6.3.5",
"@types/chart.js": "^2.9.32", "@types/chart.js": "^2.9.32",
"@types/codemirror": "0.0.109", "@types/codemirror": "5.60.0",
"@types/grecaptcha": "^3.0.2", "@types/grecaptcha": "^3.0.2",
"@typescript-eslint/eslint-plugin": "^4.22.1", "@typescript-eslint/eslint-plugin": "^4.22.1",
"@typescript-eslint/parser": "^4.22.1", "@typescript-eslint/parser": "^4.22.1",
"@webcomponents/webcomponentsjs": "^2.5.0", "@webcomponents/webcomponentsjs": "^2.5.0",
"authentik-api": "file:api", "authentik-api": "file:api",
"babel-plugin-macros": "^3.0.1", "babel-plugin-macros": "^3.1.0",
"base64-js": "^1.5.1", "base64-js": "^1.5.1",
"chart.js": "^3.2.1", "chart.js": "^3.2.1",
"chartjs-adapter-moment": "^1.0.0", "chartjs-adapter-moment": "^1.0.0",
@ -70,8 +70,8 @@
"eslint-plugin-custom-elements": "0.0.2", "eslint-plugin-custom-elements": "0.0.2",
"eslint-plugin-lit": "^1.3.0", "eslint-plugin-lit": "^1.3.0",
"flowchart.js": "^1.15.0", "flowchart.js": "^1.15.0",
"lit-element": "^2.5.0", "lit-element": "^2.5.1",
"lit-html": "^1.4.0", "lit-html": "^1.4.1",
"moment": "^2.29.1", "moment": "^2.29.1",
"rapidoc": "^9.0.0", "rapidoc": "^9.0.0",
"rollup": "^2.47.0", "rollup": "^2.47.0",

18
website/package-lock.json generated
View File

@ -11,7 +11,7 @@
"@docusaurus/preset-classic": "2.0.0-alpha.75", "@docusaurus/preset-classic": "2.0.0-alpha.75",
"@mdx-js/react": "^1.6.22", "@mdx-js/react": "^1.6.22",
"clsx": "^1.1.1", "clsx": "^1.1.1",
"postcss": "^8.2.13", "postcss": "^8.2.14",
"rapidoc": "^9.0.0", "rapidoc": "^9.0.0",
"react": "^17.0.2", "react": "^17.0.2",
"react-before-after-slider": "^1.0.4", "react-before-after-slider": "^1.0.4",
@ -8823,9 +8823,9 @@
} }
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.2.13", "version": "8.2.14",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.13.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.14.tgz",
"integrity": "sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==", "integrity": "sha512-+jD0ZijcvyCqPQo/m/CW0UcARpdFylq04of+Q7RKX6f/Tu+dvpUI/9Sp81+i6/vJThnOBX09Quw0ZLOVwpzX3w==",
"dependencies": { "dependencies": {
"colorette": "^1.2.2", "colorette": "^1.2.2",
"nanoid": "^3.1.22", "nanoid": "^3.1.22",
@ -8833,6 +8833,10 @@
}, },
"engines": { "engines": {
"node": "^10 || ^12 || >=14" "node": "^10 || ^12 || >=14"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/postcss/"
} }
}, },
"node_modules/postcss-calc": { "node_modules/postcss-calc": {
@ -20891,9 +20895,9 @@
"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
}, },
"postcss": { "postcss": {
"version": "8.2.13", "version": "8.2.14",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.13.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.14.tgz",
"integrity": "sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==", "integrity": "sha512-+jD0ZijcvyCqPQo/m/CW0UcARpdFylq04of+Q7RKX6f/Tu+dvpUI/9Sp81+i6/vJThnOBX09Quw0ZLOVwpzX3w==",
"requires": { "requires": {
"colorette": "^1.2.2", "colorette": "^1.2.2",
"nanoid": "^3.1.22", "nanoid": "^3.1.22",

2
website/package.json
View File

@ -14,7 +14,7 @@
"@docusaurus/preset-classic": "2.0.0-alpha.75", "@docusaurus/preset-classic": "2.0.0-alpha.75",
"@mdx-js/react": "^1.6.22", "@mdx-js/react": "^1.6.22",
"clsx": "^1.1.1", "clsx": "^1.1.1",
"postcss": "^8.2.13", "postcss": "^8.2.14",
"rapidoc": "^9.0.0", "rapidoc": "^9.0.0",
"react": "^17.0.2", "react": "^17.0.2",
"react-before-after-slider": "^1.0.4", "react-before-after-slider": "^1.0.4",