diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-11-20 02:46:35 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-11-20 02:46:35 +0200 |
commit | d93efd9e9bc3d5ace168b011a39f530b7cd098a0 (patch) | |
tree | a9686981f78df0a1ce1fb52ddf0be2d9fe4208b3 | |
parent | eab46523ee94cda348440e1c11ece209599b2e0f (diff) | |
parent | f84bad13b4427cbaf2e1333869270cada09383a4 (diff) | |
download | wekan-d93efd9e9bc3d5ace168b011a39f530b7cd098a0.tar.gz wekan-d93efd9e9bc3d5ace168b011a39f530b7cd098a0.tar.bz2 wekan-d93efd9e9bc3d5ace168b011a39f530b7cd098a0.zip |
Merge branch 'edge' into meteor-1.8
60 files changed, 165 insertions, 60 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 97531d75..55febdfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ -# Upcoming Wekan release +# v1.75 2018-11-20 Wekan release -This release fixes the following bugs: +This release adds the following new features: + +- Admin Panel / Layout: Hide Logo: Yes / No. This does hide Wekan logo on Login page and Board page. Thanks to xet7. + +and fixes the following bugs: - [Fix Snap database-list-backups command](https://github.com/wekan/wekan-snap/issues/26). Thanks to WaryWolf. diff --git a/client/components/main/header.jade b/client/components/main/header.jade index 2751c0cc..e21ce096 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -47,6 +47,7 @@ template(name="header") +Template.dynamic(template=headerBar) unless hideLogo + //- On sandstorm, the logo shouldn't be clickable, because we only have one page/document on it, and we don't want to see the home page containing @@ -55,8 +56,9 @@ template(name="header") .wekan-logo img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan") else - a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}") - img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan") + unless currentSetting.hideLogo + a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}") + img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan") if appIsOffline +offlineWarning diff --git a/client/components/main/header.js b/client/components/main/header.js index 7fbc5716..c05b1c3c 100644 --- a/client/components/main/header.js +++ b/client/components/main/header.js @@ -1,11 +1,16 @@ Meteor.subscribe('user-admin'); Meteor.subscribe('boards'); +Meteor.subscribe('setting'); Template.header.helpers({ wrappedHeader() { return !Session.get('currentBoard'); }, + currentSetting() { + return Settings.findOne(); + }, + hideLogo() { return Utils.isMiniScreen() && Session.get('currentBoard'); }, diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index 68876dc5..e434eaba 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -14,8 +14,13 @@ head template(name="userFormsLayout") section.auth-layout - h1.at-form-landing-logo - img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan") + unless currentSetting.hideLogo + h1.at-form-landing-logo + img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan") + if currentSetting.hideLogo + h1 + br + br section.auth-dialog +Template.dynamic(template=content) +connectionMethod diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 393f890b..d4a9d6d1 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -20,7 +20,13 @@ const validator = { }, }; +Template.userFormsLayout.onCreated(() => { + Meteor.subscribe('setting'); + +}); + Template.userFormsLayout.onRendered(() => { + AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator); const i18nTag = navigator.language; @@ -31,6 +37,11 @@ Template.userFormsLayout.onRendered(() => { }); Template.userFormsLayout.helpers({ + + currentSetting() { + return Settings.findOne(); + }, + languages() { return _.map(TAPi18n.getLanguages(), (lang, code) => { const tag = code; diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade index a05be1c6..bc6e0f50 100644 --- a/client/components/settings/settingBody.jade +++ b/client/components/settings/settingBody.jade @@ -135,9 +135,15 @@ template(name='announcementSettings') template(name='layoutSettings') ul#layout-setting.setting-detail li.layout-form + .title {{_ 'hide-logo'}} + .form-group.flex + input.form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}") + span {{_ 'yes'}} + input.form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}") + span {{_ 'no'}} + li.layout-form .title {{_ 'custom-product-name'}} .form-group input.form-control#product-name(type="text", placeholder="Wekan" value="{{currentSetting.productName}}") - li button.js-save-layout.primary {{_ 'save'}} diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js index 4ad65400..5bebc8d0 100644 --- a/client/components/settings/settingBody.js +++ b/client/components/settings/settingBody.js @@ -59,6 +59,9 @@ BlazeComponent.extendComponent({ toggleTLS() { $('#mail-server-tls').toggleClass('is-checked'); }, + toggleHideLogo() { + $('#hide-logo').toggleClass('is-checked'); + }, switchMenu(event) { const target = $(event.target); if (!target.hasClass('active')) { @@ -135,11 +138,15 @@ BlazeComponent.extendComponent({ this.setLoading(true); $('li').removeClass('has-error'); + const productName = $('#product-name').val().trim(); + const hideLogoChange = ($('input[name=hideLogo]:checked').val() === 'true'); + try { - const productName = $('#product-name').val().trim(); + Settings.update(Settings.findOne()._id, { $set: { productName, + hideLogo: hideLogoChange, }, }); } catch (e) { @@ -175,6 +182,7 @@ BlazeComponent.extendComponent({ 'click button.js-email-invite': this.inviteThroughEmail, 'click button.js-save': this.saveMailServerInfo, 'click button.js-send-smtp-test-email': this.sendSMTPTestEmail, + 'click a.js-toggle-hide-logo': this.toggleHideLogo, 'click button.js-save-layout': this.saveLayout, }]; }, diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 838be70d..96a33aa7 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index 32cc0c09..ad8ea80e 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index ed0e5fb2..af1ae61a 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index cd976bc2..5e1e4a3f 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index fbb3c1f0..30d3b230 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Metoda autentizace", "authentication-type": "Typ autentizace", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/da.i18n.json b/i18n/da.i18n.json index cd5eebdd..423c04c7 100644 --- a/i18n/da.i18n.json +++ b/i18n/da.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 48d5eeee..d26a46cc 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentifizierungsmethode", "authentication-type": "Authentifizierungstyp", "custom-product-name": "Benutzerdefinierter Produktname", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json index a2d952b0..a1f3bc2d 100644 --- a/i18n/el.i18n.json +++ b/i18n/el.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index 18bd4b39..85c02c4b 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 67e03cd0..9b1f2851 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -618,5 +618,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" } diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index 9bc1ad9f..8f182480 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json index dee4bc56..6a8a439f 100644 --- a/i18n/es-AR.i18n.json +++ b/i18n/es-AR.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 391ab3f5..4e07c15d 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index ae39a26a..fae5d5b2 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index dc19c579..ee479ed6 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "متد اعتبارسنجی", "authentication-type": "نوع اعتبارسنجی", "custom-product-name": "نام سفارشی محصول", - "layout": "لایه" + "layout": "لایه", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 2e98899c..3c2c16c6 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Kirjautumistapa", "authentication-type": "Kirjautumistyyppi", "custom-product-name": "Mukautettu tuotenimi", - "layout": "Ulkoasu" + "layout": "Ulkoasu", + "hide-logo": "Piilota Logo" }
\ No newline at end of file diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 30b075e0..1bcedb34 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Méthode d'authentification", "authentication-type": "Type d'authentification", "custom-product-name": "Nom personnalisé", - "layout": "Interface" + "layout": "Interface", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index 1ae1fea3..bbb127fd 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index 27870825..5353e564 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/hi.i18n.json b/i18n/hi.i18n.json index d57c3f0f..25094011 100644 --- a/i18n/hi.i18n.json +++ b/i18n/hi.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index bd59f47e..304cffc6 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json index 3e0585bb..7932b778 100644 --- a/i18n/hy.i18n.json +++ b/i18n/hy.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index 864ee8b9..ae89a932 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json index c05a48d8..1e483265 100644 --- a/i18n/ig.i18n.json +++ b/i18n/ig.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 6dc55773..6bc5f73f 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Metodo di Autenticazione", "authentication-type": "Tipo Autenticazione", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index 84dfff20..592f3881 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json index e019faf4..03165811 100644 --- a/i18n/ka.i18n.json +++ b/i18n/ka.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json index d424a871..0d8ddedf 100644 --- a/i18n/km.i18n.json +++ b/i18n/km.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index 999c65f7..b4344d8f 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json index ed8b521b..b8908ceb 100644 --- a/i18n/lv.i18n.json +++ b/i18n/lv.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json index fbfdde36..b67c2d97 100644 --- a/i18n/mn.i18n.json +++ b/i18n/mn.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index feaab44f..3e7f5c3b 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 62e310bc..a819b5f7 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 790f224d..8132a50d 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Sposób autoryzacji", "authentication-type": "Typ autoryzacji", "custom-product-name": "Niestandardowa nazwa produktu", - "layout": "Układ strony" + "layout": "Układ strony", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 77d836ee..95511472 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index df9d0bf9..163edf8b 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index 02eafde6..0b33bba4 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index c5cc1102..7b6d63fa 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index 669ba24f..b6df90e2 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 14302494..07e99fbe 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/sw.i18n.json b/i18n/sw.i18n.json index 18883da6..19c81ef0 100644 --- a/i18n/sw.i18n.json +++ b/i18n/sw.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index fa52d09b..5a947273 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index 55928a4a..63a778e4 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index 469c1d85..952aae32 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index cacf2c75..d97be115 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index f07b5eec..228c1e0e 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 1b7255b4..8da0b566 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "认证方式", "authentication-type": "认证类型", "custom-product-name": "自定义产品名称", - "layout": "布局" + "layout": "布局", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 494b145b..06828154 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -617,5 +617,6 @@ "authentication-method": "Authentication method", "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", - "layout": "Layout" + "layout": "Layout", + "hide-logo": "Hide Logo" }
\ No newline at end of file diff --git a/models/settings.js b/models/settings.js index c2a9bf01..52212809 100644 --- a/models/settings.js +++ b/models/settings.js @@ -32,6 +32,10 @@ Settings.attachSchema(new SimpleSchema({ type: String, optional: true, }, + hideLogo: { + type: Boolean, + optional: true, + }, createdAt: { type: Date, denyUpdate: true, diff --git a/package.json b/package.json index 158f55a0..380e0d65 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v1.74.1", + "version": "v1.75.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 470bf23a..63b22485 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 177, + appVersion = 178, # Increment this for every release. - appMarketingVersion = (defaultText = "1.74.1~2018-11-17"), + appMarketingVersion = (defaultText = "1.75.0~2018-11-20"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/server/migrations.js b/server/migrations.js index 5b9cc341..56d2858d 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -362,3 +362,15 @@ Migrations.add('add-product-name', () => { }, }, noValidateMulti); }); + +Migrations.add('add-hide-logo', () => { + Settings.update({ + hideLogo: { + $exists: false, + }, + }, { + $set: { + hideLogo: false, + }, + }, noValidateMulti); +}); diff --git a/server/publications/settings.js b/server/publications/settings.js index 72538124..d2690439 100644 --- a/server/publications/settings.js +++ b/server/publications/settings.js @@ -1,5 +1,5 @@ Meteor.publish('setting', () => { - return Settings.find({}, {fields:{disableRegistration: 1, productName: 1}}); + return Settings.find({}, {fields:{disableRegistration: 1, productName: 1, hideLogo: 1}}); }); Meteor.publish('mailServer', function () { |