diff --git a/.github/workflows/e2e-tests-readonly.yml b/.github/workflows/e2e-tests-readonly.yml index 539682ac6..776e8578e 100644 --- a/.github/workflows/e2e-tests-readonly.yml +++ b/.github/workflows/e2e-tests-readonly.yml @@ -1,7 +1,7 @@ name: Read-only e2e tests on: pull_request: - branches: [ main ] + branches: [ main, live ] jobs: test: runs-on: ubuntu-20.04 diff --git a/.github/workflows/e2e-tests-readwrite.yml b/.github/workflows/e2e-tests-readwrite.yml index f0bd6fffa..de12343da 100644 --- a/.github/workflows/e2e-tests-readwrite.yml +++ b/.github/workflows/e2e-tests-readwrite.yml @@ -1,7 +1,7 @@ name: Read-write e2e tests on: pull_request: - branches: [ main ] + branches: [ main, live ] jobs: test: runs-on: ubuntu-20.04 diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 52f1b977a..0ae7a8338 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -1,7 +1,7 @@ name: Unit tests on: pull_request: - branches: [ main ] + branches: [ main, live ] jobs: test: runs-on: ubuntu-latest diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..658984787 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v18.0.0 diff --git a/src/intl/en-US.js b/src/intl/en-US.js index e952f4eea..dd4db1b08 100644 --- a/src/intl/en-US.js +++ b/src/intl/en-US.js @@ -296,9 +296,11 @@ export default { statuses: 'Toots', follows: 'Follows', followers: 'Followers', + joined: 'Joined', moreOptions: 'More options', followersLabel: 'Followed by {count}', followingLabel: 'Follows {count}', + joinedLabel: 'Joined on {date}', followLabel: `Follow {requested, select, true {(follow requested)} other {} diff --git a/src/routes/_components/profile/AccountProfileDetails.html b/src/routes/_components/profile/AccountProfileDetails.html index c275da013..60de834d6 100644 --- a/src/routes/_components/profile/AccountProfileDetails.html +++ b/src/routes/_components/profile/AccountProfileDetails.html @@ -1,5 +1,15 @@

{intl.statisticsAndMoreOptions}

+ + + +