diff --git a/.meteor/versions b/.meteor/versions index 256d69c61..f46ee661d 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -3,7 +3,7 @@ accounts-password@1.1.2-rc.0 aldeed:collection2@2.3.3 aldeed:simple-schema@1.3.3 alethes:pages@1.8.4 -arillo:flow-router-helpers@0.4.4_1 +arillo:flow-router-helpers@0.4.5 audit-argument-checks@1.0.4-rc.0 autoupdate@1.2.3-rc.0 babel-compiler@5.8.20-rc.0 diff --git a/Contributing.md b/Contributing.md index cfd672160..d90c4bedc 100644 --- a/Contributing.md +++ b/Contributing.md @@ -1,19 +1,18 @@ # Contributing -We’re glad you’re interested in helping the LibreBoard project! We welcome bug +We’re glad you’re interested in helping the Wekan project! We welcome bug reports, enhancement ideas, and pull requests, in our GitHub bug tracker. Before opening a new thread please verify that your issue hasn’t already been reported. - + ## Translations -You are encouraged to translate (or improve the translation of) LibreBoard in -your locale language. For that purpose we rely on -[Transifex](https://www.transifex.com/projects/p/libreboard). So the first step -is to create a Transifex account if you don’t have one already. You can then -send a request to join one of the translation teams. If there we will create a -new one. +You are encouraged to translate (or improve the translation of) Wekan in your +locale language. For that purpose we rely on +[Transifex](https://www.transifex.com/projects/p/wekan). So the first step is to +create a Transifex account if you don’t have one already. You can then send a +request to join one of the translation teams. If there we will create a new one. Once you are in a team you can start translating the application. Please take a look at the glossary so you can agree with other (present and future) @@ -25,25 +24,25 @@ the application itself, you are asked to fill the `i18n/en.i18n.json` file. When you do that the new strings of text to translate automatically appears on Transifex to be translated (the refresh may take a few hours). -We pull all translations from Transifex before every new LibreBoard release +We pull all translations from Transifex before every new Wekan release candidate, ask the translators to review the app, and pull all translations again for the final release. ## Installation -LibreBoard is made with [Meteor](https://www.meteor.com). Thus the easiest way -to start hacking is by installing the framework, cloning the git repository, and +Wekan is made with [Meteor](https://www.meteor.com). Thus the easiest way to +start hacking is by installing the framework, cloning the git repository, and launching the application: ```bash $ curl https://install.meteor.com/ | sh # On Mac or Linux -$ git clone https://github.com/libreboard/libreboard.git -$ cd libreboard +$ git clone https://github.com/wekan/wekan.git +$ cd wekan $ meteor ``` -As for any Meteor application, LibreBoard is automatically refreshed when you -change any file of the source code, just play with it to see how it behaves! +As for any Meteor application, Wekan is automatically refreshed when you change +any file of the source code, just play with it to see how it behaves! ## Style guide diff --git a/Dockerfile b/Dockerfile index 8efa0490d..5ddeaeda0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,6 @@ FROM meteorhacks/meteord:onbuild MAINTAINER Maxime Quandalle # Run as you wish! -# docker run -d --name libreboard-db mongo -# docker run -d --link "libreboard-db:db" -e "MONGO_URL=mongodb://db" \ -# -e "ROOT_URL=http://example.com" -p 8080:80 mquandalle/libreboard +# docker run -d --name wekan-db mongo +# docker run -d --link "wekan-db:db" -e "MONGO_URL=mongodb://db" \ +# -e "ROOT_URL=http://example.com" -p 8080:80 mquandalle/wekan diff --git a/History.md b/History.md index e8d8a4c14..a7ce98b94 100644 --- a/History.md +++ b/History.md @@ -17,14 +17,15 @@ security. It also features the following improvements: Starting from this release we will also distribute official docker images on both the -[GitHub release page](https://github.com/libreboard/libreboard/releases) +[GitHub release page](https://github.com/wekan/wekan/releases) and on the -[DockerHub](https://hub.docker.com/r/mquandalle/libreboard). +[DockerHub](https://hub.docker.com/r/mquandalle/wekan). New languages supported: Chinese, Finnish, Spanish, Korean, and Russian. Special thanks to GitHub users ePirat, nata-goddanti, ocdtrekkie, and others who -have supportive during this *traversée du desert*. +have supportive during this *traversée du desert*, and to neynah for the Wekan +icons. # v0.8 diff --git a/README.md b/README.md index 6f2621e80..c1ff72451 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,23 @@ -# LibreBoard +# Wekan -LibreBoard is an open-source *kanban* board that let you organize things in -cards, and cards in lists. You can use it alone, or with your team and family -thanks to our real-time synchronisation feature. Libreboard is a land of liberty -and you can implement all sort of workflows on it using tags, comments, member -assignation, and many more. + + +Wekan is an open-source *kanban* board that let you organize things in cards, +and cards in lists. You can use it alone, or with your team and family thanks to +our real-time synchronisation feature. Wekan is a land of liberty and you can +implement all sort of workflows on it using tags, comments, member assignation, +and many more. [![Our roadmap is self-hosted on LibreBoard][thumbnail]][roadmap] Since it is a free software, you don’t have to trust us with your data and can -install LibreBoard on your own computer or server. In fact we encourage you to -do that by providing one-click installation for the +install Wekan on your own computer or server. In fact we encourage you to do +that by providing one-click installation for the [Sandstorm](https://sandstorm.io) platform and verified [Docker](https://www.docker.com) images. -LibreBoard is released under the very permissive [MIT license](LICENSE), and -made with [Meteor](https://www.meteor.com). +Wekan is released under the very permissive [MIT license](LICENSE), and made +with [Meteor](https://www.meteor.com). [Our roadmap is self-hosted on LibreBoard][roadmap] diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index 27864474e..2b561ae38 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -45,7 +45,7 @@ BlazeComponent.extendComponent({ // In case the filter is active we need to add the newly inserted card in // the list of exceptions -- cards that are not filtered. Otherwise the // card will disappear instantly. - // See https://github.com/libreboard/libreboard/issues/80 + // See https://github.com/wekan/wekan/issues/80 Filter.addException(_id); // We keep the form opened, empty it, and scroll to it. diff --git a/client/components/main/header.jade b/client/components/main/header.jade index da7999cf7..9eeb843bb 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -34,11 +34,15 @@ template(name="header") #header-main-bar(class="{{#if wrappedHeader}}wrapper{{/if}}") if $.Session.get 'currentBoard' +headerBoard - else + else if($eq currentRouteName 'home') +headerTitle + a.wekan-logo(href="{{pathFor 'home'}}") + img(src="/wekan-logo-header.png" alt="Wekan") + template(name="headerTitle") - h1 LibreBoard + h1 My Boards + .board-header-btns.right a.board-header-btn.js-open-archived-board i.fa.fa-archive diff --git a/client/components/main/header.styl b/client/components/main/header.styl index e31f09928..d4edd82f9 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -75,6 +75,16 @@ float: left border-radius: 3px + .wekan-logo + display: block + margin: 3px auto 0 + width: 97px + opacity: 0.6 + transition: opacity 0.15s + + &:hover + opacity: 0.9 + .board-header-btns display: block margin-top: 3px diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index 7a1fa8a2d..3ea5acc5c 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -1,5 +1,5 @@ head - title LibreBoard + title Wekan meta(name="viewport" content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0") link(rel="shortcut icon" href="/favicon.png") @@ -7,7 +7,7 @@ head template(name="userFormsLayout") section.auth-layout h1.at-form-landing-logo - img(src="/logo.png" title="LibreBoard") + img(src="/wekan-logo.png" alt="Wekan") +Template.dynamic(template=content) template(name="defaultLayout") diff --git a/client/components/users/userForm.styl b/client/components/users/userForm.styl index 2117bfcba..9b6e86ced 100644 --- a/client/components/users/userForm.styl +++ b/client/components/users/userForm.styl @@ -1,13 +1,10 @@ .auth-layout .at-form-landing-logo - width: 275px + width: 249px margin: auto margin-top: 50px margin-top: 17vh - img - width: 275px - .at-form margin: auto width: 275px diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 811d98858..12b10ef6d 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -131,7 +131,7 @@ "search": "Search", "computer": "Computer", "download": "Download", - "search-member-desc": "Search for a person in LibreBoard by name or email address, or enter an email address to invite someone new.", + "search-member-desc": "Search for a person by name or email address, or enter an email address to invite someone new.", "search-title": "Search for boards, cards, members, and organizations.", "select-color": "Select a color", "send-to-board": "Send to board", diff --git a/meta/icons/wekan-128.svg b/meta/icons/wekan-128.svg new file mode 100644 index 000000000..d6e1ac5be --- /dev/null +++ b/meta/icons/wekan-128.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/icons/wekan-150.svg b/meta/icons/wekan-150.svg new file mode 100644 index 000000000..51d4eedec --- /dev/null +++ b/meta/icons/wekan-150.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/icons/wekan-24.svg b/meta/icons/wekan-24.svg new file mode 100644 index 000000000..d19a65a8e --- /dev/null +++ b/meta/icons/wekan-24.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + diff --git a/public/logo.png b/public/logo.png deleted file mode 100644 index 6fea7167b..000000000 Binary files a/public/logo.png and /dev/null differ diff --git a/public/wekan-logo-header.png b/public/wekan-logo-header.png new file mode 100644 index 000000000..441b6007e Binary files /dev/null and b/public/wekan-logo-header.png differ diff --git a/public/wekan-logo.png b/public/wekan-logo.png new file mode 100644 index 000000000..1d98f1762 Binary files /dev/null and b/public/wekan-logo.png differ diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index accf3c542..9db8f6fdc 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -19,13 +19,13 @@ const pkgdef :Spk.PackageDefinition = ( # This manifest is included in our app package to tell Sandstorm about our # app. - appTitle = (defaultText = "LibreBoard"), + appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. appVersion = 3, # Increment this for every release. - appMarketingVersion = (defaultText = "0.9.0_beta1"), + appMarketingVersion = (defaultText = "0.9.0_rc1"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, @@ -51,18 +51,14 @@ const pkgdef :Spk.PackageDefinition = ( # case. metadata = ( - # icons = ( - # appGrid = (svg = embed "meta/icons/libreboard-128.svg"), - # grain = (svg = embed "meta/icons/libreboard-24.svg"), - # market = (svg = embed "meta/icons/libreboard-150.svg"), - # ), - # XXX We currently don't have an icon, because the bird image included in - # previous version was a copyright infringement, see - # https://github.com/libreboard/libreboard/issues/64. - # I have an idea to replace it but it's not ready yet. + icons = ( + appGrid = (svg = embed "meta/icons/wekan-128.svg"), + grain = (svg = embed "meta/icons/wekan-24.svg"), + market = (svg = embed "meta/icons/wekan-150.svg"), + ), website = "http://libreboard.com", - codeUrl = "https://github.com/libreboard/libreboard", + codeUrl = "https://github.com/wekan/wekan", license = (openSource = mit), categories = [productivity, office], diff --git a/sandstorm.js b/sandstorm.js index d565df623..c410a7f84 100644 --- a/sandstorm.js +++ b/sandstorm.js @@ -10,7 +10,7 @@ var sandstormBoard = { _id: 'sandstorm', // XXX Should be shared with the grain instance name. - title: 'LibreBoard', + title: 'Wekan', slug: 'libreboard', // Board access security is handled by sandstorm, so in our point of view we diff --git a/server/migrations.js b/server/migrations.js index 2a8e338c2..e9b60ed90 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -46,7 +46,7 @@ Migrations.add('lowercase-board-permission', function() { }); }); -// Security migration: see https://github.com/libreboard/libreboard/issues/99 +// Security migration: see https://github.com/wekan/wekan/issues/99 Migrations.add('change-attachments-type-for-non-images', function() { var newTypeForNonImage = 'application/octet-stream'; Attachments.find().forEach(function(file) { diff --git a/server/publications/boards.js b/server/publications/boards.js index baf1b7809..ae30357f0 100644 --- a/server/publications/boards.js +++ b/server/publications/boards.js @@ -91,7 +91,7 @@ Meteor.publishComposite('board', function(boardId) { // a similar problem: // // https://github.com/Goluis/cottz-publish/issues/4 - // https://github.com/libreboard/libreboard/pull/78 + // https://github.com/wekan/wekan/pull/78 // // The current state of relational publishing in meteor is a bit sad, // there are a lot of various packages, with various APIs, some of them