Compare commits

...
27 Commits
Author SHA1 Message Date
Lauri Ojansivu b7562a7085 v4.18 2020-07-10 19:28:43 +03:00
Lauri Ojansivu 16a793e672 Update ChangeLog. 2020-07-10 19:14:47 +03:00
Lauri Ojansivu 6e4407ed9c Upgrade to Node 12.18.2.
Thanks to Node developers and xet7 !
2020-07-10 19:11:46 +03:00
Lauri Ojansivu 05cd1247ab Update dependencies. 2020-07-10 19:04:46 +03:00
Lauri Ojansivu af240450d6 Update ChangeLog. 2020-07-10 19:01:51 +03:00
Lauri Ojansivu ba24c4e40c All logged in users are now allowed to reorder boards by dragging at All Boards page and Public Boards page.
Thanks to xet7 !

Fixes #3147
2020-07-10 18:56:26 +03:00
Lauri Ojansivu 2cbd7d83f9 Update ChangeLog. 2020-07-10 16:08:31 +03:00
Lauri Ojansivu 892008563b Update translations. 2020-07-10 16:08:03 +03:00
Lauri Ojansivu c7a40784e7 Merge pull request #3206 from salleman33/patch-2
Update users.js
2020-07-10 14:10:45 +03:00
Allemand c5e0832e00 Update users.js
issue #3099 : we have to delete the existing user, Account Service create it again
2020-07-10 10:06:39 +02:00
Lauri Ojansivu eb4219504d Update ChangeLog. 2020-06-29 06:15:08 -04:00
Lauri Ojansivu a5e5b44330 Merge pull request #3197 from Lua00808/fix-typo
Fix typo.
2020-06-29 06:11:47 -04:00
Lua00808 ee6852f8ea Fix typo. 2020-06-29 14:05:01 +09:00
Lauri Ojansivu 2575552e11 Update ChangeLog. 2020-06-28 06:44:56 -04:00
Lauri Ojansivu a77cf56fbd Fix running meteor for dev in rebuild-wekan.sh
Thanks to xet7 !
2020-06-28 06:42:05 -04:00
Lauri Ojansivu 07dfe33ed8 Merge branch 'master' of github.com:wekan/wekan 2020-06-28 05:55:45 -04:00
Lauri Ojansivu c8b21b2e17 Update translations. 2020-06-28 05:55:12 -04:00
Lauri Ojansivu 0be1c00fcc Fix start-wekan.bat
Thanks to xet7 !
2020-06-25 22:08:57 +03:00
Lauri Ojansivu 20edac091a Update translations. 2020-06-24 10:02:05 -04:00
Lauri Ojansivu 311c0d23a4 Add meteor ens3 Ethernet interface to rebuild-wekan.sh
Thanks to xet7 !
2020-06-24 10:00:53 -04:00
Lauri Ojansivu 032099cfbe v4.17 2020-06-18 02:33:01 +03:00
Lauri Ojansivu cd97cca7b8 Update ChangeLog. 2020-06-18 02:23:48 +03:00
Lauri Ojansivu 3f0fddf448 Merge branch 'marc1006-mobile_fix' 2020-06-18 02:18:58 +03:00
Lauri Ojansivu f1e103b082 Merge branch 'mobile_fix' of https://github.com/marc1006/wekan into marc1006-mobile_fix 2020-06-18 02:16:35 +03:00
Lauri Ojansivu afe00d02cd Add back checks about can user export CSV/TSV.
Thanks to marc1006 and xet7 !

