Merge branch 'main' into 'production' (cb954535) · Commits · MCC APSIS / NACSOS / NACSOS Core · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

N

NACSOS Core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

cb954535

Commit cb954535 authored 7 months ago by Tim Repke

Downloads
- Plain Diff

Merge branch 'main' into 'production'

Main

See merge request !104

parents d347399e 05d1c00d

No related branches found

No related tags found

1 merge request!104Main

Pipeline #3780 passed 7 months ago

Stage: build

Stage: test

Stage: deploy

Changes 12
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 1 deletion

.gitignore
README.md 13 additions, 0 deletions

README.md
requirements.txt 1 addition, 1 deletion

requirements.txt
server/api/routes/annotations.py 7 additions, 5 deletions

server/api/routes/annotations.py
server/api/routes/evaluation.py 2 additions, 1 deletion

server/api/routes/evaluation.py
server/api/routes/imports.py 2 additions, 2 deletions

server/api/routes/imports.py
server/api/routes/mailing.py 53 additions, 4 deletions

server/api/routes/mailing.py
server/api/routes/ping.py 13 additions, 0 deletions

server/api/routes/ping.py
server/api/routes/project/__init__.py 1 addition, 1 deletion

server/api/routes/project/__init__.py
server/api/routes/search.py 3 additions, 3 deletions

server/api/routes/search.py
server/pipelines/actor.py 1 addition, 1 deletion

server/pipelines/actor.py
server/util/email.py 18 additions, 9 deletions

server/util/email.py

with 116 additions and 28 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