Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into main for release #438

Merged
70 commits merged into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
188d2b6
Bump eslint-plugin-vue from 9.15.0 to 9.15.1 (#364)
dependabot[bot] Jun 26, 2023
07b68f0
Bump lint-staged from 13.2.2 to 13.2.3 (#367)
dependabot[bot] Jun 28, 2023
fd5493f
Bump cypress from 12.15.0 to 12.16.0 (#366)
dependabot[bot] Jun 28, 2023
d4d725c
Bump prettier from 2.8.8 to 3.0.0 (#370)
dependabot[bot] Jul 5, 2023
4f6fe20
Bump vue-router from 4.2.2 to 4.2.3 (#369)
dependabot[bot] Jul 5, 2023
165faec
Bump eslint from 8.43.0 to 8.44.0 (#368)
dependabot[bot] Jul 5, 2023
4e832b6
Bump postcss from 8.4.24 to 8.4.25 (#371)
dependabot[bot] Jul 6, 2023
7e7f760
Bump swrv from 1.0.3 to 1.0.4 (#372)
dependabot[bot] Jul 6, 2023
4049fdc
Bump cypress from 12.16.0 to 12.17.0 (#373)
dependabot[bot] Jul 7, 2023
27a19e7
Bump vue-router from 4.2.3 to 4.2.4 (#374)
dependabot[bot] Jul 7, 2023
a8f4255
Bump cypress from 12.17.0 to 12.17.1 (#375)
dependabot[bot] Jul 11, 2023
43d73ba
Bump prettier-plugin-tailwindcss from 0.3.0 to 0.4.1 (#379)
dependabot[bot] Jul 14, 2023
75bd34f
Bump tailwindcss from 3.3.2 to 3.3.3 (#378)
dependabot[bot] Jul 14, 2023
9667796
Bump postcss from 8.4.25 to 8.4.26 (#377)
dependabot[bot] Jul 14, 2023
5fa3fed
Bump sass from 1.63.6 to 1.64.0 (#381)
dependabot[bot] Jul 20, 2023
239f1b3
Bump eslint from 8.44.0 to 8.45.0 (#380)
dependabot[bot] Jul 20, 2023
6a787e9
Bump cypress from 12.17.1 to 12.17.2 (#382)
dependabot[bot] Jul 21, 2023
df36760
Bump postcss from 8.4.26 to 8.4.27 (#383)
dependabot[bot] Jul 21, 2023
343b827
Bump eslint from 8.45.0 to 8.46.0 (#387)
dependabot[bot] Jul 31, 2023
f76844b
Bump eslint-config-prettier from 8.8.0 to 8.9.0 (#385)
dependabot[bot] Jul 31, 2023
a8e6059
Bump eslint-plugin-vue from 9.15.1 to 9.16.1 (#386)
dependabot[bot] Jul 31, 2023
71fd77b
Bump sass from 1.64.0 to 1.64.1 (#384)
dependabot[bot] Jul 31, 2023
6f540d4
Bump prettier from 3.0.0 to 3.0.1 (#390)
dependabot[bot] Aug 3, 2023
5015220
Bump eslint-config-prettier from 8.9.0 to 8.10.0 (#391)
dependabot[bot] Aug 3, 2023
c54d093
Bump sass from 1.64.1 to 1.64.2 (#388)
dependabot[bot] Aug 3, 2023
c1cf803
Bump cypress from 12.17.2 to 12.17.3 (#389)
dependabot[bot] Aug 3, 2023
94e06cf
Bump eslint-config-prettier from 8.10.0 to 9.0.0 (#392)
dependabot[bot] Aug 7, 2023
db9db09
Bump eslint-plugin-vue from 9.16.1 to 9.17.0 (#393)
dependabot[bot] Aug 9, 2023
1f6bf95
Bump sass from 1.64.2 to 1.65.1 (#394)
dependabot[bot] Aug 10, 2023
44f2ee6
Bump prettier-plugin-tailwindcss from 0.4.1 to 0.5.0 (#395)
dependabot[bot] Aug 10, 2023
b5b6400
Bump prettier-plugin-tailwindcss from 0.5.0 to 0.5.2 (#396)
dependabot[bot] Aug 11, 2023
efddf3b
Bump autoprefixer from 10.4.14 to 10.4.15 (#397)
dependabot[bot] Aug 14, 2023
b838b2f
Bump lint-staged from 13.2.3 to 14.0.0 (#398)
dependabot[bot] Aug 14, 2023
a23eac5
Bump eslint from 8.46.0 to 8.47.0 (#399)
dependabot[bot] Aug 14, 2023
d3f7176
Bump prettier-plugin-tailwindcss from 0.5.2 to 0.5.3 (#400)
dependabot[bot] Aug 15, 2023
91bc58e
Bump cypress from 12.17.3 to 12.17.4 (#401)
dependabot[bot] Aug 16, 2023
4b0803e
Bump postcss from 8.4.27 to 8.4.28 (#402)
dependabot[bot] Aug 16, 2023
8983115
Bump prettier from 3.0.1 to 3.0.2 (#403)
dependabot[bot] Aug 16, 2023
e283088
Bump fastify/github-action-merge-dependabot from 3.8.0 to 3.9.1 (#405)
dependabot[bot] Aug 21, 2023
2f3d12d
Bump lint-staged from 14.0.0 to 14.0.1 (#406)
dependabot[bot] Aug 21, 2023
295d827
Bump sass from 1.65.1 to 1.66.1 (#407)
dependabot[bot] Aug 21, 2023
32fe40a
Bump cypress-io/github-action from 5 to 6 (#408)
dependabot[bot] Aug 22, 2023
60a1f6c
Bump serve from 14.2.0 to 14.2.1 (#409)
dependabot[bot] Aug 22, 2023
3572410
Bump csv-stringify from 6.4.0 to 6.4.1 (#410)
dependabot[bot] Aug 24, 2023
f4847d2
Bump csv-stringify from 6.4.1 to 6.4.2 (#411)
dependabot[bot] Aug 25, 2023
51bef84
Bump eslint from 8.47.0 to 8.48.0 (#412)
dependabot[bot] Aug 28, 2023
1a4b182
Bump prettier from 3.0.2 to 3.0.3 (#413)
dependabot[bot] Aug 29, 2023
42f8732
Bump cypress from 12.17.4 to 13.0.0 (#415)
dependabot[bot] Aug 30, 2023
5a3445c
Bump postcss from 8.4.28 to 8.4.29 (#414)
dependabot[bot] Aug 30, 2023
a0f27ec
Bump prettier-plugin-tailwindcss from 0.5.3 to 0.5.4 (#417)
dependabot[bot] Aug 31, 2023
e3120d3
Bump cypress from 13.0.0 to 13.1.0 (#418)
dependabot[bot] Sep 1, 2023
c04898c
Bump actions/checkout from 3 to 4 (#419)
dependabot[bot] Sep 4, 2023
d357da7
Organisation page - look at new last_solrize_end field and show "Old …
jarofgreen Aug 31, 2023
63ad9b8
Merge pull request #416 from IATI/2023-08-31
Sep 6, 2023
20df4e4
Bump eslint from 8.48.0 to 8.49.0 (#420)
dependabot[bot] Sep 11, 2023
d98ddcf
Bump uuid from 9.0.0 to 9.0.1 (#421)
dependabot[bot] Sep 12, 2023
62747d4
Bump cypress from 13.1.0 to 13.2.0 (#422)
dependabot[bot] Sep 13, 2023
1e4c6f3
Bump sass from 1.66.1 to 1.67.0 (#423)
dependabot[bot] Sep 14, 2023
333a9df
Bump postcss from 8.4.29 to 8.4.30 (#424)
dependabot[bot] Sep 19, 2023
2ae340c
Bump autoprefixer from 10.4.15 to 10.4.16 (#425)
dependabot[bot] Sep 21, 2023
5b8d58a
Bump sass from 1.67.0 to 1.68.0 (#426)
dependabot[bot] Sep 21, 2023
54f4ed2
Bump vue-router from 4.2.4 to 4.2.5 (#427)
dependabot[bot] Sep 22, 2023
aae0bbf
Bump eslint from 8.49.0 to 8.50.0 (#428)
dependabot[bot] Sep 25, 2023
7585efe
Bump cypress from 13.2.0 to 13.3.0 (#429)
dependabot[bot] Sep 28, 2023
7dce2fd
Bump postcss from 8.4.30 to 8.4.31 (#430)
dependabot[bot] Sep 29, 2023
ee9ee76
Bump prettier-plugin-tailwindcss from 0.5.4 to 0.5.5 (#431)
dependabot[bot] Oct 4, 2023
53b0657
Bump csv-stringify from 6.4.2 to 6.4.3 (#432)
dependabot[bot] Oct 5, 2023
9625724
Bump sass from 1.68.0 to 1.69.0 (#433)
dependabot[bot] Oct 6, 2023
20e78d8
Bump csv-stringify from 6.4.3 to 6.4.4 (#434)
dependabot[bot] Oct 9, 2023
30d2e0a
Merge pull request #437 from IATI/main
Oct 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/develop_CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
if: ${{ needs.should_run.outputs.should_run == 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
Expand Down Expand Up @@ -60,10 +60,10 @@ jobs:
needs: deploy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cypress CI Run
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
wait-on: 'https://dev-validator.iatistandard.org'
config-file: cypress.config.dev.js
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/develop_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
name: 'Build and CI'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cypress CI Run
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
build: npm run build:development
start: npm run serve
Expand All @@ -34,6 +34,6 @@ jobs:
pull-requests: write
contents: write
steps:
- uses: fastify/github-action-merge-dependabot@v3.8.0
- uses: fastify/github-action-merge-dependabot@v3.9.1
with:
github-token: ${{secrets.GITHUB_TOKEN}}
6 changes: 3 additions & 3 deletions .github/workflows/main_CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/[email protected]
Expand Down Expand Up @@ -43,10 +43,10 @@ jobs:
needs: deploy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cypress CI Run
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
wait-on: 'https://validator.iatistandard.org'
config-file: cypress.config.prod.js
4 changes: 2 additions & 2 deletions .github/workflows/main_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
name: "Build and CI"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cypress CI Run
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
build: npm run build:production
start: npm run serve
Expand Down
Loading