diff options
| -rw-r--r-- | README.md | 14 | ||||
| -rw-r--r-- | client/lib/filter.js | 6 | ||||
| -rw-r--r-- | client/lib/i18n.js | 29 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 6 | ||||
| -rw-r--r-- | sandstorm.js | 5 |
5 files changed, 33 insertions, 27 deletions
@@ -1,6 +1,9 @@ # Wekan fork [![Join the chat][rocket_badge]][rocket_chat] +[![Build Status][travis_badge]][travis_status] + +[Wekan fork FAQ][fork_faq] [Wekan fork announcement][fork_announcement] @@ -30,25 +33,26 @@ Currently you can install Wekan fork on the following Platforms: [![SignUp][indiehosters_button]][indiehosters_saas] [![Deploy to Scalingo][scalingo_button]][scalingo_deploy] [![Install on Cloudron][cloudron_button]][cloudron_install] +[![Try on Sandstorm][sandstorm_button]][sandstorm_appdemo] These Platforms have not been tested yet, but are coming sometime, so links don't work yet: [Docker][docker_image] -[Sandstorm][sandstorm_market] - Wekan fork is released under the very permissive [MIT license](LICENSE), and made with [Meteor](https://www.meteor.com). [Our roadmap is self-hosted on Wekan fork][roadmap] +[fork_faq]: https://github.com/wefork/wekan/wiki/FAQ [fork_announcement]: https://github.com/wekan/wekan/issues/640#issuecomment-255091832 -[screenshot]: http://i.imgur.com/uNVJnBe.png +[screenshot]: http://i.imgur.com/ShX2OTk.png [rocket_badge]: https://chat.indie.host/images/join-chat.svg [rocket_chat]: https://chat.indie.host/channel/wekan [roadmap]: https://wekan.indie.host/b/t2YaGmyXgNkppcFBq/wekan-fork-roadmap -[sandstorm_market]: https://oasis.sandstorm.io/appdemo/.... +[sandstorm_button]: https://img.shields.io/badge/try-Wekan%20on%20Sandstorm-783189.svg +[sandstorm_appdemo]: https://demo.sandstorm.io/appdemo/m86q05rdvj14yvn78ghaxynqz7u2svw6rnttptxx49g1785cdv1h [docker_image]: https://hub.docker.com/r/... [heroku_button]: https://www.herokucdn.com/deploy/button.png [heroku_deploy]: https://heroku.com/deploy?template=https://github.com/wefork/wekan/tree/master @@ -59,3 +63,5 @@ with [Meteor](https://www.meteor.com). [cloudron_button]: https://cloudron.io/img/button.svg [cloudron_install]: https://cloudron.io/button.html?app=io.wekan.cloudronapp [debian_wheezy]: https://github.com/soohwa/sps/blob/master/example/docs/1/wekan.md +[travis_badge]: https://travis-ci.org/wefork/wekan.svg?branch=devel +[travis_status]: https://travis-ci.org/wefork/wekan diff --git a/client/lib/filter.js b/client/lib/filter.js index afa992ab..8129776b 100644 --- a/client/lib/filter.js +++ b/client/lib/filter.js @@ -66,9 +66,9 @@ class SetFilter { _getEmptySelector() { this._dep.depend(); - let includeEmpty = false + let includeEmpty = false; this._selectedElements.forEach((el) => { - if (el == undefined) { + if (el === undefined) { includeEmpty = true; } }); @@ -113,7 +113,7 @@ Filter = { if (filter._isActive()) { filterSelector[fieldName] = filter._getMongoSelector(); emptySelector[fieldName] = filter._getEmptySelector(); - if (emptySelector[fieldName] != null) { + if (emptySelector[fieldName] !== null) { includeEmptySelectors = true; } } diff --git a/client/lib/i18n.js b/client/lib/i18n.js index a03fb398..34a789e1 100644 --- a/client/lib/i18n.js +++ b/client/lib/i18n.js @@ -2,20 +2,19 @@ // the language reactively. If the user is not connected we use the language // information provided by the browser, and default to english. -Tracker.autorun(() => { - const currentUser = Meteor.user(); - let language; - if (currentUser) { - language = currentUser.profile && currentUser.profile.language; - } else { - language = navigator.language || navigator.userLanguage; - } +Meteor.startup(() => { + Tracker.autorun(() => { + const currentUser = Meteor.user(); + let language; + if (currentUser && currentUser.profile && currentUser.profile.language) { + language = currentUser.profile.language; + } else { + language = navigator.language || navigator.userLanguage; + } - if (language) { - TAPi18n.setLanguage(language); - - // XXX - const shortLanguage = language.split('-')[0]; - T9n.setLanguage(shortLanguage); - } + if (language) { + TAPi18n.setLanguage(language); + T9n.setLanguage(language); + } + }); }); diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 0aaaed56..5c0961f8 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 = 14, + appVersion = 16, # Increment this for every release. - appMarketingVersion = (defaultText = "0.11.0~2016-11-08"), + appMarketingVersion = (defaultText = "0.11.0~2016-11-15"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, @@ -58,7 +58,7 @@ const pkgdef :Spk.PackageDefinition = ( ), website = "https://wekan.io", - codeUrl = "https://github.com/wekan/wekan", + codeUrl = "https://github.com/wefork/wekan", license = (openSource = mit), categories = [productivity, office], diff --git a/sandstorm.js b/sandstorm.js index 07007be1..dc5b10d6 100644 --- a/sandstorm.js +++ b/sandstorm.js @@ -116,9 +116,10 @@ if (isSandstorm && Meteor.isServer) { mentioned: !!user.mentioned, subscribed: !!user.subscribed, }; - }).catch(() => { - // Ignore identities that fail to resolve. Probably they have lost access to the board. }); + }).catch(() => { + // Ignore identities that fail to restore. Either they were added before we set + // `saveIdentityCaps` to true, or they have lost access to the board. }); })).then((maybeUsers) => { const users = maybeUsers.filter((u) => !!u); |