Axel Uhl 86449abf2f Merge branch 'master' into ubilabs--buoy_positioning_app--develop ...

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BaseQRIdentifierWidget.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/DeviceConfigurationQRIdentifierDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeDTO.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeGenParamsDTO.java
	java/com.sap.sse.security.ui/Security UI sdm.launch

2015-04-13 13:34:55 +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 branch 'master' into bug489

2015-04-09 22:18:49 +02:00

WEB-INF

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

2015-02-13 11:16:50 +01:00

.classpath

Added role management and login panel

2014-05-27 17:04:45 +02:00

.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

Made LoginPanel working in all other modules and created Register page

2014-05-28 17:29:07 +02:00

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

Merge branch 'master' into ubilabs--buoy_positioning_app--develop

2015-04-13 13:34:55 +02:00

UserManagement.css

Some code improvement through refactoring

2014-06-11 16:40:41 +02:00

UserManagement.html

All host pages now use css files from /www

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