Related #3173
2020-06-18 02:13:19 +03:00
Marc Hartmayer e21c078521 Fix activities view on mobile devices
Turns out that the sidebar is not available on mobile device therefore add
guards for this for now. This needs further investigation.
2020-06-18 01:07:56 +02:00
Lauri Ojansivu 5eb3784527 Revert users changes that were made at Wekan v4.16.
Thanks to xet7 !
2020-06-18 02:00:51 +03:00
36 changed files with 137 additions and 90 deletions

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
ENV \
DEBUG=false \
NODE_VERSION=12.18.1 \
NODE_VERSION=12.18.2 \
METEOR_RELEASE=1.10.2 \
USE_EDGE=false \
METEOR_EDGE=1.5-beta.17 \
+1 -1
View File
@@ -81,7 +81,7 @@ parts:
wekan:
source: .
plugin: nodejs
node-engine: 12.18.1
node-engine: 12.18.2
node-packages:
- node-gyp
- node-pre-gyp
+1 -1
View File
@@ -83,7 +83,7 @@ parts:
wekan:
source: .
plugin: nodejs
node-engine: 12.18.1
node-engine: 12.18.2
node-packages:
- node-gyp
- node-pre-gyp
+5 -5
View File
@@ -52,7 +52,7 @@ ddp@1.4.0
ddp-client@2.3.3
ddp-common@1.4.0
ddp-rate-limiter@1.0.7
ddp-server@2.3.1
ddp-server@2.3.2
deps@1.0.12
diff-sequence@1.1.1
dynamic-import@0.5.2
@@ -91,7 +91,7 @@ logging@1.1.20
lucasantoniassi:accounts-lockout@1.0.0
matb33:collection-hooks@0.9.1
matteodem:easy-search@1.6.4
mdg:meteor-apm-agent@3.2.5
mdg:meteor-apm-agent@3.2.6
mdg:validation-error@0.5.1
meteor@1.9.3
meteor-base@1.4.0
@@ -109,7 +109,7 @@ mobile-status-bar@1.1.0
modern-browsers@0.1.5
modules@0.15.0
modules-runtime@0.12.0
momentjs:moment@2.26.0
momentjs:moment@2.27.0
mongo@1.10.0
mongo-decimal@0.1.1
mongo-dev-server@1.1.0
@@ -169,7 +169,7 @@ spacebars-compiler@1.1.3
srp@1.1.0
standard-minifier-css@1.6.0
standard-minifier-js@2.6.0
staringatlights:fast-render@3.2.0
staringatlights:fast-render@3.3.0
staringatlights:inject-data@2.3.0
tap:i18n@1.8.2
templates:tabs@2.3.0
@@ -182,7 +182,7 @@ tracker@1.2.0
twbs:bootstrap@3.3.6
ui@1.0.13
underscore@1.0.10
url@1.3.0
url@1.3.1
useraccounts:core@1.14.2
useraccounts:flow-routing@1.14.2
useraccounts:unstyled@1.14.2
+1 -1
View File
@@ -3,7 +3,7 @@ sudo: required
env:
TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
TRAVIS_NODE_VERSION: 12.18.1
TRAVIS_NODE_VERSION: 12.18.2
TRAVIS_NPM_VERSION: latest
before_install:
+38
View File
@@ -1,3 +1,41 @@
# v4.18 2020-07-10 Wekan release
This release adds the following updates:
- [Upgrade to Node 12.18.2](https://github.com/wekan/wekan/commit/6e4407ed9cb3c95a99e0dbbb4383324dd57d6be1).
Thanks to Node developers and xet7.
- [Update dependencies](https://github.com/wekan/wekan/commit/05cd1247ab935f586d747743bb9cd79d23e0b1e6).
Thanks to dependency developers and xet7.
and fixes the following bugs:
- [All logged in users are now allowed to reorder boards by dragging at All Boards page and Public Boards page](https://github.com/wekan/wekan/commit/ba24c4e40c728d030504ed21ccf79247d0449e1b).
Thanks to xet7.
- [Fix running meteor for dev in rebuild-wekan.sh](https://github.com/wekan/wekan/commit/a77cf56fbdaf0b74d8b97aa41b0a88fee85e3ee1).
Thanks to xet7.
- [Fix start-wekan.bat](https://github.com/wekan/wekan/commit/0be1c00fccef8797a1b3612593a6623a9b465e0d) and
[Windows bundle install](https://github.com/wekan/wekan/wiki/Windows#a-bundle-with-windows-nodemongodb).
Thanks to xet7.
- [Fix typo](https://github.com/wekan/wekan/pull/3197).
Thanks to Lua00808.
- [Fix creating user misbehaving in some special case](https://github.com/wekan/wekan/pull/3206).
Thanks to salleman33.
Thanks to above GitHub users for their contributions and translators for their translations.
# v4.17 2020-06-18 Wekan release
This release fixes the following bugs:
- [Revert finding correct user changes that were made at Wekan v4.16](https://github.com/wekan/wekan/commit/5eb378452761ad1d6d67a491316007fdf6dfd689).
Thanks to xet7.
- [Fix activities view on mobile devices](https://github.com/wekan/wekan/pull/3183).
Thanks to marc1006.
- [Add back checks about can user export CSV/TSV](https://github.com/wekan/wekan/commit/afe00d02cddf016a3ccc1ed9a98a7f10d3339f26).
Thanks to marc1006 and xet7.
Thanks to above GitHub users for their contributions and translators for their translations.
# v4.16 2020-06-17 Wekan release
This release adds the following features:
+1 -1
View File
@@ -8,7 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
DEBUG=false \
NODE_VERSION=v12.18.1 \
NODE_VERSION=v12.18.2 \
METEOR_RELEASE=1.10.2 \
USE_EDGE=false \
METEOR_EDGE=1.5-beta.17 \
+2 -2
View File
@@ -4,7 +4,7 @@ FROM amd64/alpine:3.7 AS builder
ENV QEMU_VERSION=v4.2.0-6 \
QEMU_ARCHITECTURE=aarch64 \
NODE_ARCHITECTURE=linux-arm64 \
NODE_VERSION=v12.18.1 \
NODE_VERSION=v12.18.2 \
WEKAN_VERSION=3.96 \
WEKAN_ARCHITECTURE=arm64
@@ -40,7 +40,7 @@ LABEL maintainer="wekan"
# Set the environment variables (defaults where required)
ENV QEMU_ARCHITECTURE=aarch64 \
NODE_ARCHITECTURE=linux-arm64 \
NODE_VERSION=v12.18.1 \
NODE_VERSION=v12.18.2 \
NODE_ENV=production \
NPM_VERSION=latest \
WITH_API=true \
+1 -1
View File
@@ -1,5 +1,5 @@
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
appVersion: "v4.16.0"
appVersion: "v4.18.0"
files:
userUploads:
- README.md
+4 -1
View File
@@ -7,8 +7,9 @@ BlazeComponent.extendComponent({
// XXX Should we use ReactiveNumber?
this.page = new ReactiveVar(1);
this.loadNextPageLocked = false;
// TODO is sidebar always available? E.g. on small screens/mobile devices
const sidebar = Sidebar;
sidebar.callFirstWith(null, 'resetNextPeak');
sidebar && sidebar.callFirstWith(null, 'resetNextPeak');
this.autorun(() => {
let mode = this.data().mode;
const capitalizedMode = Utils.capitalize(mode);
@@ -29,6 +30,8 @@ BlazeComponent.extendComponent({
this.subscribe('activities', mode, searchId, limit, hideSystem, () => {
this.loadNextPageLocked = false;
// TODO the guard can be removed as soon as the TODO above is resolved
if (!sidebar) return;
// If the sibear peak hasn't increased, that mean that there are no more
// activities, and we can stop calling new subscriptions.
// XXX This is hacky! We need to know excatly and reactively how many
-6
View File
@@ -25,10 +25,6 @@ BlazeComponent.extendComponent({
},
onRendered() {
function userIsAllowedToMove() {
return Meteor.user();
}
const itemsSelector = '.js-board:not(.placeholder)';
const $boards = this.$('.js-boards');
@@ -77,8 +73,6 @@ BlazeComponent.extendComponent({
handle: '.board-handle',
});
}
$boards.sortable('option', 'disabled', !userIsAllowedToMove());
});
},
+1 -1
View File
@@ -180,7 +180,7 @@ services:
# that if you're using more than 1 instance of Wekan
# (or any MeteorJS based tool) you're supposed to set
# MONGO_OPLOG_URL as an environment variable.
# Without setting it, Meteor will perform a pull-and-diff
# Without setting it, Meteor will perform a poll-and-diff
# update of it's dataset. With it, Meteor will update from
# the OPLOG. See here
# https://blog.meteor.com/tuning-meteor-mongo-livedata-for-scalability-13fe9deb8908
+1 -1
View File
@@ -869,7 +869,7 @@ var expirationAuth = function expirationAuth() {
} // 326
// 327
// We are not on a secure line - so we have to look up the user... // 328
var user = Users.findOne({ // 329
var user = Meteor.users.findOne({ // 329
$or: [ // 330
{'services.resume.loginTokens.hashedToken': Accounts._hashLoginToken(userToken)}, // 331
{'services.resume.loginTokens.token': userToken} // 332
+1 -1
View File
@@ -809,5 +809,5 @@
"archived": "アーカイブ",
"delete-linked-card-before-this-card": "カード内にある、リンクされているカードを削除しなければ、このカードは削除できません",
"delete-linked-cards-before-this-list": "リスト内にある、他のカードを参照しているカードを削除しなければ、このリストは削除できません",
"hide-checked-items": "Hide checked items"
"hide-checked-items": "チェックした項目を隠す"
}
+8
View File
@@ -1219,6 +1219,14 @@ if (Meteor.isServer) {
fetch: ['members'],
});
// All logged in users are allowed to reorder boards by dragging at All Boards page and Public Boards page.
Boards.allow({
update(userId, board, fieldNames) {
return _.contains(fieldNames, 'sort');
},
fetch: [],
});
// The number of users that have starred this board is managed by trusted code
// and the user is not allowed to update it
Boards.deny({
+18 -16
View File
@@ -28,7 +28,7 @@ if (Meteor.isServer) {
const loginToken = req.query.authToken;
if (loginToken) {
const hashToken = Accounts._hashLoginToken(loginToken);
user = Users.findOne({
user = Meteor.users.findOne({
'services.resume.loginTokens.hashedToken': hashToken,
});
} else if (!Meteor.settings.public.sandstorm) {
@@ -69,7 +69,7 @@ if (Meteor.isServer) {
const loginToken = params.query.authToken;
if (loginToken) {
const hashToken = Accounts._hashLoginToken(loginToken);
user = Users.findOne({
user = Meteor.users.findOne({
'services.resume.loginTokens.hashedToken': hashToken,
});
} else if (!Meteor.settings.public.sandstorm) {
@@ -80,19 +80,21 @@ if (Meteor.isServer) {
});
}
const exporter = new Exporter(boardId);
//if (exporter.canExport(user)) {
body = params.query.delimiter
? exporter.buildCsv(params.query.delimiter)
: exporter.buildCsv();
//'Content-Length': body.length,
res.writeHead(200, {
'Content-Type': params.query.delimiter ? 'text/csv' : 'text/tsv',
});
res.write(body);
res.end();
//} else {
// res.writeHead(403);
// res.end('Permission Error');
//}
if (exporter.canExport(user)) {
body = params.query.delimiter
? exporter.buildCsv(params.query.delimiter)
: exporter.buildCsv();
res.writeHead(200, {
// Checking length does not work https://github.com/wekan/wekan/issues/3173
// so not using it here
//'Content-Length': body.length,
'Content-Type': params.query.delimiter ? 'text/csv' : 'text/tsv',
});
res.write(body);
res.end();
} else {
res.writeHead(403);
res.end('Permission Error');
}
});
}
+8 -7
View File
@@ -933,7 +933,7 @@ if (Meteor.isServer) {
user.authenticationMethod = 'oauth2';
// see if any existing user has this email address or username, otherwise create new
const existingUser = Users.findOne({
const existingUser = Meteor.users.findOne({
$or: [{ 'emails.address': email }, { username: user.username }],
});
if (!existingUser) return user;
@@ -947,6 +947,7 @@ if (Meteor.isServer) {
existingUser.authenticationMethod = user.authenticationMethod;
Meteor.users.remove({ _id: user._id });
Meteor.users.remove({ _id: existingUser._id }); // is going to be created again
return existingUser;
}
@@ -1277,7 +1278,7 @@ if (Meteor.isServer) {
JsonRoutes.add('GET', '/api/user', function(req, res) {
try {
Authentication.checkLoggedIn(req.userId);
const data = Users.findOne({ _id: req.userId });
const data = Meteor.users.findOne({ _id: req.userId });
delete data.services;
// get all boards where the user is member of
@@ -1368,7 +1369,7 @@ if (Meteor.isServer) {
return u;
});
const user = Users.findOne({ _id: id });
const user = Meteor.users.findOne({ _id: id });
user.boards = boards;
JsonRoutes.sendResult(res, {
code: 200,
@@ -1404,7 +1405,7 @@ if (Meteor.isServer) {
Authentication.checkUserId(req.userId);
const id = req.params.userId;
const action = req.body.action;
let data = Users.findOne({ _id: id });
let data = Meteor.users.findOne({ _id: id });
if (data !== undefined) {
if (action === 'takeOwnership') {
data = Boards.find(
@@ -1437,7 +1438,7 @@ if (Meteor.isServer) {
} else if (action === 'enableLogin') {
Users.update({ _id: id }, { $set: { loginDisabled: '' } });
}
data = Users.findOne({ _id: id });
data = Meteor.users.findOne({ _id: id });
}
}
JsonRoutes.sendResult(res, {
@@ -1481,7 +1482,7 @@ if (Meteor.isServer) {
const boardId = req.params.boardId;
const action = req.body.action;
const { isAdmin, isNoComments, isCommentOnly } = req.body;
let data = Users.findOne({ _id: userId });
let data = Meteor.users.findOne({ _id: userId });
if (data !== undefined) {
if (action === 'add') {
data = Boards.find({
@@ -1542,7 +1543,7 @@ if (Meteor.isServer) {
const userId = req.params.userId;
const boardId = req.params.boardId;
const action = req.body.action;
let data = Users.findOne({ _id: userId });
let data = Meteor.users.findOne({ _id: userId });
if (data !== undefined) {
if (action === 'remove') {
data = Boards.find({
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "wekan",
"version": "v4.16.0",
"version": "v4.18.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "wekan",
"version": "v4.16.0",
"version": "v4.18.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {
+2 -2
View File
@@ -252,13 +252,13 @@ const casValidate = (req, ticket, token, service, callback) => {
if (attrs.debug) {
console.log(`CAS response : ${JSON.stringify(result)}`);
}
let user = Users.findOne({ 'username': options.username });
let user = Meteor.users.findOne({ 'username': options.username });
if (! user) {
if (attrs.debug) {
console.log(`Creating user account ${JSON.stringify(options)}`);
}
const userId = Accounts.insertUserDoc({}, options);
user = Users.findOne(userId);
user = Meteor.users.findOne(userId);
}
if (attrs.debug) {
console.log(`Using user account ${JSON.stringify(user)}`);
+1 -1
View File
@@ -804,7 +804,7 @@ If, differently, you do something like this:
if (Meteor.isServer){
Meteor.methods({
"userExists": function(username){
return !!Users.findOne({username: username});
return !!Meteor.users.findOne({username: username});
},
});
}
@@ -10,7 +10,7 @@ Meteor.methods({
var userId = this.userId;
if (userId) {
var user = Users.findOne(userId);
var user = Meteor.users.findOne(userId);
var numServices = _.keys(user.services).length; // including "resume"
var unset = {};
@@ -80,7 +80,7 @@ AT.prototype._init = function() {
return Meteor.users.find(userId, {fields: {services: 1}});
/*
if (userId) {
var user = Users.findOne(userId);
var user = Meteor.users.findOne(userId);
var services_id = _.chain(user.services)
.keys()
.reject(function(service) {return service === "resume";})
@@ -124,7 +124,7 @@ Meteor.methods({
ATResendVerificationEmail: function (email) {
check(email, String);
var user = Users.findOne({ "emails.address": email });
var user = Meteor.users.findOne({ "emails.address": email });
// Send the standard error back to the client if no user exist with this e-mail
if (!user) {
+3 -3
View File
@@ -96,7 +96,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
log_info('Querying user');
log_debug('userQuery', userQuery);
user = Users.findOne(userQuery);
user = Meteor.users.findOne(userQuery);
}
// Attempt to find user by username
@@ -137,7 +137,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
log_debug('userQuery', userQuery);
user = Users.findOne(userQuery);
user = Meteor.users.findOne(userQuery);
}
// Attempt to find user by e-mail address only
@@ -159,7 +159,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
log_debug('userQuery', userQuery);
user = Users.findOne(userQuery);
user = Meteor.users.findOne(userQuery);
}
+3 -3
View File
@@ -234,7 +234,7 @@ export function syncUserData(user, ldapUser) {
const username = slug(getLdapUsername(ldapUser));
if (user && user._id && username !== user.username) {
log_info('Syncing user username', user.username, '->', username);
Users.findOne({ _id: user._id }, { $set: { username }});
Meteor.users.findOne({ _id: user._id }, { $set: { username }});
}
}
@@ -341,7 +341,7 @@ export function importNewUsers(ldap) {
}
// Add user if it was not added before
let user = Users.findOne(userQuery);
let user = Meteor.users.findOne(userQuery);
if (!user && username && LDAP.settings_get('LDAP_MERGE_EXISTING_USERS') === true) {
const userQuery = {
@@ -350,7 +350,7 @@ export function importNewUsers(ldap) {
log_debug('userQuery merge', userQuery);
user = Users.findOne(userQuery);
user = Meteor.users.findOne(userQuery);
if (user) {
syncUserData(user, ldapUser);
}
+2 -2
View File
@@ -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 v4.16">Wekan REST API v4.16</a>
<a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v4.18">Wekan REST API v4.18</a>
</li>
@@ -2027,7 +2027,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 v4.16</h1>
<h1 id="wekan-rest-api">Wekan REST API v4.18</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>
+1 -1
View File
@@ -1,7 +1,7 @@
swagger: '2.0'
info:
title: Wekan REST API
version: v4.16
version: v4.18
description: |
The REST API allows you to control and extend Wekan with ease.
+12 -6
View File
@@ -5,7 +5,7 @@ echo " with 'sudo dpkg-reconfigure locales' , so that MongoDB works correct
echo " You can still use any other locale as your main locale."
#Below script installs newest node 8.x for Debian/Ubuntu/Mint.
#NODE_VERSION=12.18.1
#NODE_VERSION=12.18.2
#X64NODE="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz"
function pause(){
@@ -64,7 +64,8 @@ function npm_call(){
echo
PS3='Please enter your choice: '
options=("Install Wekan dependencies" "Build Wekan" "Run Meteor for development on Ethernet IP address port 4000" "Run Meteor for development on Custom IP address and port" "Quit")
options=("Install Wekan dependencies" "Build Wekan" "Run Meteor for dev on http://localhost:4000" "Run Meteor for dev on http://CURRENT-IP-ADDRESS:4000" "Run Meteor for dev on http://CUSTOM-IP-ADDRESS:PORT" "Quit")
select opt in "${options[@]}"
do
case $opt in
@@ -79,7 +80,7 @@ do
curl -0 -L https://npmjs.org/install.sh | sudo sh
sudo chown -R $(id -u):$(id -g) $HOME/.npm
sudo npm -g install n
sudo n 12.18.1
sudo n 12.18.2
#curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
#sudo apt-get install -y nodejs
elif [[ "$OSTYPE" == "darwin"* ]]; then
@@ -166,13 +167,18 @@ do
break
;;
"Run Meteor for development on Ethernet IP address port 4000")
IPADDRESS=$(ip addr show enp2s0 | grep 'inet ' | cut -d: -f2 | awk '{ print $2}' | cut -d '/' -f 1)
"Run Meteor for dev on http://localhost:4000")
WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://localhost:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000
break
;;
"Run Meteor for dev on http://CURRENT-IP-ADDRESS:4000")
IPADDRESS=$(ip a | grep 'scope global' | grep 'inet ' | cut -d: -f2 | awk '{ print $2}' | cut -d '/' -f 1)
WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000
break
;;
"Run Meteor for development on Custom IP address and port")
"Run Meteor for dev on http://CUSTOM-IP-ADDRESS:PORT")
ip address
echo "From above list, what is your IP address?"
read IPADDRESS
+1 -1
View File
@@ -18,7 +18,7 @@ cd $REPODIR
rm -rf $WEKANDIR
git clone git@github.com:wekan/wekan.git
cd $WEKANDIR
sudo n 12.18.1
sudo n 12.18.2
sudo mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp
# Build Wekan
./releases/rebuild-release.sh
+2 -2
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 = 416,
appVersion = 418,
# Increment this for every release.
appMarketingVersion = (defaultText = "4.16.0~2020-06-17"),
appMarketingVersion = (defaultText = "4.18.0~2020-07-10"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,
+3 -3
View File
@@ -175,7 +175,7 @@ if (isSandstorm && Meteor.isServer) {
const users = {};
function ensureUserListed(userId) {
if (!users[userId]) {
const user = Users.findOne(userId);
const user = Meteor.users.findOne(userId);
if (user) {
users[userId] = { id: user.services.sandstorm.id };
} else {
@@ -217,7 +217,7 @@ if (isSandstorm && Meteor.isServer) {
'userId',
);
(comment.text.match(/\B@([\w.]*)/g) || []).forEach(username => {
const user = Users.findOne({
const user = Meteor.users.findOne({
username: username.slice(1),
});
if (user && activeMembers.indexOf(user._id) !== -1) {
@@ -368,7 +368,7 @@ if (isSandstorm && Meteor.isServer) {
if (newMethods[key].auth) {
newMethods[key].auth = function() {
const sandstormID = this.req.headers['x-sandstorm-user-id'];
const user = Users.findOne({
const user = Meteor.users.findOne({
'services.sandstorm.id': sandstormID,
});
return user && user._id;
+1 -1
View File
@@ -81,7 +81,7 @@ parts:
wekan:
source: .
plugin: nodejs
node-engine: 12.18.1
node-engine: 12.18.2
node-packages:
- node-gyp
- node-pre-gyp
+1 -1
View File
@@ -2,7 +2,7 @@
set -euxo pipefail
BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA"
NODE_VERSION=v12.18.1
NODE_VERSION=v12.18.2
#METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer
USE_EDGE=false
METEOR_EDGE=1.5-beta.17
Executable → Regular
+7 -12
View File
@@ -1,9 +1,4 @@
REM ------------------------------------------------------------
REM NOTE: THIS .BAT DOES NOT WORK !!
REM Use instead this webpage instructions to build on Windows:
REM https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows
REM Please add fix PRs, like config of MongoDB etc.
@ECHO OFF
REM ------------------------------------------------------------
@@ -12,11 +7,13 @@ REM SET DEBUG=true
REM ------------------------------------------------------------
SET ROOT_URL=http://localhost
SET PORT=80
SET MONGO_URL=mongodb://127.0.0.1:27017/wekan
SET ROOT_URL=http://127.0.0.1:2000/
SET MAIL_URL=smtp://user:pass@mailserver.example.com:25/
SET MAIL_FROM=admin@example.com
SET PORT=2000
REM https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
REM SET MAIL_URL=smtps://username:password@email-smtp.eu-west-1.amazonaws.com:587/
REM SET MAIL_FROM="Wekan Boards <info@example.com>"
REM # If you disable Wekan API with false, Export Board does not work.
SET WITH_API=true
@@ -395,6 +392,4 @@ REM # LOGOUT_ON_MINUTES : The number of minutes
REM # example : LOGOUT_ON_MINUTES=55
REM SET LOGOUT_ON_MINUTES=
cd .build\bundle
node main.js
cd ..\..
+1 -1
View File
@@ -173,7 +173,7 @@ services:
# that if you're using more than 1 instance of Wekan
# (or any MeteorJS based tool) you're supposed to set
# MONGO_OPLOG_URL as an environment variable.
# Without setting it, Meteor will perform a pull-and-diff
# Without setting it, Meteor will perform a poll-and-diff
# update of it's dataset. With it, Meteor will update from
# the OPLOG. See here
# https://blog.meteor.com/tuning-meteor-mongo-livedata-for-scalability-13fe9deb8908