Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'ppoulard-devel' into devel

Browse source
This commit is contained in:
Lauri Ojansivu 2018-07-05 23:27:07 +03:00
commit eb6373a879
51 changed files with 71 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.meteor/packages
View file

@ -85,3 +85,4 @@ browser-policy
eluck:accounts-lockout
rzymek:fullcalendar
momentjs:moment@2.22.2
atoy40:accounts-cas

1
.meteor/versions
View file

@ -9,6 +9,7 @@ aldeed:simple-schema@1.5.3
alethes:pages@1.8.6
allow-deny@1.1.0
arillo:flow-router-helpers@0.5.2
atoy40:accounts-cas@0.0.2
audit-argument-checks@1.0.7
autoupdate@1.3.12
babel-compiler@6.24.7

5
CHANGELOG.md
View file

@ -3,7 +3,8 @@
This release adds the following new features:
- [Nested tasks](https://github.com/wekan/wekan/pull/1723);
- [Calendar improvements](https://github.com/wekan/wekan/pull/1752).
- [Calendar improvements](https://github.com/wekan/wekan/pull/1752);
- [SSO CAS](https://github.com/wekan/wekan/pull/1742).
and fixes the following bugs:
@ -14,7 +15,7 @@ and fixes the following bugs:
no-unused-vars](https://github.com/wekan/wekan/commit/dd324aa581bed7ea31f20968c6b596f373e7054f);
- Fix [Minimize board sidebar actually just moves it over](https://github.com/wekan/wekan/issues/1589).
Thanks to GitHub users dagomar, pravdomil, TNick and xet7 for their contributions.
Thanks to GitHub users dagomar, ppoulard, pravdomil, TNick and xet7 for their contributions.
# v1.11 2018-06-30 Wekan release

3
client/components/main/layouts.jade
View file

@ -17,6 +17,9 @@ template(name="userFormsLayout")
img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
section.auth-dialog
+Template.dynamic(template=content)
if isCas
.at-form
button#cas(class='at-btn submit' type='submit') {{casSignInLabel}}
div.at-form-lang
select.select-lang.js-userform-set-language
each languages

17
client/components/main/layouts.js
View file

@ -39,6 +39,16 @@ Template.userFormsLayout.helpers({
const curLang = T9n.getLanguage() || 'en';
return t9nTag === curLang;
},
isCas() {
return Meteor.settings.public &&
Meteor.settings.public.cas &&
Meteor.settings.public.cas.loginUrl;
},
casSignInLabel() {
return TAPi18n.__('casSignIn', {}, T9n.getLanguage() || 'en');
},
});
Template.userFormsLayout.events({
@ -47,6 +57,13 @@ Template.userFormsLayout.events({
T9n.setLanguage(i18nTagToT9n(i18nTag));
evt.preventDefault();
},
'click button#cas'() {
Meteor.loginWithCas(function() {
if (FlowRouter.getRouteName() === 'atSignIn') {
FlowRouter.go('/');
}
});
},
});
Template.defaultLayout.events({

1
i18n/ar.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "المزيد",
"cards": "بطاقات",
"cards-count": "بطاقات",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "تعديل الصورة الشخصية",
"change-password": "تغيير كلمة المرور",

1
i18n/bg.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Още",
"cards": "Карти",
"cards-count": "Карти",
"casSignIn": "Sign In with CAS",
"change": "Промени",
"change-avatar": "Промени аватара",
"change-password": "Промени паролата",

1
i18n/br.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Muioc’h",
"cards": "Kartennoù",
"cards-count": "Kartennoù",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Kemmañ ger-tremen",

1
i18n/ca.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Més",
"cards": "Fitxes",
"cards-count": "Fitxes",
"casSignIn": "Sign In with CAS",
"change": "Canvia",
"change-avatar": "Canvia Avatar",
"change-password": "Canvia la clau",

1
i18n/cs.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Více",
"cards": "Karty",
"cards-count": "Karty",
"casSignIn": "Sign In with CAS",
"change": "Změnit",
"change-avatar": "Změnit avatar",
"change-password": "Změnit heslo",

1
i18n/de.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Mehr",
"cards": "Karten",
"cards-count": "Karten",
"casSignIn": "Sign In with CAS",
"change": "Ändern",
"change-avatar": "Profilbild ändern",
"change-password": "Passwort ändern",

1
i18n/el.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Περισσότερα",
"cards": "Κάρτες",
"cards-count": "Κάρτες",
"casSignIn": "Sign In with CAS",
"change": "Αλλαγή",
"change-avatar": "Change Avatar",
"change-password": "Αλλαγή Κωδικού",

1
i18n/en-GB.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/en.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn" : "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/eo.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Pli",
"cards": "Kartoj",
"cards-count": "Kartoj",
"casSignIn": "Sign In with CAS",
"change": "Ŝanĝi",
"change-avatar": "Change Avatar",
"change-password": "Ŝangi pasvorton",

1
i18n/es-AR.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Mas",
"cards": "Tarjetas",
"cards-count": "Tarjetas",
"casSignIn": "Sign In with CAS",
"change": "Cambiar",
"change-avatar": "Cambiar Avatar",
"change-password": "Cambiar Contraseña",

1
i18n/es.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Más",
"cards": "Tarjetas",
"cards-count": "Tarjetas",
"casSignIn": "Sign In with CAS",
"change": "Cambiar",
"change-avatar": "Cambiar el avatar",
"change-password": "Cambiar la contraseña",

1
i18n/eu.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Gehiago",
"cards": "Txartelak",
"cards-count": "Txartelak",
"casSignIn": "Sign In with CAS",
"change": "Aldatu",
"change-avatar": "Aldatu avatarra",
"change-password": "Aldatu pasahitza",

1
i18n/fa.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "بیشتر",
"cards": "کارت‌ها",
"cards-count": "کارت‌ها",
"casSignIn": "Sign In with CAS",
"change": "تغییر",
"change-avatar": "تغییر تصویر",
"change-password": "تغییر کلمه عبور",

1
i18n/fi.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Lisää",
"cards": "Kortit",
"cards-count": "korttia",
"casSignIn": "CAS kirjautuminen",
"change": "Muokkaa",
"change-avatar": "Muokkaa profiilikuvaa",
"change-password": "Vaihda salasana",

1
i18n/fr.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Plus",
"cards": "Cartes",
"cards-count": "Cartes",
"casSignIn": "Sign In with CAS",
"change": "Modifier",
"change-avatar": "Modifier l'avatar",
"change-password": "Modifier le mot de passe",

1
i18n/gl.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Máis",
"cards": "Tarxetas",
"cards-count": "Tarxetas",
"casSignIn": "Sign In with CAS",
"change": "Cambiar",
"change-avatar": "Cambiar o avatar",
"change-password": "Cambiar o contrasinal",

1
i18n/he.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "עוד",
"cards": "כרטיסים",
"cards-count": "כרטיסים",
"casSignIn": "Sign In with CAS",
"change": "שינוי",
"change-avatar": "החלפת תמונת משתמש",
"change-password": "החלפת ססמה",

1
i18n/hu.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Több",
"cards": "Kártyák",
"cards-count": "Kártyák",
"casSignIn": "Sign In with CAS",
"change": "Változtatás",
"change-avatar": "Avatár megváltoztatása",
"change-password": "Jelszó megváltoztatása",

1
i18n/hy.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/id.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Lainnya",
"cards": "Daftar Kartu",
"cards-count": "Daftar Kartu",
"casSignIn": "Sign In with CAS",
"change": "Ubah",
"change-avatar": "Ubah Avatar",
"change-password": "Ubah Kata Sandi",

1
i18n/ig.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Gbanwe",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/it.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Altro",
"cards": "Schede",
"cards-count": "Schede",
"casSignIn": "Sign In with CAS",
"change": "Cambia",
"change-avatar": "Cambia avatar",
"change-password": "Cambia password",

1
i18n/ja.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "さらに見る",
"cards": "カード",
"cards-count": "カード",
"casSignIn": "Sign In with CAS",
"change": "変更",
"change-avatar": "アバターの変更",
"change-password": "パスワードの変更",

1
i18n/ka.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/km.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/ko.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "더보기",
"cards": "카드",
"cards-count": "카드",
"casSignIn": "Sign In with CAS",
"change": "변경",
"change-avatar": "아바타 변경",
"change-password": "암호 변경",

1
i18n/lv.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/mn.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Аватар өөрчлөх",
"change-password": "Нууц үг солих",

1
i18n/nb.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Mer",
"cards": "Kort",
"cards-count": "Kort",
"casSignIn": "Sign In with CAS",
"change": "Endre",
"change-avatar": "Endre avatar",
"change-password": "Endre passord",

1
i18n/nl.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Meer",
"cards": "Kaarten",
"cards-count": "Kaarten",
"casSignIn": "Sign In with CAS",
"change": "Wijzig",
"change-avatar": "Wijzig avatar",
"change-password": "Wijzig wachtwoord",

1
i18n/pl.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Więcej",
"cards": "Karty",
"cards-count": "Karty",
"casSignIn": "Sign In with CAS",
"change": "Zmień",
"change-avatar": "Zmień Avatar",
"change-password": "Zmień hasło",

1
i18n/pt-BR.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Mais",
"cards": "Cartões",
"cards-count": "Cartões",
"casSignIn": "Sign In with CAS",
"change": "Alterar",
"change-avatar": "Alterar Avatar",
"change-password": "Alterar Senha",

1
i18n/pt.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Mais",
"cards": "Cartões",
"cards-count": "Cartões",
"casSignIn": "Sign In with CAS",
"change": "Alterar",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/ro.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/ru.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Поделиться",
"cards": "Карточки",
"cards-count": "Карточки",
"casSignIn": "Sign In with CAS",
"change": "Изменить",
"change-avatar": "Изменить аватар",
"change-password": "Изменить пароль",

1
i18n/sr.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/sv.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Mera",
"cards": "Kort",
"cards-count": "Kort",
"casSignIn": "Sign In with CAS",
"change": "Ändra",
"change-avatar": "Ändra avatar",
"change-password": "Ändra lösenord",

1
i18n/ta.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/th.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "เพิ่มเติม",
"cards": "การ์ด",
"cards-count": "การ์ด",
"casSignIn": "Sign In with CAS",
"change": "เปลี่ยน",
"change-avatar": "เปลี่ยนภาพ",
"change-password": "เปลี่ยนรหัสผ่าน",

1
i18n/tr.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "Daha",
"cards": "Kartlar",
"cards-count": "Kartlar",
"casSignIn": "Sign In with CAS",
"change": "Değiştir",
"change-avatar": "Avatar Değiştir",
"change-password": "Parola Değiştir",

1
i18n/uk.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/vi.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "More",
"cards": "Cards",
"cards-count": "Cards",
"casSignIn": "Sign In with CAS",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",

1
i18n/zh-CN.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "更多",
"cards": "卡片",
"cards-count": "卡片",
"casSignIn": "Sign In with CAS",
"change": "变更",
"change-avatar": "更改头像",
"change-password": "更改密码",

1
i18n/zh-TW.i18n.json
View file

@ -134,6 +134,7 @@
"cardMorePopup-title": "更多",
"cards": "卡片",
"cards-count": "卡片",
"casSignIn": "Sign In with CAS",
"change": "變更",
"change-avatar": "更改大頭貼",
"change-password": "更改密碼",

1
settings.json Normal file
View file

@ -0,0 +1 @@
{}