Steffen Schaefer 793c2c0341 Merge branch 'master' into bug2775 ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java

2016-07-11 11:18:46 +02:00

..

.settings

Using UTF-8 encoding for all GWT translation files because GWT compiler

2016-04-28 08:20:27 +02:00

.tmp/gwt-work

…

META-INF

Moved UserDetails desktop/mobile partials to com.sap.sse.security.ui

2016-02-29 14:46:46 +01:00

src/main

Added missing GWT module inherits because UserService was extended to

2016-07-06 09:21:43 +02:00

WEB-INF

…

.classpath

…

.gitignore

…

.project

…

build.properties

…

EditProfile.html

…

EmailValidation.html

…

Login.css

…

Login.html

…

OAuthLogin.html

…

pom.xml

…

Register.html

…

Security UI sdm.launch

fix for bug 3774: deadlock trying to close device mapping interval from the UI

2016-07-08 15:44:19 +02:00

UserManagement.css

…

UserManagement.html

…