diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-04-27 14:03:49 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-04-27 14:03:49 +0300 |
commit | be61904a1e67fcbedf03076d9c6495315193ff32 (patch) | |
tree | 12e166b7f3c9bdcf18a9502bde850fc98acd5839 | |
parent | b7247f8d521ccf77c05469ce9585956f386d5ad0 (diff) | |
parent | 170acf694875d1489f9d1df874dbb647cbb92e1a (diff) | |
download | wekan-be61904a1e67fcbedf03076d9c6495315193ff32.tar.gz wekan-be61904a1e67fcbedf03076d9c6495315193ff32.tar.bz2 wekan-be61904a1e67fcbedf03076d9c6495315193ff32.zip |
Merge branch 'devel'
-rw-r--r-- | CHANGELOG.md | 15 | ||||
-rw-r--r-- | client/components/cards/cardDetails.jade | 15 | ||||
-rw-r--r-- | i18n/es.i18n.json | 6 | ||||
-rw-r--r-- | i18n/hu.i18n.json | 38 | ||||
-rw-r--r-- | i18n/pl.i18n.json | 6 | ||||
-rw-r--r-- | i18n/sv.i18n.json | 36 | ||||
-rw-r--r-- | i18n/tr.i18n.json | 44 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
-rw-r--r-- | snapcraft.yaml | 9 |
10 files changed, 89 insertions, 86 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index abe5ed6e..fb53b18d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.87 2018-04-27 Wekan release + +This release fixes the following bugs: + +- [Sandstorm: Copy Card, Move Card and Copy Checklist Template to Many Cards - No longer works in + menu](https://github.com/wekan/wekan/commit/db80e738048e2729917c5e8fc18cf8ee44df7992); +- [Snap: Use override-build instead of old deprecated + prepare/build/install](https://github.com/wekan/wekan/commit/075ea1c43d827099e0030c750a4c156bd3340fed); +- [Removed not-used plugins part of Caddy download + URL](https://github.com/wekan/wekan/commit/7b91b341fe9c0cde42f91bf14d228820653c883d). + +Thanks to GitHub users kyrofa and xet7 for their contributions. + # v0.86 2018-04-20 Wekan release This release adds the following new features: @@ -5,7 +18,7 @@ This release adds the following new features: - Updated translations: German and Turkish; - Updated Caddy to newest version for Snap. -Thanks to translators and Caddy developers ! +Thanks to translators and Caddy developers. # v0.85 2018-04-18 Wekan release diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 3e73071a..047d7518 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -162,29 +162,20 @@ template(name="cardDetailsActionsPopup") li: a.js-more {{_ 'cardMorePopup-title'}} template(name="moveCardPopup") - if isSandstorm - +boardLists - else - +boardsAndLists + +boardsAndLists template(name="copyCardPopup") label(for='copy-card-title') {{_ 'title'}}: textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus) = title - if isSandstorm - +boardLists - else - +boardsAndLists + +boardsAndLists template(name="copyChecklistToManyCardsPopup") label(for='copy-checklist-cards-title') {{_ 'copyChecklistToManyCardsPopup-instructions'}}: textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus) | {{_ 'copyChecklistToManyCardsPopup-format'}} - if isSandstorm - +boardLists - else - +boardsAndLists + +boardsAndLists template(name="boardsAndLists") label {{_ 'boards'}}: diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index fcb2bbec..c1d9fa3c 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -97,7 +97,7 @@ "boardChangeWatchPopup-title": "Cambiar vigilancia", "boardMenuPopup-title": "Menú del tablero", "boards": "Tableros", - "board-view": "Vista de tablero", + "board-view": "Vista del tablero", "board-view-swimlanes": "Carriles", "board-view-lists": "Listas", "bucket-example": "Como “Cosas por hacer” por ejemplo", @@ -239,7 +239,7 @@ "from-trello": "Desde Trello", "from-wekan": "Desde Wekan", "import-board-instruction-trello": "En tu tablero de Trello, ve a 'Menú', luego 'Más' > 'Imprimir y exportar' > 'Exportar JSON', y copia el texto resultante.", - "import-board-instruction-wekan": "En tu tablero Wekan, ve a 'Menú', luego 'Exportar el tablero', y copia el texto del fichero descargado.", + "import-board-instruction-wekan": "En tu tablero de Wekan, ve a 'Menú del tablero', luego 'Exportar el tablero', y copia aquí el texto del fichero descargado.", "import-json-placeholder": "Pega tus datos JSON válidos aquí", "import-map-members": "Mapa de miembros", "import-members-map": "El tablero importado tiene algunos miembros. Por favor mapea los miembros que deseas importar a los usuarios de Wekan", @@ -364,7 +364,7 @@ "has-spenttime-cards": "Se ha excedido el tiempo de las tarjetas", "time": "Hora", "title": "Título", - "tracking": "Seguimiento", + "tracking": "Siguiendo", "tracking-info": "Serás notificado de cualquier cambio en las tarjetas en las que participas como creador o miembro.", "unassign-member": "Desvincular al miembro", "unsaved-description": "Tienes una descripción por añadir.", diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index adebb9e7..eeb7b24a 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -9,9 +9,9 @@ "act-createCard": "__card__ kártyát adott hozzá a listához: __list__", "act-createList": "__list__ listát adott hozzá a táblához: __board__", "act-addBoardMember": "__member__ tagot hozzáadta a táblához: __board__", - "act-archivedBoard": "__board__ moved to Recycle Bin", - "act-archivedCard": "__card__ moved to Recycle Bin", - "act-archivedList": "__list__ moved to Recycle Bin", + "act-archivedBoard": "A __board__ tábla a lomtárba került.", + "act-archivedCard": "A __card__ kártya a lomtárba került.", + "act-archivedList": "A __list__ lista a lomtárba került.", "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin", "act-importBoard": "importálta a táblát: __board__", "act-importCard": "importálta a kártyát: __card__", @@ -27,7 +27,7 @@ "activities": "Tevékenységek", "activity": "Tevékenység", "activity-added": "%s hozzáadva ehhez: %s", - "activity-archived": "%s moved to Recycle Bin", + "activity-archived": "%s lomtárba helyezve", "activity-attached": "%s mellékletet csatolt a kártyához: %s", "activity-created": "%s létrehozva", "activity-excluded": "%s kizárva innen: %s", @@ -64,19 +64,19 @@ "and-n-other-card_plural": "És __count__ egyéb kártya", "apply": "Alkalmaz", "app-is-offline": "A Wekan betöltés alatt van, kérem várjon. Az oldal újratöltése adatvesztést okoz. Ha a Wekan nem töltődik be, akkor ellenőrizze, hogy a Wekan kiszolgáló nem állt-e le.", - "archive": "Move to Recycle Bin", - "archive-all": "Move All to Recycle Bin", - "archive-board": "Move Board to Recycle Bin", - "archive-card": "Move Card to Recycle Bin", - "archive-list": "Move List to Recycle Bin", + "archive": "Lomtárba", + "archive-all": "Összes lomtárba helyezése", + "archive-board": "Tábla lomtárba helyezése", + "archive-card": "Kártya lomtárba helyezése", + "archive-list": "Lista lomtárba helyezése", "archive-swimlane": "Move Swimlane to Recycle Bin", - "archive-selection": "Move selection to Recycle Bin", - "archiveBoardPopup-title": "Move Board to Recycle Bin?", - "archived-items": "Recycle Bin", - "archived-boards": "Boards in Recycle Bin", + "archive-selection": "Kijelölés lomtárba helyezése", + "archiveBoardPopup-title": "Lomtárba helyezi a táblát?", + "archived-items": "Lomtár", + "archived-boards": "Lomtárban lévő táblák", "restore-board": "Tábla visszaállítása", - "no-archived-boards": "No Boards in Recycle Bin.", - "archives": "Recycle Bin", + "no-archived-boards": "Nincs tábla a lomtárban.", + "archives": "Lomtár", "assign-member": "Tag hozzárendelése", "attached": "csatolva", "attachment": "Melléklet", @@ -102,7 +102,7 @@ "board-view-lists": "Listák", "bucket-example": "Mint például „Bakancslista”", "cancel": "Mégse", - "card-archived": "This card is moved to Recycle Bin.", + "card-archived": "Ez a kártya a lomtárba került.", "card-comments-title": "Ez a kártya %s hozzászólást tartalmaz.", "card-delete-notice": "A törlés végleges. Az összes műveletet elveszíti, amely ehhez a kártyához tartozik.", "card-delete-pop": "Az összes művelet el lesz távolítva a tevékenységlistából, és nem lesz képes többé újra megnyitni a kártyát. Nincs visszaállítási lehetőség.", @@ -264,7 +264,7 @@ "leave-board-pop": "Biztosan el szeretné hagyni ezt a táblát: __boardTitle__? El lesz távolítva a táblán lévő összes kártyáról.", "leaveBoardPopup-title": "Elhagyja a táblát?", "link-card": "Összekapcsolás ezzel a kártyával", - "list-archive-cards": "Move all cards in this list to Recycle Bin", + "list-archive-cards": "Az összes kártya lomtárba helyezése ezen a listán.", "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.", "list-move-cards": "A listán lévő összes kártya áthelyezése", "list-select-cards": "A listán lévő összes kártya kiválasztása", @@ -294,8 +294,8 @@ "muted-info": "Soha sem lesz értesítve a táblán lévő semmilyen változásról.", "my-boards": "Saját tábláim", "name": "Név", - "no-archived-cards": "No cards in Recycle Bin.", - "no-archived-lists": "No lists in Recycle Bin.", + "no-archived-cards": "Nincs kártya a lomtárban.", + "no-archived-lists": "Nincs lista a lomtárban.", "no-archived-swimlanes": "No swimlanes in Recycle Bin.", "no-results": "Nincs találat", "normal": "Normál", diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 744837f1..d1a91b2d 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -1,7 +1,7 @@ { "accept": "Akceptuj", "act-activity-notify": "[Wekan] Powiadomienia - aktywności", - "act-addAttachment": "attached __attachment__ to __card__", + "act-addAttachment": "załączono __attachement__ do __karty__", "act-addChecklist": "dodano listę zadań __checklist__ to __card__", "act-addChecklistItem": "dodano __checklistItem__ do listy zadań __checklist__ na karcie __card__", "act-addComment": "commented on __card__: __comment__", @@ -27,7 +27,7 @@ "activities": "Aktywności", "activity": "Aktywność", "activity-added": "dodano %s z %s", - "activity-archived": "%s moved to Recycle Bin", + "activity-archived": "%s przeniesiono do Kosza", "activity-attached": "załączono %s z %s", "activity-created": "utworzono %s", "activity-excluded": "wyłączono %s z %s", @@ -64,7 +64,7 @@ "and-n-other-card_plural": "And __count__ other cards", "apply": "Zastosuj", "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.", - "archive": "Move to Recycle Bin", + "archive": "Przenieś do Kosza", "archive-all": "Move All to Recycle Bin", "archive-board": "Move Board to Recycle Bin", "archive-card": "Move Card to Recycle Bin", diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 15bff8c0..4ad85e22 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -9,10 +9,10 @@ "act-createCard": "lade till __card__ to __list__", "act-createList": "lade till __list__ to __board__", "act-addBoardMember": "lade till __member__ to __board__", - "act-archivedBoard": "__board__ moved to Recycle Bin", - "act-archivedCard": "__card__ moved to Recycle Bin", - "act-archivedList": "__list__ moved to Recycle Bin", - "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin", + "act-archivedBoard": "__board__ flyttad till papperskorgen", + "act-archivedCard": "__card__ flyttad till papperskorgen", + "act-archivedList": "__list__ flyttad till papperskorgen", + "act-archivedSwimlane": "__swimlane__ flyttad till papperskorgen", "act-importBoard": "importerade __board__", "act-importCard": "importerade __card__", "act-importList": "importerade __list__", @@ -27,7 +27,7 @@ "activities": "Aktiviteter", "activity": "Aktivitet", "activity-added": "Lade %s till %s", - "activity-archived": "%s moved to Recycle Bin", + "activity-archived": "%s flyttad till papperskorgen", "activity-attached": "bifogade %s to %s", "activity-created": "skapade %s", "activity-excluded": "exkluderade %s från %s", @@ -64,19 +64,19 @@ "and-n-other-card_plural": "Och __count__ andra kort", "apply": "Tillämpa", "app-is-offline": "Wekan laddar, vänta. Uppdatering av sidan kommer att leda till förlust av data. Om Wekan inte laddas, kontrollera att Wekan-servern inte har stoppats.", - "archive": "Move to Recycle Bin", - "archive-all": "Move All to Recycle Bin", + "archive": "Flytta till papperskorgen", + "archive-all": "Flytta alla till papperskorgen", "archive-board": "Move Board to Recycle Bin", "archive-card": "Move Card to Recycle Bin", "archive-list": "Move List to Recycle Bin", "archive-swimlane": "Move Swimlane to Recycle Bin", "archive-selection": "Move selection to Recycle Bin", "archiveBoardPopup-title": "Move Board to Recycle Bin?", - "archived-items": "Recycle Bin", + "archived-items": "Papperskorgen", "archived-boards": "Boards in Recycle Bin", "restore-board": "Återställ anslagstavla", "no-archived-boards": "No Boards in Recycle Bin.", - "archives": "Recycle Bin", + "archives": "Papperskorgen", "assign-member": "Tilldela medlem", "attached": "bifogad", "attachment": "Bilaga", @@ -102,7 +102,7 @@ "board-view-lists": "Listor", "bucket-example": "Gilla \"att-göra-innan-jag-dör-lista\" till exempel", "cancel": "Avbryt", - "card-archived": "This card is moved to Recycle Bin.", + "card-archived": "Detta kort flyttas till papperskorgen.", "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.", @@ -264,7 +264,7 @@ "leave-board-pop": "Är du säker på att du vill lämna __boardTitle__? Du kommer att tas bort från alla kort på den här anslagstavlan.", "leaveBoardPopup-title": "Lämna anslagstavla ?", "link-card": "Länka till detta kort", - "list-archive-cards": "Move all cards in this list to Recycle Bin", + "list-archive-cards": "Flytta alla kort i den här listan till papperskorgen", "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.", "list-move-cards": "Flytta alla kort i denna lista", "list-select-cards": "Välj alla kort i denna lista", @@ -294,8 +294,8 @@ "muted-info": "Du kommer aldrig att meddelas om eventuella ändringar i denna anslagstavla", "my-boards": "Mina anslagstavlor", "name": "Namn", - "no-archived-cards": "No cards in Recycle Bin.", - "no-archived-lists": "No lists in Recycle Bin.", + "no-archived-cards": "Inga kort i papperskorgen.", + "no-archived-lists": "Inga listor i papperskorgen.", "no-archived-swimlanes": "No swimlanes in Recycle Bin.", "no-results": "Inga reslutat", "normal": "Normal", @@ -333,7 +333,7 @@ "save": "Spara", "search": "Sök", "search-cards": "Search from card titles and descriptions on this board", - "search-example": "Text to search for?", + "search-example": "Text att söka efter?", "select-color": "Välj färg", "set-wip-limit-value": "Ange en gräns för det maximala antalet uppgifter i den här listan", "setWipLimitPopup-title": "Ställ in WIP-gräns", @@ -437,10 +437,10 @@ "createdAt": "Skapad vid", "verified": "Verifierad", "active": "Aktiv", - "card-received": "Received", + "card-received": "Mottagen", "card-received-on": "Received on", - "card-end": "End", + "card-end": "Slut", "card-end-on": "Ends on", - "editCardReceivedDatePopup-title": "Change received date", - "editCardEndDatePopup-title": "Change end date" + "editCardReceivedDatePopup-title": "Ändra mottagningsdatum", + "editCardEndDatePopup-title": "Ändra slutdatum" }
\ No newline at end of file diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index 69895701..2389e1c7 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -9,10 +9,10 @@ "act-createCard": "__card__ kartını ___list__ listesine ekledi", "act-createList": "__list__ listesini __board__ panosuna ekledi", "act-addBoardMember": "__member__ kullanıcısını __board__ panosuna ekledi", - "act-archivedBoard": "__board__ moved to Recycle Bin", - "act-archivedCard": "__card__ moved to Recycle Bin", - "act-archivedList": "__list__ moved to Recycle Bin", - "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin", + "act-archivedBoard": "__board__ Geri Dönüşüm Kutusu'na taşındı", + "act-archivedCard": "__card__ Geri Dönüşüm Kutusu'na taşındı", + "act-archivedList": "__list__ Geri Dönüşüm Kutusu'na taşındı", + "act-archivedSwimlane": "__swimlane__ Geri Dönüşüm Kutusu'na taşındı", "act-importBoard": "__board__ panosunu içe aktardı", "act-importCard": "__card__ kartını içe aktardı", "act-importList": "__list__ listesini içe aktardı", @@ -27,7 +27,7 @@ "activities": "Etkinlikler", "activity": "Etkinlik", "activity-added": "%s içine %s ekledi", - "activity-archived": "%s moved to Recycle Bin", + "activity-archived": "%s Geri Dönüşüm Kutusu'na taşındı", "activity-attached": "%s içine %s ekledi", "activity-created": "%s öğesini oluşturdu", "activity-excluded": "%s içinden %s çıkarttı", @@ -64,19 +64,19 @@ "and-n-other-card_plural": "Ve __count__ diğer kart", "apply": "Uygula", "app-is-offline": "Wekan yükleniyor, lütfen bekleyin. Sayfayı yenilemek veri kaybına sebep olabilir. Eğer Wekan yüklenmezse, lütfen Wekan sunucusunun çalıştığından emin olun.", - "archive": "Move to Recycle Bin", - "archive-all": "Move All to Recycle Bin", - "archive-board": "Move Board to Recycle Bin", - "archive-card": "Move Card to Recycle Bin", - "archive-list": "Move List to Recycle Bin", - "archive-swimlane": "Move Swimlane to Recycle Bin", - "archive-selection": "Move selection to Recycle Bin", - "archiveBoardPopup-title": "Move Board to Recycle Bin?", - "archived-items": "Recycle Bin", - "archived-boards": "Boards in Recycle Bin", + "archive": "Geri Dönüşüm Kutusu'na taşı", + "archive-all": "Tümünü Geri Dönüşüm Kutusu'na taşı", + "archive-board": "Panoyu Geri Dönüşüm Kutusu'na taşı", + "archive-card": "Kartı Geri Dönüşüm Kutusu'na taşı", + "archive-list": "Listeyi Geri Dönüşüm Kutusu'na taşı", + "archive-swimlane": "Kulvarı Geri Dönüşüm Kutusu'na taşı", + "archive-selection": "Seçimi Geri Dönüşüm Kutusu'na taşı", + "archiveBoardPopup-title": "Panoyu Geri Dönüşüm Kutusu'na taşı", + "archived-items": "Geri Dönüşüm Kutusu", + "archived-boards": "Geri Dönüşüm Kutusu'ndaki panolar", "restore-board": "Panoyu Geri Getir", - "no-archived-boards": "No Boards in Recycle Bin.", - "archives": "Recycle Bin", + "no-archived-boards": "Geri Dönüşüm Kutusu'nda pano yok.", + "archives": "Geri Dönüşüm Kutusu", "assign-member": "Üye ata", "attached": "dosya(sı) eklendi", "attachment": "Ek Dosya", @@ -102,11 +102,11 @@ "board-view-lists": "Listeler", "bucket-example": "Örn: \"Marketten Alacaklarım\"", "cancel": "İptal", - "card-archived": "This card is moved to Recycle Bin.", + "card-archived": "Bu kart Geri Dönüşüm Kutusu'na taşındı", "card-comments-title": "Bu kartta %s yorum var.", "card-delete-notice": "Silme işlemi kalıcıdır. Bu kartla ilişkili tüm eylemleri kaybedersiniz.", "card-delete-pop": "Son hareketler alanındaki tüm veriler silinecek, ayrıca bu kartı yeniden açamayacaksın. Bu işlemin geri dönüşü yok.", - "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.", + "card-delete-suggest-archive": "Kartları Geri Dönüşüm Kutusu'na taşıyarak panodan kaldırabilir ve içindeki aktiviteleri saklayabilirsiniz.", "card-due": "Bitiş", "card-due-on": "Bitiş tarihi:", "card-spent": "Harcanan Zaman", @@ -141,7 +141,7 @@ "clipboard": "Yapıştır veya sürükleyip bırak", "close": "Kapat", "close-board": "Panoyu kapat", - "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.", + "close-board-pop": "Silinen panoyu geri getirmek için menüden \"Geri Dönüşüm Kutusu\"'na tıklayabilirsiniz.", "color-black": "siyah", "color-blue": "mavi", "color-green": "yeşil", @@ -264,8 +264,8 @@ "leave-board-pop": "__boardTitle__ panosundan ayrılmak istediğinize emin misiniz? Panodaki tüm kartlardan kaldırılacaksınız.", "leaveBoardPopup-title": "Panodan ayrılmak istediğinize emin misiniz?", "link-card": "Bu kartın bağlantısı", - "list-archive-cards": "Move all cards in this list to Recycle Bin", - "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.", + "list-archive-cards": "Listedeki tüm kartları Geri Dönüşüm Kutusu'na gönder", + "list-archive-cards-pop": "Bu işlem listedeki tüm kartları kaldıracak. Silinmiş kartları görüntülemek ve geri yüklemek için menüden Geri Dönüşüm Kutusu'na tıklayabilirsiniz.", "list-move-cards": "Listedeki tüm kartları taşı", "list-select-cards": "Listedeki tüm kartları seç", "listActionPopup-title": "Liste İşlemleri", diff --git a/package.json b/package.json index af7a5765..98c6415a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.86.0", + "version": "0.87.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 26343921..c2cad939 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 = 71, + appVersion = 72, # Increment this for every release. - appMarketingVersion = (defaultText = "0.86.0~2018-04-20"), + appMarketingVersion = (defaultText = "0.87.0~2018-04-27"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index cbd2fca2..3c1dbb4e 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -96,7 +96,7 @@ parts: - npm - curl - execstack - prepare: | + override-build: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules # Node Fibers 100% CPU usage issue: @@ -133,19 +133,18 @@ parts: git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js cd .. - build: | rm -rf package-lock.json .build meteor add standard-minifier-js --allow-superuser meteor npm install --allow-superuser meteor build .build --directory --allow-superuser cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js + oldpath=`pwd` cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt rm -rf node_modules/bcrypt meteor npm install --save bcrypt - cd ../../../../ + cd $oldpath npm install meteor npm install --save bcrypt - install: | cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan @@ -159,7 +158,7 @@ parts: caddy: plugin: dump - source: https://caddyserver.com/download/linux/amd64?license=personal&plugins= + source: https://caddyserver.com/download/linux/amd64?license=personal source-type: tar organize: caddy: bin/caddy |