Merge branch 'edge' into meteor-1.8

This commit is contained in:
Lauri Ojansivu 2019-03-23 21:35:55 +02:00
commit 4f4f3e4593
11 changed files with 18 additions and 9 deletions

View file

@ -7,10 +7,10 @@ head
where the application is deployed with a path prefix, but it seems to be
difficult to do that cleanly with Blaze -- at least without adding extra
packages.
link(rel="shortcut icon" href="/favicon.png")
link(rel="apple-touch-icon" href="/favicon.png")
link(rel="mask-icon" href="/logo-150.svg")
link(rel="manifest" href="/manifest.json")
link(rel="shortcut icon" href="/wekan-favicon.png")
link(rel="apple-touch-icon" href="/wekan-favicon.png")
link(rel="mask-icon" href="/wekan-logo-150.svg")
link(rel="manifest" href="/wekan-manifest.json")
template(name="userFormsLayout")
section.auth-layout
@ -20,7 +20,7 @@ template(name="userFormsLayout")
br
//else
// h1.at-form-landing-logo
// img(src="{{pathFor '/logo.png'}}" alt="")
// img(src="{{pathFor '/wekan-logo.png'}}" alt="")
section.auth-dialog
+Template.dynamic(template=content)
if currentSetting.displayAuthenticationMethod