diff options
| -rw-r--r-- | Dockerfile | 18 | ||||
| -rw-r--r-- | README.md | 89 | ||||
| -rw-r--r-- | client/components/boards/boardHeader.js | 2 | ||||
| -rw-r--r-- | client/components/sidebar/sidebarFilters.jade | 5 | ||||
| -rw-r--r-- | docker-compose.yml | 4 | ||||
| -rw-r--r-- | models/boards.js | 2 |
6 files changed, 89 insertions, 31 deletions
@@ -1,13 +1,21 @@ FROM debian:wheezy MAINTAINER wefork +# Declare Arguments +ARG NODE_VERSION +ARG METEOR_RELEASE +ARG NPM_VERSION +ARG ARCHITECTURE +ARG SRC_PATH + +# Set the environment variables (defaults where required) ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates" ENV GOSU_VERSION=1.10 -ARG NODE_VERSION=v0.10.48 -ARG METEOR_RELEASE=1.3.5.1 -ARG NPM_VERSION=3.10.10 -ARG ARCHITECTURE=linux-x64 -ARG SRC_PATH=./ +ENV NODE_VERSION ${NODE_VERSION:-v0.10.48} +ENV METEOR_RELEASE ${METEOR_RELEASE:-1.3.5.1} +ENV NPM_VERSION ${NPM_VERSION:-3.10.10} +ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} +ENV SRC_PATH ${SRC_PATH:-./} # Copy the app to the image COPY ${SRC_PATH} /home/wekan/app @@ -1,13 +1,20 @@ -# Wekan fork +# Wekan -[![Join the chat][rocket_badge]][rocket_chat] -[![Build Status][travis_badge]][travis_status] +[![Join the chat][gitter_badge]][gitter_chat] -[Wekan fork FAQ][fork_faq] +2017-01-31 News: Wekan fork/Wefork is being merged back to official Wekan. -[Wekan fork announcement][fork_announcement] +[Wefork announcement and merging back][fork_announcement] -[Translate Wekan fork at Transifex][translate_wefork] +[![Wefork chat][rocket_badge]][rocket_chat] + +[![Wefork Build Status][travis_badge]][travis_status] + +[Wefork FAQ][fork_faq] + +[Newer Wefork translations at Transifex][translate_wefork] + +[Wekan at Transifex][translate_wekan] Wekan is an open-source and collaborative kanban board application. @@ -17,7 +24,17 @@ boards are an unbeatable tool to keep your things organized. They give you a visual overview of the current state of your project, and make you productive by allowing you to focus on the few items that matter the most. -[![Our roadmap is self-hosted on Wekan fork][screenshot]][roadmap] +## Roadmap + +Roadmap is handled using [Wekan GitHub issues][wekan_issues]. + +Newer [Wefork GitHub issues][wefork_issues] will be be moved to there also. + +## Screenshots + +[![Screenshot of Wekan][screenshot_wekan]][roadmap_wekan] + +[![Screenshot of Wefork][screenshot_wefork]][roadmap_wefork] Wekan supports most features you would expect of it including a real-time user interface, cards comments, member assignations, customizable labels, filtered @@ -33,7 +50,38 @@ that by providing one-click installation on various platforms. [VirtualBox][virtualbox] -Docker: [Docs][docker_docs], [Docker Nginx proxy][docker_nginxproxy], [Docker Issue][docker_issue] +### Docker: [Docker image][docker_image], [Docs][docker_docs], [Docker Nginx proxy][docker_nginxproxy], [Docker Issue][docker_issue] + +Docker example, running latest Wekan using docker-compose: + +#### Running from remote dockerhub images +``` +sudo docker-compose pull && sudo docker-compose up -d --no-build +``` + +#### Running from locally built dockerhub images +``` +sudo docker-compose up -d --build +``` + +#### Running from locally built dockerhub images and modified `ARG` variables (not recommended) +``` +echo 'NODE_VERSION=v6.6.0' >> .env && \ +echo 'METEOR_RELEASE=1.4.2.3' >> .env && \ +echo 'NPM_VERSION=4.1.2' >> .env && \ +echo 'ARCHITECTURE=linux-x64' >> .env && \ +echo 'SRC_PATH=./' >> .env && \ +sudo docker-compose up -d --build +``` + +Docker example, running latest Wekan using docker run commands alone: +``` +docker run -d --restart=always --name wekan-db mongo:3.2.11 + +docker run -d --restart=always --name wekan --link "wekan-db:db" -e "MONGO_URL=mongodb://db" -e "ROOT_URL=http://localhost:8080" -p 8080:80 mquandalle/wekan:latest +``` + +[Docker on SUSE Linux Enterprise Server 12 SP1][sles] [Debian Wheezy 64bit][debian_wheezy] @@ -43,9 +91,8 @@ Docker: [Docs][docker_docs], [Docker Nginx proxy][docker_nginxproxy], [Docker Is [![Install on Cloudron][cloudron_button]][cloudron_install] [![Try on Sandstorm][sandstorm_button]][sandstorm_appdemo] -## Upcoming Platforms -[Docker on SUSE Linux Enterprise Server 12 SP1][sles] +## Upcoming Platforms [Autoinstall script][autoinstall] based on [this issue][autoinstall_issue] @@ -66,22 +113,24 @@ Google Cloud: Needs info how to enable websockets. ## License -Wekan fork is released under the very permissive [MIT license](LICENSE), and made +Wekan is released under the very permissive [MIT license](LICENSE), and made with [Meteor](https://www.meteor.com). -## Roadmap - -[Our roadmap is self-hosted on Wekan fork][roadmap] - +[gitter_badge]: https://badges.gitter.im/Join%20Chat.svg +[gitter_chat]: https://gitter.im/wekan/wekan [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/ShX2OTk.png +[fork_announcement]: https://github.com/wekan/wekan/issues/640#issuecomment-276383458 +[screenshot_wekan]: http://i.imgur.com/cI4jW2h.png +[screenshot_wefork]: http://i.imgur.com/ShX2OTk.png +[roadmap_wekan]: http://try.wekan.io/b/MeSsFJaSqeuo9M6bs/wekan-roadmap +[roadmap_wefork]: https://wekan.indie.host/b/t2YaGmyXgNkppcFBq/wekan-fork-roadmap [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 +[wekan_issues]: https://github.com/wekan/wekan/issues +[wefork_issues]: https://github.com/wefork/wekan/issues [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/... +[docker_image]: https://hub.docker.com/r/mquandalle/wekan/ [heroku_button]: https://www.herokucdn.com/deploy/button.png [heroku_deploy]: https://heroku.com/deploy?template=https://github.com/wefork/wekan/tree/master [indiehosters_button]: https://indie.host/signup.png @@ -97,9 +146,11 @@ with [Meteor](https://www.meteor.com). [sles]: https://github.com/wekan/wekan/wiki/Install-Wekan-Docker-on-SUSE-Linux-Enterprise-Server-12-SP1 [virtualbox]: https://github.com/wekan/wekan/wiki/virtual-appliance [sandstorm_spk]: https://github.com/wefork/wekan/issues/36 +[docker_image]: https://hub.docker.com/r/mquandalle/wekan/ [docker_docs]: https://github.com/wefork/wekan/wiki/Docker [docker_nginxproxy]: https://github.com/wefork/wekan/wiki/Docker-NginxProxy [docker_issue]: https://github.com/wefork/wekan/issues/33 +[translate_wekan]: https://www.transifex.com/wekan/wekan/ [translate_wefork]: https://www.transifex.com/wefork/wefork/ [autoinstall]: https://github.com/wefork/wekan-autoinstall [autoinstall_issue]: https://github.com/anselal/wekan/issues/18 diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index b72bb162..a76b566a 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -33,7 +33,7 @@ Template.boardChangeTitlePopup.events({ const newDesc = tpl.$('.js-board-desc').val().trim(); if (newTitle) { this.rename(newTitle); - this.setDesciption(newDesc); + this.setDescription(newDesc); Popup.close(); } evt.preventDefault(); diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index deefde82..9a9774bb 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -8,7 +8,7 @@ template(name="filterSidebar") li(class="{{#if Filter.labelIds.isSelected undefined}}active{{/if}}") a.name.js-toggle-label-filter span.sidebar-list-item-description - {{_ 'filter-no-label'}} + | {{_ 'filter-no-label'}} if Filter.labelIds.isSelected undefined i.fa.fa-check each currentBoard.labels @@ -27,7 +27,7 @@ template(name="filterSidebar") li(class="{{#if Filter.members.isSelected undefined}}active{{/if}}") a.name.js-toggle-member-filter span.sidebar-list-item-description - {{_ 'filter-no-member'}} + | {{_ 'filter-no-member'}} if Filter.members.isSelected undefined i.fa.fa-check each currentBoard.activeMembers @@ -98,4 +98,3 @@ template(name="disambiguateMultiMemberPopup") template(name="moveSelectionPopup") +boardLists - diff --git a/docker-compose.yml b/docker-compose.yml index d25e4b88..35c5bfd1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wekandb: - image: mongo:3.4 + image: mongo:3.2.11 container_name: wekan-db restart: always command: mongod --smallfiles --oplogSize 128 @@ -16,7 +16,7 @@ services: - wekan-db-dump:/dump wekan: - image: wefork/wekan + image: mquandalle/wekan:latest container_name: wekan-app restart: always networks: diff --git a/models/boards.js b/models/boards.js index 3051ef1e..14943d61 100644 --- a/models/boards.js +++ b/models/boards.js @@ -249,7 +249,7 @@ Boards.mutations({ return { $set: { title }}; }, - setDesciption(description) { + setDescription(description) { return { $set: {description} }; }, |