Axel Uhl d8186a9985 Merge branch 'design2015' into bug2589 ...

Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java

Change-Id: I9daa6eff11d272940f087d3704a6f34ae527bb5e

2016-03-02 18:52:22 +01:00

..

.settings

use parseStrict instead of parseLenient in URLFieldWithFileUpload; fixed <pre> wrapping by setting content type to text/html instead of application/json

2016-01-08 11:23:32 +01:00

META-INF

fix for bug 3446: entity identity comparator for device configurations now compares the list of device names

2016-01-30 12:33:27 +01:00

src/com/sap/sailing/domain

Merge branch 'design2015' into bug2589

2016-03-02 18:52:22 +01:00

.classpath

…

.gitignore

…

.project

…

AndroidManifest.xml

Consistently using targetSdkVersion 22 in all AndroidManifest.xml files

2015-11-11 13:34:21 +01:00

build.gradle

datamining.shared was replaced by datamining.annotations for android

2015-09-17 17:22:40 +02:00

build.properties

…

pom.xml

Merge branch 'master' into android-maven-build-bug3190

2015-11-30 15:02:06 +01:00