mirror of
https://github.com/wekan/wekan.git
synced 2025-04-20 12:07:11 -04:00
Merge branch 'devel' of https://github.com/wekan/wekan into devel
This commit is contained in:
Stephen Moloney
commit
5166395af1
6 changed files with 119 additions and 109 deletions
|
|
@ -12,3 +12,6 @@ notices-for-facebook-graph-api-2
|
|||
1.2.0-breaking-changes
|
||||
1.3.0-split-minifiers-package
|
||||
1.3.5-remove-old-dev-bundle-link
|
||||
1.4.0-remove-old-dev-bundle-link
|
||||
1.4.1-add-shell-server-package
|
||||
1.4.3-split-account-service-packages
|
||||
|
|
|
|||
|
|
@ -3,17 +3,17 @@
|
|||
# 'meteor add' and 'meteor remove' will edit this file for you,
|
||||
# but you can also edit it by hand.
|
||||
|
||||
meteor-base
|
||||
meteor-base@1.0.4
|
||||
|
||||
# Build system
|
||||
ecmascript
|
||||
stylus
|
||||
standard-minifier-css
|
||||
standard-minifier-js
|
||||
ecmascript@0.6.3
|
||||
stylus@2.513.9
|
||||
standard-minifier-css@1.3.4
|
||||
standard-minifier-js@1.2.3
|
||||
mquandalle:jade
|
||||
|
||||
# Polyfills
|
||||
es5-shim
|
||||
es5-shim@4.6.15
|
||||
|
||||
# Collections
|
||||
aldeed:collection2
|
||||
|
|
@ -24,30 +24,30 @@ dburles:collection-helpers
|
|||
idmontie:migrations
|
||||
matb33:collection-hooks
|
||||
matteodem:easy-search
|
||||
mongo
|
||||
mongo@1.1.16
|
||||
mquandalle:collection-mutations
|
||||
|
||||
# Account system
|
||||
accounts-password
|
||||
accounts-password@1.3.4
|
||||
kenton:accounts-sandstorm
|
||||
service-configuration
|
||||
service-configuration@1.0.11
|
||||
useraccounts:core
|
||||
useraccounts:unstyled
|
||||
useraccounts:flow-routing
|
||||
email
|
||||
email@1.1.18
|
||||
|
||||
# Utilities
|
||||
check
|
||||
jquery
|
||||
random
|
||||
reactive-dict
|
||||
session
|
||||
tracker
|
||||
underscore
|
||||
check@1.2.5
|
||||
jquery@1.11.10
|
||||
random@1.0.10
|
||||
reactive-dict@1.1.8
|
||||
session@1.1.7
|
||||
tracker@1.1.2
|
||||
underscore@1.0.10
|
||||
3stack:presence
|
||||
alethes:pages
|
||||
arillo:flow-router-helpers
|
||||
audit-argument-checks
|
||||
audit-argument-checks@1.0.7
|
||||
kadira:blaze-layout
|
||||
kadira:dochead
|
||||
meteorhacks:fast-render
|
||||
|
|
@ -61,7 +61,7 @@ tap:i18n
|
|||
|
||||
# UI components
|
||||
blaze
|
||||
reactive-var
|
||||
reactive-var@1.0.11
|
||||
fortawesome:fontawesome
|
||||
mousetrap:mousetrap
|
||||
mquandalle:jquery-textcomplete
|
||||
|
|
@ -76,3 +76,4 @@ verron:autosize
|
|||
simple:json-routes
|
||||
rajit:bootstrap3-datepicker
|
||||
kadira:flow-router
|
||||
shell-server
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
METEOR@1.3.5.1
|
||||
METEOR@1.4.3.2
|
||||
|
|
|
|||
179
.meteor/versions
179
.meteor/versions
|
|
@ -1,26 +1,26 @@
|
|||
3stack:presence@1.0.5
|
||||
accounts-base@1.2.8
|
||||
accounts-password@1.1.13
|
||||
aldeed:collection2@2.9.1
|
||||
aldeed:collection2-core@1.1.1
|
||||
aldeed:schema-deny@1.0.1
|
||||
aldeed:schema-index@1.0.1
|
||||
accounts-base@1.2.15
|
||||
accounts-password@1.3.4
|
||||
aldeed:collection2@2.10.0
|
||||
aldeed:collection2-core@1.2.0
|
||||
aldeed:schema-deny@1.1.0
|
||||
aldeed:schema-index@1.1.1
|
||||
aldeed:simple-schema@1.5.3
|
||||
alethes:pages@1.8.6
|
||||
allow-deny@1.0.5
|
||||
arillo:flow-router-helpers@0.5.2
|
||||
audit-argument-checks@1.0.7
|
||||
autoupdate@1.2.11
|
||||
babel-compiler@6.8.5
|
||||
babel-runtime@0.1.9_1
|
||||
base64@1.0.9
|
||||
binary-heap@1.0.9
|
||||
blaze@2.1.8
|
||||
blaze-tools@1.0.9
|
||||
boilerplate-generator@1.0.9
|
||||
caching-compiler@1.0.6
|
||||
caching-html-compiler@1.0.6
|
||||
callback-hook@1.0.9
|
||||
autoupdate@1.3.12
|
||||
babel-compiler@6.14.1
|
||||
babel-runtime@1.0.1
|
||||
base64@1.0.10
|
||||
binary-heap@1.0.10
|
||||
blaze@2.3.2
|
||||
blaze-tools@1.0.10
|
||||
boilerplate-generator@1.0.11
|
||||
caching-compiler@1.1.9
|
||||
caching-html-compiler@1.1.2
|
||||
callback-hook@1.0.10
|
||||
cfs:access-point@0.1.49
|
||||
cfs:base-package@0.0.30
|
||||
cfs:collection@0.5.5
|
||||
|
|
@ -38,64 +38,64 @@ cfs:storage-adapter@0.2.3
|
|||
cfs:tempstore@0.1.5
|
||||
cfs:upload-http@0.0.20
|
||||
cfs:worker@0.1.4
|
||||
check@1.2.3
|
||||
check@1.2.5
|
||||
chuangbo:cookie@1.1.0
|
||||
coffeescript@1.1.4
|
||||
cottz:publish-relations@2.0.6
|
||||
dburles:collection-helpers@1.0.4
|
||||
coffeescript@1.12.3_1
|
||||
cottz:publish-relations@2.0.7
|
||||
dburles:collection-helpers@1.1.0
|
||||
ddp@1.2.5
|
||||
ddp-client@1.2.9
|
||||
ddp-common@1.2.6
|
||||
ddp-rate-limiter@1.0.5
|
||||
ddp-server@1.2.10
|
||||
ddp-client@1.3.3
|
||||
ddp-common@1.2.8
|
||||
ddp-rate-limiter@1.0.7
|
||||
ddp-server@1.3.13
|
||||
deps@1.0.12
|
||||
diff-sequence@1.0.6
|
||||
ecmascript@0.4.8
|
||||
ecmascript-runtime@0.2.12
|
||||
ejson@1.0.12
|
||||
email@1.0.16
|
||||
es5-shim@4.5.13
|
||||
fastclick@1.0.12
|
||||
fortawesome:fontawesome@4.5.0
|
||||
geojson-utils@1.0.9
|
||||
diff-sequence@1.0.7
|
||||
ecmascript@0.6.3
|
||||
ecmascript-runtime@0.3.15
|
||||
ejson@1.0.13
|
||||
email@1.1.18
|
||||
es5-shim@4.6.15
|
||||
fastclick@1.0.13
|
||||
fortawesome:fontawesome@4.7.0
|
||||
geojson-utils@1.0.10
|
||||
hot-code-push@1.0.4
|
||||
html-tools@1.0.10
|
||||
htmljs@1.0.10
|
||||
http@1.1.8
|
||||
id-map@1.0.8
|
||||
idmontie:migrations@1.0.1
|
||||
jquery@1.11.9
|
||||
html-tools@1.0.11
|
||||
htmljs@1.0.11
|
||||
http@1.2.12
|
||||
id-map@1.0.9
|
||||
idmontie:migrations@1.0.3
|
||||
jquery@1.11.10
|
||||
kadira:blaze-layout@2.3.0
|
||||
kadira:dochead@1.5.0
|
||||
kadira:flow-router@2.12.1
|
||||
kenton:accounts-sandstorm@0.5.1
|
||||
launch-screen@1.0.12
|
||||
kenton:accounts-sandstorm@0.6.0
|
||||
launch-screen@1.1.1
|
||||
livedata@1.0.18
|
||||
localstorage@1.0.11
|
||||
logging@1.0.14
|
||||
matb33:collection-hooks@0.8.1
|
||||
localstorage@1.0.12
|
||||
logging@1.1.17
|
||||
matb33:collection-hooks@0.8.4
|
||||
matteodem:easy-search@1.6.4
|
||||
mdg:validation-error@0.2.0
|
||||
meteor@1.1.16
|
||||
mdg:validation-error@0.5.1
|
||||
meteor@1.6.1
|
||||
meteor-base@1.0.4
|
||||
meteor-platform@1.2.6
|
||||
meteorhacks:aggregate@1.3.0
|
||||
meteorhacks:collection-utils@1.2.0
|
||||
meteorhacks:fast-render@2.14.0
|
||||
meteorhacks:fast-render@2.16.0
|
||||
meteorhacks:inject-data@2.0.0
|
||||
meteorhacks:meteorx@1.4.1
|
||||
meteorhacks:picker@1.0.3
|
||||
meteorhacks:subs-manager@1.6.4
|
||||
meteorspark:util@0.2.0
|
||||
minifier-css@1.1.13
|
||||
minifier-js@1.1.13
|
||||
minifier-css@1.2.16
|
||||
minifier-js@1.2.18
|
||||
minifiers@1.1.8-faster-rebuild.0
|
||||
minimongo@1.0.17
|
||||
mobile-status-bar@1.0.12
|
||||
modules@0.6.5
|
||||
modules-runtime@0.6.5
|
||||
mongo@1.1.9_1
|
||||
mongo-id@1.0.5
|
||||
minimongo@1.0.21
|
||||
mobile-status-bar@1.0.14
|
||||
modules@0.7.9
|
||||
modules-runtime@0.7.9
|
||||
mongo@1.1.16
|
||||
mongo-id@1.0.6
|
||||
mongo-livedata@1.0.12
|
||||
mousetrap:mousetrap@1.4.6_1
|
||||
mquandalle:autofocus@1.0.0
|
||||
|
|
@ -107,52 +107,55 @@ mquandalle:jquery-ui-drag-drop-sort@0.2.0
|
|||
mquandalle:moment@1.0.1
|
||||
mquandalle:mousetrap-bindglobal@0.0.1
|
||||
mquandalle:perfect-scrollbar@0.6.5_2
|
||||
npm-bcrypt@0.8.6_3
|
||||
npm-mongo@1.4.45
|
||||
observe-sequence@1.0.12
|
||||
npm-bcrypt@0.9.2
|
||||
npm-mongo@2.2.24
|
||||
observe-sequence@1.0.16
|
||||
ongoworks:speakingurl@1.1.0
|
||||
ordered-dict@1.0.8
|
||||
ordered-dict@1.0.9
|
||||
peerlibrary:assert@0.2.5
|
||||
peerlibrary:base-component@0.14.0
|
||||
peerlibrary:base-component@0.16.0
|
||||
peerlibrary:blaze-components@0.15.1
|
||||
peerlibrary:computed-field@0.3.1
|
||||
peerlibrary:reactive-field@0.1.0
|
||||
peerlibrary:computed-field@0.6.1
|
||||
peerlibrary:reactive-field@0.3.0
|
||||
perak:markdown@1.0.5
|
||||
promise@0.7.3
|
||||
promise@0.8.8
|
||||
raix:eventemitter@0.1.3
|
||||
raix:handlebar-helpers@0.2.5
|
||||
rajit:bootstrap3-datepicker@1.5.1
|
||||
rajit:bootstrap3-datepicker@1.6.4
|
||||
random@1.0.10
|
||||
rate-limit@1.0.5
|
||||
rate-limit@1.0.7
|
||||
reactive-dict@1.1.8
|
||||
reactive-var@1.0.10
|
||||
reload@1.1.10
|
||||
retry@1.0.8
|
||||
routepolicy@1.0.11
|
||||
reactive-var@1.0.11
|
||||
reload@1.1.11
|
||||
retry@1.0.9
|
||||
routepolicy@1.0.12
|
||||
seriousm:emoji-continued@1.4.0
|
||||
service-configuration@1.0.10
|
||||
session@1.1.6
|
||||
sha@1.0.8
|
||||
service-configuration@1.0.11
|
||||
session@1.1.7
|
||||
sha@1.0.9
|
||||
shell-server@0.2.3
|
||||
simple:json-routes@1.0.4
|
||||
softwarerero:accounts-t9n@1.3.4
|
||||
spacebars@1.0.12
|
||||
spacebars-compiler@1.0.12
|
||||
srp@1.0.9
|
||||
standard-minifier-css@1.0.8
|
||||
standard-minifier-js@1.0.8
|
||||
stylus@2.512.5
|
||||
softwarerero:accounts-t9n@1.3.9
|
||||
spacebars@1.0.15
|
||||
spacebars-compiler@1.1.2
|
||||
srp@1.0.10
|
||||
standard-minifier-css@1.3.4
|
||||
standard-minifier-js@1.2.3
|
||||
stylus@2.513.9
|
||||
tap:i18n@1.8.2
|
||||
templates:tabs@2.2.2
|
||||
templating@1.1.14
|
||||
templating-tools@1.0.4
|
||||
tracker@1.0.15
|
||||
ui@1.0.11
|
||||
underscore@1.0.9
|
||||
url@1.0.10
|
||||
templates:tabs@2.3.0
|
||||
templating@1.3.2
|
||||
templating-compiler@1.3.2
|
||||
templating-runtime@1.3.2
|
||||
templating-tools@1.1.2
|
||||
tracker@1.1.2
|
||||
ui@1.0.13
|
||||
underscore@1.0.10
|
||||
url@1.1.0
|
||||
useraccounts:core@1.14.2
|
||||
useraccounts:flow-routing@1.14.2
|
||||
useraccounts:unstyled@1.14.2
|
||||
verron:autosize@3.0.8
|
||||
webapp@1.2.11
|
||||
webapp@1.3.14
|
||||
webapp-hashing@1.0.9
|
||||
zimme:active-route@2.3.2
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
"eslint": "^2.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"babel-runtime": "^6.23.0",
|
||||
"meteor-node-stubs": "^0.2.6",
|
||||
"xss": "^0.3.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -205,7 +205,8 @@ if (isSandstorm && Meteor.isServer) {
|
|||
function updateUserPermissions(userId, permissions) {
|
||||
const isActive = permissions.indexOf('participate') > -1;
|
||||
const isAdmin = permissions.indexOf('configure') > -1;
|
||||
const permissionDoc = { userId, isActive, isAdmin };
|
||||
const isCommentOnly = false;
|
||||
const permissionDoc = { userId, isActive, isAdmin, isCommentOnly };
|
||||
|
||||
const boardMembers = Boards.findOne(sandstormBoard._id).members;
|
||||
const memberIndex = _.pluck(boardMembers, 'userId').indexOf(userId);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue