v3.11

Thanks to xet7 !

.gitignore

@@ -29,3 +29,6 @@ versions.json
 Thumbs.db
 ehthumbs.db
 .eslintcache
+package-lock.json
+.meteor/local
+.meteor-1.6-snap/.meteor/local

.meteor-1.6-snap/.meteor/packages

@@ -91,3 +91,6 @@ mdg:meteor-apm-agent
 meteorhacks:unblock
 lucasantoniassi:accounts-lockout
 wekan-markdown
+konecty:mongo-counter
+percolate:synced-cron
+easylogic:summernote

.meteor-1.6-snap/.meteor/versions

@@ -55,6 +55,7 @@ ddp-server@2.1.1
 deps@1.0.12
 diff-sequence@1.0.7
 dynamic-import@0.2.1
+easylogic:summernote@0.8.8
 ecmascript@0.9.0
 ecmascript-runtime@0.5.0
 ecmascript-runtime-client@0.5.0
@@ -77,6 +78,7 @@ kadira:blaze-layout@2.3.0
 kadira:dochead@1.5.0
 kadira:flow-router@2.12.1
 kenton:accounts-sandstorm@0.7.0
+konecty:mongo-counter@0.0.5_3
 lamhieu:meteorx@2.0.1
 launch-screen@1.1.1
 livedata@1.0.18
@@ -170,6 +172,7 @@ templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
 tracker@1.1.3
+twbs:bootstrap@3.3.6
 ui@1.0.13
 underscore@1.0.10
 url@1.1.0

.meteor-1.6-snap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.04.0",
+  "version": "v3.11.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

CHANGELOG.md

