Compare commits

..

No commits in common. "master" and "merge" have entirely different histories.

21 changed files with 1 additions and 22 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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