Merge branch 'merge'

server/src/main/java/com/vpr/server/ServerApplication.java

@@ -1,4 +1,5 @@
- package com.vpr.server;
+//Marc Beyer//
+package com.vpr.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

server/src/main/java/com/vpr/server/controller/AuthController.java

@@ -1,3 +1,4 @@
+//Marco Kühn//
 package com.vpr.server.controller;
 
 import com.vpr.server.data.User;

server/src/main/java/com/vpr/server/controller/EventController.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.controller;
 
 import com.vpr.server.dao.interfaces.EventDAO;

server/src/main/java/com/vpr/server/controller/MainController.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.controller;
 
 import com.vpr.server.repository.EventRepository;

server/src/main/java/com/vpr/server/controller/UserController.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.controller;
 
 import com.vpr.server.dao.interfaces.UserDAO;

server/src/main/java/com/vpr/server/dao/implementation/EventDAOImplementation.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.dao.implementation;
 
 import com.vpr.server.dao.interfaces.EventDAO;

server/src/main/java/com/vpr/server/dao/implementation/UserDAOImplementation.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.dao.implementation;
 
 import com.vpr.server.dao.interfaces.UserDAO;

server/src/main/java/com/vpr/server/dao/interfaces/EventDAO.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.dao.interfaces;
 
 import com.vpr.server.data.Event;

server/src/main/java/com/vpr/server/dao/interfaces/UserDAO.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.dao.interfaces;
 
 import com.vpr.server.data.User;

server/src/main/java/com/vpr/server/data/DateEvent.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.data;
 
 import java.sql.Date;

server/src/main/java/com/vpr/server/data/Event.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.data;
 
 import javax.persistence.*;

server/src/main/java/com/vpr/server/data/User.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.data;
 
 import javax.persistence.*;

server/src/main/java/com/vpr/server/data/UserEvent.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.data;
 
 import javax.persistence.*;

server/src/main/java/com/vpr/server/data/UserEventId.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.data;
 
 import java.io.Serializable;

server/src/main/java/com/vpr/server/json/JSONMapper.java

@@ -1,3 +1,4 @@
+//Marco Kühn//
 package com.vpr.server.json;
 
 import com.vpr.server.data.Event;

server/src/main/java/com/vpr/server/json/Validator.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.json;
 
 import java.sql.Date;

server/src/main/java/com/vpr/server/repository/EventRepository.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.repository;
 
 import com.vpr.server.data.Event;

server/src/main/java/com/vpr/server/repository/UserEventRepository.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.repository;
 
 import com.vpr.server.data.UserEvent;

server/src/main/java/com/vpr/server/repository/UserRepository.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.repository;
 
 import com.vpr.server.data.User;

server/src/main/java/com/vpr/server/security/Hasher.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.security;
 
 import javax.crypto.SecretKeyFactory;

server/src/main/java/com/vpr/server/security/Token.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.security;
 
 import io.jsonwebtoken.JwtException;