Commit 6204b59f authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

Merge branch 'v4.2-dev' into 'v4.x-master'

813: Fix issues related to deployment of upcoming v4-release (OPENED)

See merge request !29
parents f4a4ae44 789e0b76
Pipeline #26279 passed with stages
in 4 minutes and 18 seconds
......@@ -8,7 +8,7 @@ allprojects {
apply plugin: 'eclipse'
group = 'de.unibamberg.minf'
version = '4.3.2-SNAPSHOT'
version = '4.3.3-SNAPSHOT'
description = 'DARIAH-DE Data Modeling Environment'
......
......@@ -6,7 +6,7 @@ ext {
tilesVersion = "3.0.8"
jodaJspTagsVersion = "1.1.1"
coreVersion = "6.5.2-SNAPSHOT"
coreVersion = "6.5.3-SNAPSHOT"
gtfVersion = "2.3.3-SNAPSHOT"
processingVersion = "4.3.4-SNAPSHOT"
dariahSpVersion = "2.1.7-RELEASE"
......
......@@ -17,7 +17,7 @@ public class UserDaoImpl extends BaseDaoImpl<User> implements UserDao {
@Override
public User findByUsername(String domain, String username) {
Query q = new Query();
q.addCriteria(Criteria.where("username").is(username));
q.addCriteria(Criteria.where("username").regex("^" + username + "$", "i"));
q.addCriteria(Criteria.where("issuer").is(domain));
return this.findOne(q);
}
......
......@@ -8,7 +8,7 @@
<tiles:importAttribute name="collapsePanel" ignore="true" />
<header>
<nav class="navbar navbar-expand-xl bg-primary navbar-dark">
<nav class="navbar navbar-expand-xl bg-${_nuance} navbar-dark">
<div class="container-fluid" style="max-width: 1200px">
......
Subproject commit 576d22130e5ec4612227d3fef2cc21794cd4bf5f
Subproject commit 90cbed2c64e2e6993daf2abeb92a56cdda27f3f2
Subproject commit 576d22130e5ec4612227d3fef2cc21794cd4bf5f
Subproject commit 1feafba0d8b4405dee29615c569d88f97c6ad723
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment