From 4ce766853c83396c5ae0a8a0c11828fedc27688c Mon Sep 17 00:00:00 2001 From: guillaume Date: Fri, 15 Feb 2019 17:06:05 +0100 Subject: [PATCH 1/4] Fix authentication dropdown --- client/components/main/layouts.jade | 2 +- client/components/settings/connectionMethod.jade | 7 +++++-- client/components/settings/connectionMethod.js | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index a6115ec12..f2c40b9f4 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -24,7 +24,7 @@ template(name="userFormsLayout") section.auth-dialog +Template.dynamic(template=content) if currentSetting.displayAuthenticationMethod - +connectionMethod + +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod) div.at-form-lang select.select-lang.js-userform-set-language each languages diff --git a/client/components/settings/connectionMethod.jade b/client/components/settings/connectionMethod.jade index ac4c8c642..d191929f8 100644 --- a/client/components/settings/connectionMethod.jade +++ b/client/components/settings/connectionMethod.jade @@ -2,5 +2,8 @@ template(name='connectionMethod') div.at-form-authentication label {{_ 'authentication-method'}} select.select-authentication - each authentications - option(value="{{value}}") {{_ value}} + each authentications + if isSelected value + option(value="{{value}}" selected) {{_ value}} + else + option(value="{{value}}") {{_ value}} \ No newline at end of file diff --git a/client/components/settings/connectionMethod.js b/client/components/settings/connectionMethod.js index 9fe8f382d..db9da25f8 100644 --- a/client/components/settings/connectionMethod.js +++ b/client/components/settings/connectionMethod.js @@ -31,4 +31,7 @@ Template.connectionMethod.helpers({ authentications() { return Template.instance().authenticationMethods.get(); }, + isSelected(match) { + return Template.instance().data.authenticationMethod === match; + }, }); From 03d06685b0310439815ec2e2cd2bc64a5765b93d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 15 Feb 2019 18:45:41 +0200 Subject: [PATCH 2/4] - [Fix authentication dropdown](https://github.com/wekan/wekan/pull/2191). Thanks to Akuket. --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d77f13ee2..575e9422c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Upcoming Wekan relase + +This release fixes the following bugs: + +- [Fix authentication dropdown](https://github.com/wekan/wekan/pull/2191). + Thanks to Akuket. + +Thanks to above GitHub users for their contributions, and translators for their translations. + # v2.22 2019-02-13 Wekan release This release adds the following new features: From 96519296e12de55319f121694df919a4a013c19d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 15 Feb 2019 18:47:21 +0200 Subject: [PATCH 3/4] Update translations (sv). --- i18n/sv.i18n.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index c93862bb7..a2c0c23e9 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -78,7 +78,7 @@ "and-n-other-card": "Och __count__ annat kort", "and-n-other-card_plural": "Och __count__ andra kort", "apply": "Tillämpa", - "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.", + "app-is-offline": "Läser in, vänligen vänta. Uppdatering av sidan kommer att orsaka förlust av data. Om inläsningen inte fungerar, kontrollera att servern inte har stoppats.", "archive": "Flytta till Arkiv", "archive-all": "Flytta alla till Arkiv", "archive-board": "Flytta Anslagstavla till Arkiv", @@ -86,11 +86,11 @@ "archive-list": "Flytta Lista till Arkiv", "archive-swimlane": "Move Swimlane to Archive", "archive-selection": "Flytta markerade till Arkiv", - "archiveBoardPopup-title": "Move Board to Archive?", + "archiveBoardPopup-title": "Flytta Anslagstavla till Arkiv?", "archived-items": "Arkiv", - "archived-boards": "Boards in Archive", + "archived-boards": "Anslagstavlor i Arkiv", "restore-board": "Återställ anslagstavla", - "no-archived-boards": "No Boards in Archive.", + "no-archived-boards": "Inga anslagstavlor i Arkiv.", "archives": "Arkiv", "assign-member": "Tilldela medlem", "attached": "bifogad", @@ -123,7 +123,7 @@ "card-comments-title": "Detta kort har %s kommentar.", "card-delete-notice": "Ta bort är permanent. Du kommer att förlora alla åtgärder i samband med detta kort.", "card-delete-pop": "Alla åtgärder kommer att tas bort från aktivitetsflöde och du kommer inte att kunna öppna kortet igen. Det går inte att ångra.", - "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.", + "card-delete-suggest-archive": "Du kan flytta ett kort för att Arkiv för att ta bort det från anslagstavlan och bevara aktiviteten.", "card-due": "Förfaller", "card-due-on": "Förfaller på", "card-spent": "Spenderad tid", @@ -166,7 +166,7 @@ "clipboard": "Urklipp eller dra och släpp", "close": "Stäng", "close-board": "Stäng anslagstavla", - "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.", + "close-board-pop": "Du kommer att kunna återställa anslagstavlan genom att klicka på knappen \"Arkiv\" från hemrubriken.", "color-black": "svart", "color-blue": "blå", "color-crimson": "crimson", @@ -299,17 +299,17 @@ "import-board": "importera anslagstavla", "import-board-c": "Importera anslagstavla", "import-board-title-trello": "Importera anslagstavla från Trello", - "import-board-title-wekan": "Import board from previous export", + "import-board-title-wekan": "Importera anslagstavla från tidigare export", "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.", "import-sandstorm-warning": "Importerad anslagstavla raderar all befintlig data på anslagstavla och ersätter den med importerat anslagstavla.", "from-trello": "Från Trello", "from-wekan": "Från tidigare export", "import-board-instruction-trello": "I din Trello-anslagstavla, gå till 'Meny', sedan 'Mera', 'Skriv ut och exportera', 'Exportera JSON' och kopiera den resulterande text.", - "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.", + "import-board-instruction-wekan": "På din anslagstavla, gå till \"Meny\", sedan \"Exportera anslagstavla\" och kopiera texten i den hämtade filen.", "import-board-instruction-about-errors": "Om du får fel vid import av anslagstavla, ibland importerar fortfarande fungerar, och styrelsen är på alla sidor för anslagstavlor.", "import-json-placeholder": "Klistra in giltigt JSON data här", "import-map-members": "Kartlägg medlemmar", - "import-members-map": "Your imported board has some members. Please map the members you want to import to your users", + "import-members-map": "Din importerade anslagstavla har några medlemmar. Vänligen kartlägg medlemmarna du vill importera till dina användare", "import-show-user-mapping": "Granska medlemskartläggning", "import-user-select": "Pick your existing user you want to use as this member", "importMapMembersAddPopup-title": "Välj medlem", @@ -332,10 +332,10 @@ "leaveBoardPopup-title": "Lämna anslagstavla ?", "link-card": "Länka till detta kort", "list-archive-cards": "Flytta alla kort i den här listan till Arkiv", - "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.", + "list-archive-cards-pop": "Detta kommer att ta bort alla kort i denna lista från anslagstavlan. För att visa kort i Arkiv och få dem tillbaka till anslagstavlan, klicka på \"Meny\" > \"Arkiv\".", "list-move-cards": "Flytta alla kort i denna lista", "list-select-cards": "Välj alla kort i denna lista", - "set-color-list": "Set Color", + "set-color-list": "Ange färg", "listActionPopup-title": "Liståtgärder", "swimlaneActionPopup-title": "Simbana-åtgärder", "swimlaneAddPopup-title": "Add a Swimlane below", @@ -343,7 +343,7 @@ "listMorePopup-title": "Mera", "link-list": "Länk till den här listan", "list-delete-pop": "Alla åtgärder kommer att tas bort från aktivitetsmatningen och du kommer inte att kunna återställa listan. Det går inte att ångra.", - "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.", + "list-delete-suggest-archive": "Du kan flytta en lista till Arkiv för att ta bort den från anslagstavlan och bevara aktiviteten.", "lists": "Listor", "swimlanes": "Simbanor ", "log-out": "Logga ut", @@ -568,7 +568,7 @@ "r-removed-from": "Borttagen från", "r-the-board": "anslagstavlan", "r-list": "lista", - "set-filter": "Set Filter", + "set-filter": "Ställ in filter", "r-moved-to": "Flyttad till", "r-moved-from": "Flyttad från", "r-archived": "Flyttad till Arkiv", @@ -576,13 +576,13 @@ "r-a-card": "ett kort", "r-when-a-label-is": "När en etikett är", "r-when-the-label-is": "När etiketten är", - "r-list-name": "list name", + "r-list-name": "listnamn", "r-when-a-member": "När en medlem är", "r-when-the-member": "När medlemmen", "r-name": "namn", - "r-when-a-attach": "When an attachment", - "r-when-a-checklist": "When a checklist is", - "r-when-the-checklist": "When the checklist", + "r-when-a-attach": "När en bilaga", + "r-when-a-checklist": "När en checklista är", + "r-when-the-checklist": "När checklistan", "r-completed": "Avslutad", "r-made-incomplete": "Made incomplete", "r-when-a-item": "When a checklist item is", @@ -660,6 +660,6 @@ "add-custom-html-before-body-end": "Add Custom HTML before end", "error-undefined": "Något gick fel", "error-ldap-login": "Ett fel uppstod när du försökte logga in", - "display-authentication-method": "Display Authentication Method", - "default-authentication-method": "Default Authentication Method" + "display-authentication-method": "Visa autentiseringsmetod", + "default-authentication-method": "Standard autentiseringsmetod" } \ No newline at end of file From 4bf0914f1e5943fd10c5318db34e755ce895c4bb Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 17 Feb 2019 18:13:54 +0200 Subject: [PATCH 4/4] v2.23 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 575e9422c..fe11f8da9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan relase +# v2.23 2019-02-17 Wekan relase This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index 7a6c5396f..5b12c2d86 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.22.0" +appVersion: "v2.23.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 02e5ae016..e76015a32 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.22.0", + "version": "v2.23.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 5b0d993d3..79efc536a 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 = 224, + appVersion = 225, # Increment this for every release. - appMarketingVersion = (defaultText = "2.22.0~2019-02-13"), + appMarketingVersion = (defaultText = "2.23.0~2019-02-17"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,