Merge branch 'master' into permission-vertical

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/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java
	java/com.sap.sailing.server.gateway/webservices/api/v1/index.html
	java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/Activator.java
	java/com.sap.sse.security/META-INF/MANIFEST.MF
This commit is contained in:
Steffen Schäfer
2018-10-23 13:10:46 +02:00
115 changed files with 8843 additions and 135 deletions
@@ -86,6 +86,7 @@ public class URLFieldWithFileUpload extends Composite implements HasValue<String
});
removePanel.add(removeButton);
urlTextBox = new TextBox();
urlTextBox.getElement().addClassName("url-textbox");
urlTextBox.setWidth("400px");
imageUrlPanel.add(urlTextBox);
imageUrlPanel.add(removePanel);