fmittag c85d4e57f6 Merge remote-tracking branch 'origin/master' into design2015 ...

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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties

2015-04-09 14:28:00 +02:00

..

.settings

Fixed GWT modules with invalid log handlers

2015-01-16 09:18:35 +01:00

META-INF

pull out mail functionality into own service and bundle

2015-02-09 21:03:50 +01:00

src/main

Merge remote-tracking branch 'origin/master' into design2015

2015-04-09 14:28:00 +02:00

WEB-INF

Enabled editing of war resources while backend is running in Eclipse

2015-02-04 10:56:12 +01:00

.classpath

…

.gitignore

…

.project

…

build.properties

All host pages now use css files from /www

2015-01-27 14:43:57 +01:00

EditProfile.html

All host pages now use css files from /www

2015-01-27 14:43:57 +01:00

EmailValidation.html

All host pages now use css files from /www

2015-01-27 14:43:57 +01:00

Login.css

…

Login.html

All host pages now use css files from /www

2015-01-27 14:43:57 +01:00

OAuthLogin.html

All host pages now use css files from /www

2015-01-27 14:43:57 +01:00

pom.xml

added filestorage bundle to feature.xml (probably resolving an ill-resolved merge conflict)

2015-02-10 13:50:45 +01:00

Register.html

All host pages now use css files from /www

2015-01-27 14:43:57 +01:00

Security UI sdm.launch

fixed merge issues such as references to the security infrastructure that changed

2015-03-26 15:01:40 +01:00

UserManagement.css

…

UserManagement.html

All host pages now use css files from /www

2015-01-27 14:43:57 +01:00