Skip to content

Commit

Permalink
Sync Fork (#20)
Browse files Browse the repository at this point in the history
* Add @nordeck/element-web-opendesk-module@0.3.0 to variants/openDesk/build_config.yaml

Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net>

* [create-pull-request] automated change

* update to org to element-hq

* Update org in scripts and workflows

* [create-pull-request] automated change

* Update docker/metadata-action digest to 31cebac (element-hq#26733)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update all non-major dependencies (element-hq#26734)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency typescript to v5.3.3 (element-hq#26738)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @types/node to v16.18.68 (element-hq#26737)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update babel monorepo to v7.23.5 (element-hq#26735)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update actions/deploy-pages action to v3 (element-hq#26739)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency stylelint to v16 (element-hq#26740)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

* Update dependency @types/jest to v29.5.11 (element-hq#26736)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

---------

Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net>
Co-authored-by: Charly Nguyen <charly.nguyen@nordeck.net>
Co-authored-by: t3chguy <t3chguy@users.noreply.github.com>
Co-authored-by: ElementRobot <releases@riot.im>
Co-authored-by: David Langley <langley.dave@gmail.com>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
  • Loading branch information
8 people authored Dec 13, 2023
1 parent 20cdc3d commit d1b8fcb
Show file tree
Hide file tree
Showing 19 changed files with 502 additions and 535 deletions.
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
* @vector-im/element-web
/.github/workflows/** @vector-im/element-web-app-team
/package.json @vector-im/element-web-app-team
/yarn.lock @vector-im/element-web-app-team
* @element-hq/element-web
/.github/workflows/** @element-hq/element-web-app-team
/package.json @element-hq/element-web-app-team
/yarn.lock @element-hq/element-web-app-team
/src/i18n/strings
6 changes: 3 additions & 3 deletions .github/workflows/build_debian.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:

- name: Download package
run: |
wget "https://github.com/vector-im/element-web/releases/download/$VERSION/element-$VERSION.tar.gz"
wget "https://github.com/vector-im/element-web/releases/download/$VERSION/element-$VERSION.tar.gz.asc"
wget "https://github.com/element-hq/element-web/releases/download/$VERSION/element-$VERSION.tar.gz"
wget "https://github.com/element-hq/element-web/releases/download/$VERSION/element-$VERSION.tar.gz.asc"
- name: Check GPG signature
run: |
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:

- name: Publish to packages.element.io
if: github.event.release.prerelease == false
uses: vector-im/packages.element.io@master
uses: element-hq/packages.element.io@master
with:
file: element-web.deb
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
build:
name: "Build & Deploy develop.element.io"
# Only respect triggers from our develop branch, ignore that of forks
if: github.repository == 'vector-im/element-web'
if: github.repository == 'element-hq/element-web'
runs-on: ubuntu-latest
environment: develop
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5
uses: docker/metadata-action@31cebacef4805868f9ce9a0cb03ee36c32df2ac4 # v5
with:
images: |
superherodotcom/element-web
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Fetch element-desktop
uses: actions/checkout@v4
with:
repository: vector-im/element-desktop
repository: element-hq/element-desktop
path: element-desktop

- name: Fetch element-web
Expand Down Expand Up @@ -114,4 +114,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v3
12 changes: 6 additions & 6 deletions .github/workflows/pending-reviews.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
environment: Matrix
if: github.repository == 'vector-im/element-web'
env:
URL: "https://github.com/pulls?q=is%3Apr+is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Avector-im%2Felement-web+repo%3Avector-im%2Felement-desktop+review-requested%3A%40me+sort%3Aupdated-desc+"
RELEASE_BLOCKERS_URL: "https://github.com/pulls?q=is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Avector-im%2Felement-web+repo%3Avector-im%2Felement-desktop+sort%3Aupdated-desc+label%3AX-Release-Blocker+"
URL: "https://github.com/pulls?q=is%3Apr+is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Aelement-hq%2Felement-web+repo%3Aelement-hq%2Felement-desktop+review-requested%3A%40me+sort%3Aupdated-desc+"
RELEASE_BLOCKERS_URL: "https://github.com/pulls?q=is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Aelement-hq%2Felement-web+repo%3Aelement-hq%2Felement-desktop+sort%3Aupdated-desc+label%3AX-Release-Blocker+"
steps:
- uses: actions/github-script@v7
env:
Expand Down Expand Up @@ -61,16 +61,16 @@ jobs:
}
const repos = [
"vector-im/element-desktop",
"vector-im/element-web",
"element-hq/element-desktop",
"element-hq/element-web",
"matrix-org/matrix-react-sdk",
"matrix-org/matrix-js-sdk",
];
const teams = [
"matrix-org/element-web-app-team",
"matrix-org/element-web",
"vector-im/element-web-app-team",
"vector-im/element-web",
"element-hq/element-web-app-team",
"element-hq/element-web",
];
let issueCount = 0;
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v4
if: inputs.element-desktop
with:
repository: vector-im/element-desktop
repository: element-hq/element-desktop
path: element-desktop
ref: staging
fetch-depth: 0
Expand All @@ -40,7 +40,7 @@ jobs:
uses: actions/checkout@v4
if: inputs.element-web
with:
repository: vector-im/element-web
repository: element-hq/element-web
path: element-web
ref: staging
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ on:
- .github/labels.yml
jobs:
sync-labels:
uses: vector-im/element-meta/.github/workflows/sync-labels.yml@develop
uses: element-hq/element-meta/.github/workflows/sync-labels.yml@develop
with:
LABELS: |
vector-im/element-meta
element-hq/element-meta
.github/labels.yml
DELETE: true
WET: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/triage-assigned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
steps:
- uses: actions/add-to-project@main
with:
project-url: https://github.com/orgs/vector-im/projects/67
project-url: https://github.com/orgs/element-hq/projects/67
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
16 changes: 8 additions & 8 deletions .github/workflows/triage-labelled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- uses: konradpabjan/move-labeled-or-milestoned-issue@190352295fe309fcb113b49193bc81d9aaa9cb01
with:
action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
project-url: "https://github.com/vector-im/element-web/projects/27"
project-url: "https://github.com/element-hq/element-web/projects/27"
column-name: "Need info"
label-name: "X-Needs-Info"

Expand All @@ -79,7 +79,7 @@ jobs:
steps:
- uses: actions/add-to-project@main
with:
project-url: https://github.com/orgs/vector-im/projects/18
project-url: https://github.com/orgs/element-hq/projects/18
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

add_product_issues:
Expand All @@ -90,7 +90,7 @@ jobs:
steps:
- uses: actions/add-to-project@main
with:
project-url: https://github.com/orgs/vector-im/projects/28
project-url: https://github.com/orgs/element-hq/projects/28
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

Search_issues_to_board:
Expand All @@ -101,7 +101,7 @@ jobs:
steps:
- uses: actions/add-to-project@main
with:
project-url: https://github.com/orgs/vector-im/projects/48
project-url: https://github.com/orgs/element-hq/projects/48
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

voip:
Expand All @@ -112,7 +112,7 @@ jobs:
steps:
- uses: actions/add-to-project@main
with:
project-url: https://github.com/orgs/vector-im/projects/41
project-url: https://github.com/orgs/element-hq/projects/41
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

verticals_feature:
Expand All @@ -123,7 +123,7 @@ jobs:
steps:
- uses: actions/add-to-project@main
with:
project-url: https://github.com/orgs/vector-im/projects/57
project-url: https://github.com/orgs/element-hq/projects/57
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

tech_debt:
Expand All @@ -139,7 +139,7 @@ jobs:
steps:
- uses: actions/add-to-project@main
with:
project-url: https://github.com/orgs/vector-im/projects/101
project-url: https://github.com/orgs/element-hq/projects/101
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

element_r:
Expand All @@ -163,4 +163,4 @@ jobs:
field-keys: Workstream,module
field-values: Element-R,web
env:
PROJECT_URL: https://github.com/orgs/vector-im/projects/76
PROJECT_URL: https://github.com/orgs/element-hq/projects/76
4 changes: 2 additions & 2 deletions .github/workflows/triage-move-review-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
headers: '{"GraphQL-Features": "projects_next_graphql"}'
query: |
query find_team_members($team: String!) {
organization(login: "vector-im") {
organization(login: "element-hq") {
team(slug: $team) {
members {
nodes {
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
headers: '{"GraphQL-Features": "projects_next_graphql"}'
query: |
query find_team_members($team: String!) {
organization(login: "vector-im") {
organization(login: "element-hq") {
team(slug: $team) {
members {
nodes {
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"@types/jsrsasign": "^10.5.4",
"@types/katex": "^0.16.7",
"@types/lodash": "^4.14.197",
"@types/minimist": "^1.2.5",
"@types/modernizr": "^3.5.6",
"@types/node": "^16",
"@types/node-fetch": "^2.6.4",
Expand Down Expand Up @@ -149,7 +150,7 @@
"css-loader": "^4",
"css-minimizer-webpack-plugin": "^5.0.1",
"dotenv": "^16.0.2",
"eslint": "8.54.0",
"eslint": "8.55.0",
"eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-deprecate": "0.8.4",
Expand Down Expand Up @@ -195,13 +196,13 @@
"setimmediate": "^1.0.5",
"string-replace-loader": "3",
"style-loader": "2",
"stylelint": "^15.10.1",
"stylelint": "^16.0.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-scss": "^5.0.0",
"stylelint-scss": "^6.0.0",
"terser-webpack-plugin": "^5.3.9",
"ts-node": "^10.9.1",
"ts-prune": "^0.10.3",
"typescript": "5.3.2",
"typescript": "5.3.3",
"util": "^0.12.5",
"webpack": "^5.89.0",
"webpack-bundle-analyzer": "^4.8.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/issues-burndown.pl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
login => 'ara4n', pass => read_password("github password: "),
);

$gh->set_default_user_repo('vector-im', 'element-web');
$gh->set_default_user_repo('element-hq', 'element-web');

#my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
my @issues = $gh->issue->repos_issues({ state => 'all' });
Expand Down
2 changes: 1 addition & 1 deletion scripts/issues-no-state.pl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
login => 'ara4n', pass => read_password("github password: "),
);

$gh->set_default_user_repo('vector-im', 'element-web');
$gh->set_default_user_repo('element-hq', 'element-web');

#my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
my @issues = $gh->issue->repos_issues({ state => 'all' });
Expand Down
1 change: 1 addition & 0 deletions src/i18n/strings/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"auth": {
"sso_complete_in_browser_dialog_title": "Browser öffnen, um die Anmeldung abzuschließen"
},
"desktop_default_device_name": "%(brand)s Desktop: %(platformName)s",
"download_completed": "Herunterladen fertiggestellt",
"error": {
"app_launch_unexpected_error": "Unerwarteter Fehler bei der Vorbereitung der App; mehr Details in der Konsole.",
Expand Down
5 changes: 0 additions & 5 deletions src/i18n/strings/en_US.json

This file was deleted.

1 change: 1 addition & 0 deletions src/i18n/strings/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"auth": {
"sso_complete_in_browser_dialog_title": "Buka peramban Anda untuk menyelesaikan Sign In"
},
"desktop_default_device_name": "%(brand)s Desktop: %(platformName)s",
"download_completed": "Unduhan Selesai",
"error": {
"app_launch_unexpected_error": "Kesalahan tak terduga saat menyiapkan aplikasi. Lihat konsol untuk detail.",
Expand Down
1 change: 1 addition & 0 deletions variants/openDesk/build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
# The values of this are provided to `yarn add` for inclusion.
modules:
- "@nordeck/element-web-guest-module@1.0.0"
- "@nordeck/element-web-opendesk-module@0.3.0"
- "@nordeck/element-web-widget-lifecycle-module@1.0.1"
Loading

0 comments on commit d1b8fcb

Please sign in to comment.