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

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.ui.xml
	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/client/StringMessages_ru.properties

2015-04-21 22:23:29 +02:00

..

.settings

upgraded project settings to Java8, fixed gwt.ui to JavaSE-1.7 explicitly

2014-10-01 15:00:44 +02:00

META-INF

Merge branch 'master' into bug2652

2015-03-13 22:27:27 +01:00

resources

moved SailingPermissionsForRoleProvider to com.sap.sailing.domain.common so that gateway and gwt.ui can both use them in their shiro.ini

2015-02-26 16:23:10 +01:00

src/com/sap/sailing/server/gateway

added flagImage attribute of competitor to rest api

2015-04-17 15:47:51 +02:00

utils

…

WEB-INF

implement file upload using a plain servlet with Apache multipart suppot, skipping confusing Jersey with FormDataParams that don't work

2015-02-27 18:19:13 +01:00

webservices

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

2015-03-27 14:39:21 +02:00

.classpath

prepared the com.sap.sailing.server.gateway bundle for REST security, showing a commented example in shiro.ini for the /events service end point

2015-02-25 18:26:27 +01:00

.gitignore

…

.project

…

build.properties

prepared the com.sap.sailing.server.gateway bundle for REST security, showing a commented example in shiro.ini for the /events service end point

2015-02-25 18:26:27 +01:00

main.css

…

pom.xml

…