Axel Uhl 3917060c1a Merge branch 'master' into android-maven-build-bug3190 ...

Conflicts:
	java/pom.xml

Change-Id: I8707442d05979fcd8e0a8be0b593ee3e94a513d3

2016-01-12 12:47:30 +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

.tmp/gwt-work

Using local works directories for SDM to reduce amout of temp files

2015-07-14 17:16:48 +02:00

META-INF

…

src/main

providing update feature for additional User properties in SecurityService and UserManagementService

2016-01-12 09:28:23 +01:00

WEB-INF

removed redundant default Jetty servlet registration in security.ui bundle

2016-01-07 10:08:28 +01:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

EditProfile.html

…

EmailValidation.html

…

Login.css

…

Login.html

…

OAuthLogin.html

…

pom.xml

Using ${project.version} for intra-project dependencies (source deps in

2015-11-24 15:28:50 +01:00

Register.html

…

Security UI sdm.launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

UserManagement.css

…

UserManagement.html

…