Merge branch 'edge' into meteor-1.8

This commit is contained in:
Lauri Ojansivu 2019-01-01 14:10:10 +02:00
commit 98917523fc
9 changed files with 25 additions and 22 deletions

View file

@ -1,4 +1,4 @@
# Upcoming Wekan release
# v1.98 2019-01-01 Wekan release
This release adds the following new features:
@ -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.

View file

@ -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

View file

@ -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

View file

@ -188,8 +188,6 @@
width: 100%
padding: 10px 0px
z-index: 30
position: absolute
bottom: 0px
ul
width: calc(100% - 60px)

View file

@ -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

View file

@ -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",

View file

@ -1,6 +1,6 @@
{
"name": "wekan",
"version": "v1.97.0",
"version": "v1.98.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {

View file

@ -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,

View file

@ -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}