@@ -1,3 +1,74 @@
+# v3.11 2019-08-07 Wekan release
+
+This release fixes the following bugs:
+
+- [Remove non-existing file from snapcraft.yaml to get Snap to build](https://github.com/wekan/wekan/commit/ad82a900e8ec636a72c6e74bb8489559ce2a8bf0).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.10 2019-08-07 Wekan release
+
+This release fixes the following bugs:
+
+- [Add missing dependencies back and revert deleting phantomjs](https://github.com/wekan/wekan/commit/32e9aa0ddaf1b015825b8c62ad17ed74b449e4b1).
+  Thanks to whowillcare and xet7.
+    
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.09 2019-08-07 Wekan release
+
+This release adds the following features:
+
+- [Hide minicard label text: per user checkbox setting at sidebar](https://github.com/wekan/wekan/commit/f7e0b837d394d55d66d451c34f43fa8afd357e5b).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Make Save button visible again at Admin Panel People Edit](https://github.com/wekan/wekan/commit/716fc32968e7dd51b64a11c6c33e59aee849c982).
+  Thanks to sclerc-chss and xet7.
+- [Fix checking if API is enabled](https://github.com/wekan/wekan/pull/2588).
+  Thanks to justinr1234.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.08 2019-08-07 Wekan release
+
+This release fixes the following bugs:
+
+- [Removed removing phantomjs from snap, because snap build did stop to error
+  no phantomjs could be removed](https://github.com/wekan/wekan/commit/7d8f1dee62f285a4587fb40e7331d0f500b2e5fb).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.07 2019-08-07 Wekan release
+
+This release fixes the following bugs:
+
+- [Try to make release sizes smaller by deleting phantomjs](https://github.com/wekan/wekan/commit/1fc3a1db2e663f149287b6e14053d536fb1a8a81).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.06 2019-08-07 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix board query](https://github.com/wekan/wekan/pull/2587).
+  Thanks to justinr1234.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.05 2019-08-07 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed LDAP group filtering bug on Snap settings](https://github.com/wekan/wekan/pull/2584).
+  Thanks to KuenzelIT.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v3.04 2019-08-06 Wekan release
 
 This release fixes the following bugs:

Dockerfile

@@ -257,6 +257,11 @@ RUN \
     #cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \
     #gosu wekan:wekan rm -rf node_modules/bcrypt && \
     #gosu wekan:wekan npm install bcrypt && \
+    #
+    # Delete phantomjs
+    #cd /home/wekan/app_build/bundle && \
+    #find . -name "*phantomjs*" | xargs rm -rf && \
+    #
     cd /home/wekan/app_build/bundle/programs/server/ && \
     gosu wekan:wekan npm install && \
     #gosu wekan:wekan npm install bcrypt && \

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v3.04.0"
+appVersion: "v3.11.0"
 files:
   userUploads:
     - README.md

client/components/cards/minicard.jade

@@ -8,9 +8,12 @@ template(name="minicard")
     if labels
       .minicard-labels
         each labels
-          span.card-label(class="card-label-{{color}}" title=name)
-            +viewer
-              = name
+          unless hiddenMinicardLabelText
+            span.card-label(class="card-label-{{color}}" title=name)
+              +viewer
+                = name
+          if hiddenMinicardLabelText
+            .minicard-label(class="card-label-{{color}}" title="{{name}}")
     .minicard-title
       .handle
         .fa.fa-arrows

client/components/cards/minicard.js

@@ -16,6 +16,17 @@ BlazeComponent.extendComponent({
             Utils.goBoardId(this.data().linkedId);
         },
       },
+      {
+        'click .js-toggle-minicard-label-text'() {
+          Meteor.call('toggleMinicardLabelText');
+        },
+      },
     ];
   },
 }).register('minicard');
+
+Template.minicard.helpers({
+  hiddenMinicardLabelText() {
+    return Meteor.user().hasHiddenMinicardLabelText();
+  },
+});

client/components/settings/peopleBody.jade

@@ -107,8 +107,8 @@ template(name="editUserPopup")
     label
       | {{_ 'password'}}
       input.js-profile-password(type="password")
-    //div.buttonsContainer
-    //  input.primary.wide(type="submit" value="{{_ 'save'}}")
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
     //  div
     //  input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")
 

client/components/sidebar/sidebar.jade

@@ -22,6 +22,11 @@ template(name='homeSidebar')
   +membersWidget
   hr
   +labelsWidget
+  ul#cards.label-text-hidden
+    a.flex.js-toggle-minicard-label-text
+      span {{_ 'hide-minicard-label-text'}}
+      b  
+      .materialCheckBox(class="{{#if hiddenMinicardLabelText}}is-checked{{/if}}")
   hr
   unless currentUser.isNoComments
     h3

client/components/sidebar/sidebar.js

@@ -101,6 +101,9 @@ BlazeComponent.extendComponent({
         'click .js-hide-sidebar': this.hide,
         'click .js-toggle-sidebar': this.toggle,
         'click .js-back-home': this.setView,
+        'click .js-toggle-minicard-label-text'() {
+          Meteor.call('toggleMinicardLabelText');
+        },
         'click .js-shortcuts'() {
           FlowRouter.go('shortcuts');
         },
@@ -111,6 +114,12 @@ BlazeComponent.extendComponent({
 
 Blaze.registerHelper('Sidebar', () => Sidebar);
 
+Template.homeSidebar.helpers({
+  hiddenMinicardLabelText() {
+    return Meteor.user().hasHiddenMinicardLabelText();
+  },
+});
+
 EscapeActions.register(
   'sidebarView',
   () => {

docker-compose.yml

@@ -115,14 +115,11 @@ services:
     # NOTE: Quay is currently not updated, use Docker Hub image below c)
     # a) For Wekan Meteor 1.8.x version at master branch,
     #    using https://quay.io/wekan/wekan automatic builds
-    #image: quay.io/wekan/wekan:master
-    # b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
-    # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
-    #image: quay.io/wekan/wekan:master
-    # c) Using specific Meteor 1.6.x version tag:
+    image: quay.io/wekan/wekan
+    # b) Using specific Meteor 1.6.x version tag:
     # image: quay.io/wekan/wekan:v1.95
     # c) Using Docker Hub automatic builds https://hub.docker.com/r/wekanteam/wekan
-    image: wekanteam/wekan
+    #image: wekanteam/wekan
     # image: wekanteam/wekan:v2.99
     #-------------------------------------------------------------------------------------
     container_name: wekan-app

i18n/en.i18n.json

@@ -724,5 +724,6 @@
   "act-duenow": "was reminding the current due (__timeValue__) of __card__ is now",
   "act-atUserComment": "You were mentioned in [__board__] __card__",
   "delete-user-confirm-popup": "Are you sure you want to delete this account? There is no undo.",
-  "accounts-allowUserDelete": "Allow users to self delete their account"
+  "accounts-allowUserDelete": "Allow users to self delete their account",
+  "hide-minicard-label-text": "Hide minicard label text"
 }

models/users.js

@@ -109,7 +109,14 @@ Users.attachSchema(
     },
     'profile.hiddenSystemMessages': {
       /**
-       * does the user wants to hide system messages?
+       * does the user want to hide system messages?
+       */
+      type: Boolean,
+      optional: true,
+    },
+    'profile.hiddenMinicardLabelText': {
+      /**
+       * does the user want to hide minicard label texts?
        */
       type: Boolean,
       optional: true,
@@ -359,6 +366,11 @@ Users.helpers({
     return profile.hiddenSystemMessages || false;
   },
 
+  hasHiddenMinicardLabelText() {
+    const profile = this.profile || {};
+    return profile.hiddenMinicardLabelText || false;
+  },
+
   getEmailBuffer() {
     const { emailBuffer = [] } = this.profile || {};
     return emailBuffer;
@@ -462,6 +474,14 @@ Users.mutations({
     };
   },
 
+  toggleLabelText(value = false) {
+    return {
+      $set: {
+        'profile.hiddenMinicardLabelText': !value,
+      },
+    };
+  },
+
   addNotification(activityId) {
     return {
       $addToSet: {
@@ -525,6 +545,10 @@ Meteor.methods({
     const user = Meteor.user();
     user.toggleSystem(user.hasHiddenSystemMessages());
   },
+  toggleMinicardLabelText() {
+    const user = Meteor.user();
+    user.toggleLabelText(user.hasHiddenMinicardLabelText());
+  },
   changeLimitToShowCardsCount(limit) {
     check(limit, Number);
     Meteor.user().setShowCardsCountAt(limit);
@@ -946,8 +970,8 @@ if (Meteor.isServer) {
 if (Meteor.isServer) {
   // Middleware which checks that API is enabled.
   JsonRoutes.Middleware.use(function(req, res, next) {
-    const api = req.url.search('api');
-    if ((api === 1 && process.env.WITH_API === 'true') || api === -1) {
+    const api = req.url.startsWith('/api');
+    if ((api === true && process.env.WITH_API === 'true') || api === false) {
       return next();
     } else {
       res.writeHead(301, { Location: '/' });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.04.0",
+  "version": "v3.11.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

public/api/wekan.html

@@ -1524,7 +1524,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v3.00">Wekan REST API v3.00</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v3.11">Wekan REST API v3.11</a>
             
           </li>
         
@@ -2017,7 +2017,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v3.00</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v3.11</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>

public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v3.00
+  version: v3.11
   description: |
     The REST API allows you to control and extend Wekan with ease.
 

releases/delete-phantomjs.sh

@@ -0,0 +1,3 @@
+cd ~/repos/wekan/.build
+find . -name "*phantomjs*" | xargs rm -rf
+cd ~/repos/wekan

releases/release-bundle.sh

@@ -0,0 +1,7 @@
+cd ~/repos/wekan
+./releases/rebuild-release.sh
+./releases/delete-phantomjs.sh
+cd ~/repos/wekan/.build
+zip -r wekan-$1.zip bundle
+scp wekan-$1.zip x2:/var/snap/wekan/common/releases.wekan.team/
+cd ..

releases/version.sh

@@ -0,0 +1,9 @@
+# Change version.
+# Usage:   ./releases/version.sh old new
+# Example: ./releases/version.sh v3.x v3.x
+
+sed -i 's|API $1|API $2|g' public/api/wekan*
+sed -i 's|"version": "$1|"version": "$2|g' .meteor-1.6-snap/package-lock.json .meteor-1.6-snap/package.json package-lock.json package.json
+sed -i 's|appVersion: "$1|appVersion: "$2|g' Stackerfile.yml
+
+echo "Also change CHANGELOG.md and sandstorm-pkgdef.capnp"

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 = 306,
+    appVersion = 313,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "3.04.0~2019-08-06"),
+    appMarketingVersion = (defaultText = "3.11.0~2019-08-07"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

server/publications/boards.js

@@ -9,7 +9,7 @@ Meteor.publish('boards', function() {
 
   // Defensive programming to verify that starredBoards has the expected
   // format -- since the field is in the `profile` a user can modify it.
-  const { starredBoards = [] } = Users.findOne(this.userId).profile || {};
+  const { starredBoards = [] } = Users.findOne(this.userId).profile || [];
   check(starredBoards, [String]);
 
   return Boards.find(

snap-src/bin/config

@@ -344,7 +344,7 @@ KEY_LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT="ldap-group-filter-member-format"
 
 DESCRIPTION_LDAP_GROUP_FILTER_GROUP_NAME="ldap-group-filter-group-name. Default: ''"
 DEFAULT_LDAP_GROUP_FILTER_GROUP_NAME=""
-KEY_LDAP_GROUP_FILTER_GROUP_NAME="ldap-group-filter-member-name"
+KEY_LDAP_GROUP_FILTER_GROUP_NAME="ldap-group-filter-group-name"
 
 DESCRIPTION_LDAP_UNIQUE_IDENTIFIER_FIELD="This field is sometimes class GUID (Globally Unique Identifier)"
 DEFAULT_LDAP_UNIQUE_IDENTIFIER_FIELD=""

snapcraft.yaml

@@ -107,7 +107,7 @@ parts:
             rm -rf .meteor
             mv .meteor-1.6-snap/.meteor .
             mv .meteor-1.6-snap/package.json .
-            mv .meteor-1.6-snap/package-lock.json .
+            #mv .meteor-1.6-snap/package-lock.json .
             mv .meteor-1.6-snap/rebuild-wekan.sh .
             rm -rf .meteor-1.6-snap
             # Create the OpenAPI specification

stacksmith/user-scripts/build.sh

@@ -79,4 +79,8 @@ sudo rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/raj
 cd /home/wekan/app_build/bundle/programs/server/
 sudo npm install
 sudo chown -R wekan:wekan ./node_modules
+
+#cd /home/wekan/app_build/bundle
+#find . -name "*phantomjs*" | sudo xargs rm -rf
+
 sudo mv /home/wekan/app_build/bundle /build