Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop (a707b410) · Commits · Dima Krasner / Sharkey · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Sharkey
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

a707b410

Verified Commit a707b410 authored 1 year ago by Mar0xy

Downloads
- Plain Diff

Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop

parents 126b3839 acfb2451

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.github/workflows/welcome.yml 1 addition, 1 deletion

.github/workflows/welcome.yml
locales/en-US.yml 9 additions, 0 deletions

locales/en-US.yml
locales/index.d.ts 1 addition, 0 deletions

locales/index.d.ts
locales/it-IT.yml 15 additions, 0 deletions

locales/it-IT.yml
locales/ja-JP.yml 2 additions, 1 deletion

locales/ja-JP.yml
packages/backend/src/core/QueueService.ts 4 additions, 4 deletions

packages/backend/src/core/QueueService.ts
packages/backend/src/queue/processors/ImportNotesProcessorService.ts 58 additions, 30 deletions

...ckend/src/queue/processors/ImportNotesProcessorService.ts
packages/backend/src/queue/types.ts 5 additions, 5 deletions

packages/backend/src/queue/types.ts
packages/frontend/src/pages/admin/branding.vue 1 addition, 1 deletion

packages/frontend/src/pages/admin/branding.vue
packages/frontend/src/pages/settings/reaction.vue 1 addition, 1 deletion

packages/frontend/src/pages/settings/reaction.vue

with 97 additions and 43 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment