From 97f64fe5e6efa1643de78abaaaeeeb857f3025c5 Mon Sep 17 00:00:00 2001 From: hupptechnologies Date: Tue, 1 Jan 2019 16:35:18 +0530 Subject: [PATCH 1/5] Issue: Hard to use Wekan on mobile because of UI/UX issues #953 Resolved #953 --- .meteor/versions | 4 ---- client/components/cards/cardDetails.jade | 4 ++-- client/components/main/header.styl | 2 -- client/components/main/layouts.styl | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index e09ff33f2..8c5c1569b 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -179,8 +179,4 @@ useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 webapp@1.4.0 webapp-hashing@1.0.9 -wekan-scrollbar@3.1.3 -wekan:accounts-cas@0.1.0 -wekan:wekan-ldap@0.0.2 -yasaricli:slugify@0.0.7 zimme:active-route@2.3.2 diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index daeab7d3f..a6dc3dde7 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -264,7 +264,7 @@ template(name="copyChecklistToManyCardsPopup") template(name="boardsAndLists") label {{_ 'boards'}}: - select.js-select-boards + select.js-select-boards(autofocus) each boards if $eq _id currentBoard._id option(value="{{_id}}" selected) {{_ 'current'}} @@ -302,7 +302,7 @@ template(name="cardMorePopup") span {{_ 'link-card'}} = ' ' i.fa.colorful(class="{{#if board.isPublic}}fa-globe{{else}}fa-lock{{/if}}") - input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}") + input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}" autofocus="autofocus") button.js-copy-card-link-to-clipboard(class="btn") {{_ 'copy-card-link-to-clipboard'}} span.clearfix br diff --git a/client/components/main/header.styl b/client/components/main/header.styl index 495716e1c..e3c7618d8 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -188,8 +188,6 @@ width: 100% padding: 10px 0px z-index: 30 - position: absolute - bottom: 0px ul width: calc(100% - 60px) diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl index 3457a028e..edbf759b4 100644 --- a/client/components/main/layouts.styl +++ b/client/components/main/layouts.styl @@ -385,8 +385,8 @@ a @media screen and (max-width: 800px) #content - margin: 1px 0px 49px 0px - height: calc(100% - 96px) + margin: 1px 0px 0px 0px + height: calc(100% - 0px) > .wrapper margin-top: 0px From 88bdb0815d7c3bc017a248ba2c463e14d8eb7557 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 1 Jan 2019 13:40:22 +0200 Subject: [PATCH 2/5] Update translations (cs). --- i18n/cs.i18n.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index c3775d426..3f7124473 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -546,14 +546,14 @@ "r-moved-from": "Přesunuto z", "r-archived": "Moved to Archive", "r-unarchived": "Restored from Archive", - "r-a-card": "a card", + "r-a-card": "karta", "r-when-a-label-is": "When a label is", "r-when-the-label-is": "When the label is", "r-list-name": "Název sloupce", "r-when-a-member": "When a member is", "r-when-the-member": "When the member", "r-name": "name", - "r-is": "is", + "r-is": "je", "r-when-a-attach": "When an attachment", "r-when-a-checklist": "Když zaškrtávací seznam je", "r-when-the-checklist": "Když zaškrtávací seznam", @@ -561,8 +561,8 @@ "r-made-incomplete": "Made incomplete", "r-when-a-item": "Když položka zaškrtávacího seznamu je", "r-when-the-item": "Když položka zaškrtávacího seznamu", - "r-checked": "Checked", - "r-unchecked": "Unchecked", + "r-checked": "Zaškrtnuto", + "r-unchecked": "Odškrtnuto", "r-move-card-to": "Move card to", "r-top-of": "Top of", "r-bottom-of": "Bottom of", @@ -573,11 +573,11 @@ "r-add": "Přidat", "r-remove": "Odstranit", "r-label": "label", - "r-member": "member", + "r-member": "člen", "r-remove-all": "Remove all members from the card", "r-checklist": "zaškrtávací seznam", - "r-check-all": "Check all", - "r-uncheck-all": "Uncheck all", + "r-check-all": "Zaškrtnout vše", + "r-uncheck-all": "Odškrtnout vše", "r-items-check": "položky zaškrtávacího seznamu", "r-check": "Check", "r-uncheck": "Uncheck", From 6259f0de70dbf25853bbdef8537b814dbedbe7cd Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 1 Jan 2019 13:42:13 +0200 Subject: [PATCH 3/5] - Add removed packages back. Thanks to xet7 ! --- .meteor/versions | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.meteor/versions b/.meteor/versions index 8c5c1569b..e09ff33f2 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -179,4 +179,8 @@ useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 webapp@1.4.0 webapp-hashing@1.0.9 +wekan-scrollbar@3.1.3 +wekan:accounts-cas@0.1.0 +wekan:wekan-ldap@0.0.2 +yasaricli:slugify@0.0.7 zimme:active-route@2.3.2 From 991843acb06f535e197e40342ff22fda261021ae Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 1 Jan 2019 14:03:24 +0200 Subject: [PATCH 4/5] - [Mobile fixes](https://github.com/wekan/wekan/pull/2084), thanks to hupptechnologies: - Move home button / avatar bar from bottom to top. So at top first is home button / avatar, then others. - When clicking Move Card, go to correct page position. Currently it's at empty page position, and there is need to scroll page up to see Move Card options. It should work similarly like Copy Card, that is visible. - Also check that other buttons go to visible page. --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82e984211..cb2a59d05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ This release adds the following new features: and fixes the following bugs: - docker-compose.yml back to MongoDB 3.2.21 because 3.2.22 MongoDB container does not exist yet. Thanks to xet7. +- [Mobile fixes](https://github.com/wekan/wekan/pull/2084), thanks to hupptechnologies: + - Move home button / avatar bar from bottom to top. So at top first is home button / avatar, then others. + - When clicking Move Card, go to correct page position. Currently it's at empty page position, and there is + need to scroll page up to see Move Card options. It should work similarly like Copy Card, that is visible. + - Also check that other buttons go to visible page. Thanks to above GitHub users for their contributions. From 1683bcb3e5980d3af4a07c4bb22e534b98eff862 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 1 Jan 2019 14:08:44 +0200 Subject: [PATCH 5/5] v1.98 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- stacksmith/user-scripts/build.sh | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb2a59d05..e59520e27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v1.98 2019-01-01 Wekan release This release adds the following new features: diff --git a/Stackerfile.yml b/Stackerfile.yml index c1e2a0291..fcaa3e0ce 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v1.97.0" +appVersion: "v1.98.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 010acb4d6..7266a458f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v1.97.0", + "version": "v1.98.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index b90591a8f..0dab07a90 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 = 199, + appVersion = 200, # Increment this for every release. - appMarketingVersion = (defaultText = "1.97.0~2018-12-26"), + appMarketingVersion = (defaultText = "1.98.0~2019-01-01"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh index c3b80eacb..10823ab1d 100755 --- a/stacksmith/user-scripts/build.sh +++ b/stacksmith/user-scripts/build.sh @@ -19,11 +19,11 @@ sudo useradd --user-group --system --home-dir /home/wekan wekan sudo mkdir -p /home/wekan sudo chown wekan:wekan /home/wekan/ -# CURRENTLY BROKEN: meteor-1.8 branch that has newer Meteor that is compatible with MongoDB 4.x -# sudo -u wekan git clone -b meteor-1.8 https://github.com/wekan/wekan.git /home/wekan/app +# meteor-1.8 branch that has newer Meteor that is compatible with MongoDB 4.x +sudo -u wekan git clone -b meteor-1.8 https://github.com/wekan/wekan.git /home/wekan/app -# Using Meteor 1.6.x version of Wekan -sudo -u wekan git clone https://github.com/wekan/wekan.git /home/wekan/app +# OLD: Using Meteor 1.6.x version of Wekan +#sudo -u wekan git clone https://github.com/wekan/wekan.git /home/wekan/app sudo yum install -y ${BUILD_DEPS}