diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-04-13 10:25:33 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-04-13 10:25:33 +0300 |
commit | 2b176aeac143de649deb39aeba3ee38e78ed815f (patch) | |
tree | f80c8bb0662f65db3c6a935998507e8651a2d5ee | |
parent | b9a5de2d889bf70605d358ac249ea819ffa4a54a (diff) | |
parent | 2bb5a4cd2611f8c63b707969e6e92d0bde2f5857 (diff) | |
download | wekan-2b176aeac143de649deb39aeba3ee38e78ed815f.tar.gz wekan-2b176aeac143de649deb39aeba3ee38e78ed815f.tar.bz2 wekan-2b176aeac143de649deb39aeba3ee38e78ed815f.zip |
Merge branch 'devel'
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | i18n/de.i18n.json | 8 | ||||
-rw-r--r-- | i18n/en.i18n.json | 2 | ||||
-rw-r--r-- | i18n/fa.i18n.json | 6 | ||||
-rw-r--r-- | sandstorm.js | 3 |
5 files changed, 15 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d5ab210..0c385908 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,12 @@ This release adds the following new features: * Set first user as admin, it there is no existing users and Wekan is not running at Sandstorm. +* New Docker Compose [Wekan-MongoDB](https://github.com/wekan/wekan-mongodb) + and [Wekan-PostgreSQL](https://github.com/wekan/wekan-postgresql) + that use Meteor v1.4 and Node v4 based Wekan's meteor-1.4 branch. -Thanks to GitHub user Zokormazo for contributions. +Thanks to GitHub users brylie, stephenmoloney and Zokormazo for +contributions. # v0.18 2017-04-02 Wekan release diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 952ff9d0..dd9490c6 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -137,8 +137,8 @@ "color-yellow": "gelb", "comment": "Kommentar", "comment-placeholder": "Kommentar schreiben", - "comment-only": "Limited", - "comment-only-desc": "Can comment on cards only.", + "comment-only": "Eingeschränkt", + "comment-only-desc": "Kann Karten nur Kommentieren", "computer": "Computer", "create": "Erstellen", "createBoardPopup-title": "Board erstellen", @@ -337,12 +337,12 @@ "email-addresses": "E-Mail Adressen", "smtp-host-description": "Die Adresse Ihres SMTP-Servers für ausgehende E-Mails.", "smtp-port-description": "Der Port Ihres SMTP-Servers für ausgehende E-Mails.", - "smtp-tls-description": "Enable TLS support for SMTP server", + "smtp-tls-description": "Aktiviere TLS Unterstützung für SMTP Server", "smtp-host": "SMTP-Server", "smtp-port": "SMTP-Port", "smtp-username": "Benutzername", "smtp-password": "Passwort", - "smtp-tls": "TLS support", + "smtp-tls": "TLS Unterstützung", "send-from": "Absender", "invitation-code": "Einladungscode", "email-invite-register-subject": "__inviter__ hat Ihnen eine Einladung geschickt", diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index ecf145d0..143991d1 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -71,7 +71,7 @@ "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.", "attachmentDeletePopup-title": "Delete Attachment?", "attachments": "Attachments", - "auto-watch": "Automatically watch boards when create it", + "auto-watch": "Automatically watch boards when they are created", "avatar-too-big": "The avatar is too large (70Kb max)", "back": "Back", "board-change-color": "Change color", diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index ba3ea1cb..0eb9ba88 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -263,9 +263,9 @@ "password": "کلمه عبور", "paste-or-dragdrop": "جهت چسباندن، یا کشیدن-رهاسازی فایل تصویر به آن (تصویر)", "participating": "Participating", - "preview": "نمایش", - "previewAttachedImagePopup-title": "نمایش", - "previewClipboardImagePopup-title": "نمایش", + "preview": "پیشنمایش", + "previewAttachedImagePopup-title": "پیشنمایش", + "previewClipboardImagePopup-title": "پیشنمایش", "private": "خصوصی", "private-desc": "این تخته خصوصی است. فقط تنها افراد اضافه شده به آن می توانند مشاهده و ویرایش کنند.", "profile": "پروفایل", diff --git a/sandstorm.js b/sandstorm.js index 3e04d79f..2e79c27c 100644 --- a/sandstorm.js +++ b/sandstorm.js @@ -205,7 +205,8 @@ if (isSandstorm && Meteor.isServer) { function updateUserPermissions(userId, permissions) { const isActive = permissions.indexOf('participate') > -1; const isAdmin = permissions.indexOf('configure') > -1; - const permissionDoc = { userId, isActive, isAdmin }; + const isCommentOnly = false; + const permissionDoc = { userId, isActive, isAdmin, isCommentOnly }; const boardMembers = Boards.findOne(sandstormBoard._id).members; const memberIndex = _.pluck(boardMembers, 'userId').indexOf(userId); |