Merge remote-tracking branch 'origin/dev_k8s' into dev_k8s
Showing
- app/components/Holiday.jsx 31 additions, 31 deletionsapp/components/Holiday.jsx
- app/components/grant-search/FunderMailer.jsx 2 additions, 2 deletionsapp/components/grant-search/FunderMailer.jsx
- app/components/grant-search/GrantSearch.jsx 38 additions, 4 deletionsapp/components/grant-search/GrantSearch.jsx
- app/components/grant-search/funderChecks.js 19 additions, 18 deletionsapp/components/grant-search/funderChecks.js
- app/components/login/Login.jsx 39 additions, 8 deletionsapp/components/login/Login.jsx
- app/components/login/LoginContainer.js 4 additions, 4 deletionsapp/components/login/LoginContainer.js
- app/components/login/mutations/index.js 0 additions, 18 deletionsapp/components/login/mutations/index.js
- app/components/manage-site/ConfigurationForm.jsx 8 additions, 4 deletionsapp/components/manage-site/ConfigurationForm.jsx
- app/components/operations.js 21 additions, 0 deletionsapp/components/operations.js
- app/components/signup/SignupContainer.js 3 additions, 3 deletionsapp/components/signup/SignupContainer.js
- app/components/submission-wizard/CreatePage.jsx 5 additions, 2 deletionsapp/components/submission-wizard/CreatePage.jsx
- app/components/submission-wizard/EditFundingAccess.jsx 5 additions, 4 deletionsapp/components/submission-wizard/EditFundingAccess.jsx
- config/default.js 0 additions, 12 deletionsconfig/default.js
- docker-compose.yml 1 addition, 1 deletiondocker-compose.yml
- package.json 2 additions, 2 deletionspackage.json
- scripts/run-cronjob.sh 12 additions, 0 deletionsscripts/run-cronjob.sh
- server/xpub-model/entities/annotation/data-access.js 6 additions, 6 deletionsserver/xpub-model/entities/annotation/data-access.js
- server/xpub-model/entities/audit/data-access.js 4 additions, 4 deletionsserver/xpub-model/entities/audit/data-access.js
- server/xpub-model/entities/config/data-access.js 1 addition, 1 deletionserver/xpub-model/entities/config/data-access.js
- server/xpub-model/entities/file/data-access.js 6 additions, 6 deletionsserver/xpub-model/entities/file/data-access.js
Please register or sign in to comment