Steffen Schaefer 0a7b43f8b3 Merge branch 'master' into bug3529 ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractResultsPresenterWithDataProviders.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/MultiResultsPresenter.java

2017-02-21 08:19:41 +01:00

..

.settings

switched com.sap.sse.security.ui to Java 1.8

2017-02-16 20:56:25 +01:00

.tmp/gwt-work

…

META-INF

Merge branch 'master' into bug3529

2017-02-21 08:19:41 +01:00

src/main

Renamed AbstractComponentContextWithSettingsStorage to

2017-02-15 11:00:58 +01:00

WEB-INF

removed redundant default Jetty servlet registration in security.ui bundle

2016-01-07 10:08:28 +01:00

.classpath

switched com.sap.sse.security.ui to Java 1.8

2017-02-16 20:56:25 +01:00

.gitignore

…

.project

…

build.properties

…

EditProfile.html

…

EmailValidation.html

…

Login.css

…

Login.html

…

OAuthLogin.html

…

pom.xml

Using ${project.version} for intra-project dependencies (source deps in

2015-11-24 15:28:50 +01:00

Register.html

…

Security UI sdm.launch

removed igtimi.client.redirecturi system property; use https://www.sapsailing.com/... for a default Igtimi redirect URI;

2017-01-11 14:30:06 +01:00

Security UI.launch

removed igtimi.client.redirecturi system property; use https://www.sapsailing.com/... for a default Igtimi redirect URI;

2017-01-11 14:30:06 +01:00

UserManagement.css

…

UserManagement.html

…