Merge branch '2.4' (a0654b33) · Commits · ARSnova / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ARSnova Backend
- Activity
- Members
- Labels
- Releases
- Environments
- Incidents

Snippets Groups Projects

a0654b33

There was a problem fetching the latest pipeline status.

Commit a0654b33 authored 8 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch '2.4'

parents c6436b3a 743aac18

No related merge requests found

Pipeline #3145 passed with stages

in 4 minutes and 57 seconds

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 44 additions, 0 deletions

CHANGELOG.md
pom.xml 4 additions, 4 deletions

pom.xml
src/main/java/de/thm/arsnova/config/ExtraConfig.java 10 additions, 0 deletions

src/main/java/de/thm/arsnova/config/ExtraConfig.java
src/main/java/de/thm/arsnova/controller/ConfigurationController.java 0 additions, 3 deletions

...va/de/thm/arsnova/controller/ConfigurationController.java
src/main/java/de/thm/arsnova/controller/LoginController.java 27 additions, 23 deletions

src/main/java/de/thm/arsnova/controller/LoginController.java
src/main/java/de/thm/arsnova/web/CorsFilter.java 41 additions, 25 deletions

src/main/java/de/thm/arsnova/web/CorsFilter.java
src/main/resources/arsnova.properties.example 11 additions, 0 deletions

src/main/resources/arsnova.properties.example
src/main/webapp/WEB-INF/web.xml 1 addition, 1 deletion

src/main/webapp/WEB-INF/web.xml
src/test/resources/arsnova.properties.example 20 additions, 2 deletions

src/test/resources/arsnova.properties.example

with 158 additions and 58 deletions

0% 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