Merge branch 'devel'

CHANGELOG.md

@@ -1,3 +1,13 @@
+# v1.11 2018-06-30 Wekan release
+
+This release fixes the following bugs:
+
+* [Remove card shadow](https://github.com/wekan/wekan/pull/1726), Wekan users now prefer not to have it;
+* [Revert](https://github.com/wekan/wekan/commit/928d88cfe1da4187797519c929cd2fdd9ffe9c2e) previous
+  [Less margin-bottom after minicard](https://github.com/wekan/wekan/pull/1713).
+
+Thanks to GitHub users pravdomil and xet7 for their contributions.
+
 # v1.10 2018-06-28 Wekan release
 
 This release fixes the following bugs:

client/components/cards/minicard.styl

@@ -5,11 +5,11 @@
   position: relative
   display: flex
   align-items: center
-  margin-bottom: 2px
+  margin-bottom: 9px
 
   &.placeholder
     background: darken(white, 20%)
-    border-radius: 2px
+    border-radius: 9px
 
   &.ui-sortable-helper
     cursor: grabbing
@@ -37,7 +37,7 @@
   flex-wrap: wrap
   background-color: #fff
   min-height: 20px
-  box-shadow: 0 0px 16px rgba(0,0,0,0.15) inset
+  box-shadow: 0 1px 2px rgba(0,0,0,.15)
   border-radius: 2px
   color: #4d4d4d
   overflow: hidden

i18n/fr.i18n.json

@@ -100,7 +100,7 @@
     "boardMenuPopup-title": "Menu du tableau",
     "boards": "Tableaux",
     "board-view": "Vue du tableau",
-    "board-view-cal": "Calendar",
+    "board-view-cal": "Calendrier",
     "board-view-swimlanes": "Couloirs",
     "board-view-lists": "Listes",
     "bucket-example": "Comme « todo list » par exemple",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "The open-source Trello-like kanban",
   "private": true,
   "scripts": {

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 = 95,
+    appVersion = 96,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "1.10.0~2018-06-28"),
+    appMarketingVersion = (defaultText = "1.11.0~2018-06-30"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,