Skip to content
This repository has been archived by the owner on Jun 27, 2019. It is now read-only.

Commit

Permalink
Merge branch 'develop' into Centralize_read_me_content_to_docs.human_…
Browse files Browse the repository at this point in the history 
…connection.org
  • Loading branch information
@christianeiselt
christianeiselt authored Sep 20, 2018
2 parents e89c47d + 7c90c7a commit f3e6bf1
Show file tree
Hide file tree
Showing 5 changed files with 102 additions and 34 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ node_modules
.classpath
.c9/
.vscode
/.vs
*.launch
.settings/
*.sublime-workspace
Expand Down Expand Up @@ -123,3 +124,4 @@ rethinkdb_data
.env
/config/local.json
package-lock.json
/.github
1 change: 1 addition & 0 deletions docker-compose.override.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ services:
- .:/API
- /API/node_modules
command: yarn run dev
tty: true
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@
"crypto-js": "^3.1.9-1",
"dauria": "~2.0.0",
"email-templates": "2.6.0",
"feathers-authentication-hooks": "~0.3.0",
"feathers-authentication-hooks": "~0.3.1",
"feathers-authentication-management": "~2.0.1",
"feathers-blob": "~2.0.1",
"feathers-hooks-common": "~4.14.3",
"feathers-logger": "0.3.2",
"feathers-mailer": "~2.0.0",
"feathers-memory": "~2.1.3",
"feathers-mongodb": "~3.2.0",
"feathers-mongodb": "~3.3.0",
"feathers-mongodb-fuzzy-search": "~1.1.1",
"feathers-mongoose": "~6.1.2",
"feathers-profiler": "^0.1.5",
Expand Down Expand Up @@ -103,7 +103,7 @@
"babel-eslint": "~8.2.6",
"chai": "^4.1.2",
"cucumber": "^4.2.1",
"concurrently": "~3.6.1",
"concurrently": "~4.0.1",
"cross-env": "^5.2.0",
"eslint": "~4.19.1",
"istanbul": "1.1.0-alpha.1",
Expand Down
6 changes: 3 additions & 3 deletions server/models/invites.model.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
module.exports = function (app) {
const mongooseClient = app.get('mongooseClient');
const invites = new mongooseClient.Schema({
email: { type: String, required: true, unique: true },
code: { type: String, required: true },
email: { type: String, required: true, index: true, unique: true },
code: { type: String, index: true, required: true },
role: {
type: String,
enum: ['admin', 'moderator', 'manager', 'editor', 'user'],
Expand All @@ -15,7 +15,7 @@ module.exports = function (app) {
invitedByUserId: { type: String },
language: { type: String },
badgeIds: [],
wasUsed: { type: Boolean },
wasUsed: { type: Boolean, index: true },
createdAt: { type: Date, default: Date.now },
wasSeeded: { type: Boolean }
});
Expand Down
121 changes: 93 additions & 28 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@
version "1.4.1"
resolved "https://registry.yarnpkg.com/@feathersjs/commons/-/commons-1.4.1.tgz#81f19ffb83eac6afd33c629d4d0cad57441fbede"

"@feathersjs/commons@^1.4.4":
version "1.4.4"
resolved "https://registry.yarnpkg.com/@feathersjs/commons/-/commons-1.4.4.tgz#cd8c0a4dfc7ba1027d359ae80542381241564728"

"@feathersjs/configuration@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@feathersjs/configuration/-/configuration-1.0.2.tgz#18da733e908fc39726233dbae867c6b0eb3920cd"
Expand Down Expand Up @@ -1806,10 +1810,6 @@ commander@2.15.1:
version "2.15.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"

commander@2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"

commander@^2.15.1, commander@^2.9.0:
version "2.16.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50"
Expand Down Expand Up @@ -1865,19 +1865,19 @@ concat-stream@^1.5.2, concat-stream@^1.6.0, concat-stream@^1.6.2:
readable-stream "^2.2.2"
typedarray "^0.0.6"

concurrently@~3.6.1:
version "3.6.1"
resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.6.1.tgz#2f95baec5c4051294dfbb55b57a3b98a3e2b45ec"
concurrently@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-4.0.1.tgz#f6310fbadf2f476dd95df952edb5c0ab789f672c"
dependencies:
chalk "^2.4.1"
commander "2.6.0"
date-fns "^1.23.0"
lodash "^4.5.1"
read-pkg "^3.0.0"
rx "2.3.24"
lodash "^4.17.10"
read-pkg "^4.0.1"
rxjs "6.2.2"
spawn-command "^0.0.2-1"
supports-color "^3.2.3"
supports-color "^4.5.0"
tree-kill "^1.1.0"
yargs "^12.0.1"

config@^1.27.0:
version "1.30.0"
Expand Down Expand Up @@ -2151,6 +2151,12 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"

decamelize@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
dependencies:
xregexp "4.0.0"

decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
Expand Down Expand Up @@ -2821,9 +2827,9 @@ fast-safe-stringify@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.4.tgz#4fe828718aa61dbcf9119c3c24e79cc4dea973b2"

feathers-authentication-hooks@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/feathers-authentication-hooks/-/feathers-authentication-hooks-0.3.0.tgz#6320633aaaaf046d3bc5f4ead541362095487d4e"
feathers-authentication-hooks@~0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/feathers-authentication-hooks/-/feathers-authentication-hooks-0.3.1.tgz#a6c595ef626f5c289492d304ad6364ae547dae76"
dependencies:
"@feathersjs/errors" "^3.3.0"
debug "^3.1.0"
Expand Down Expand Up @@ -2905,14 +2911,14 @@ feathers-mongodb-fuzzy-search@~1.1.1:
feathers-commons "^0.8.7"
feathers-errors "^2.9.1"

feathers-mongodb@~3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/feathers-mongodb/-/feathers-mongodb-3.2.0.tgz#6df807c36733e70a8c5f8a1e9cb9cd1074e14aa5"
feathers-mongodb@~3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/feathers-mongodb/-/feathers-mongodb-3.3.0.tgz#5d24e285182bca03e1e994d17be5eb767588d962"
dependencies:
"@feathersjs/commons" "^1.3.0"
"@feathersjs/errors" "^3.2.0"
lodash.omit "^4.3.0"
uberproto "^2.0.0"
"@feathersjs/commons" "^1.4.4"
"@feathersjs/errors" "^3.3.0"
lodash.omit "^4.5.0"
uberproto "^2.0.4"

feathers-mongoose@~6.1.2:
version "6.1.2"
Expand Down Expand Up @@ -3480,6 +3486,10 @@ has-flag@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"

has-flag@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"

has-flag@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
Expand Down Expand Up @@ -4575,7 +4585,7 @@ lodash.unescape@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"

lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.1, lodash@~4.17.10:
lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"

Expand Down Expand Up @@ -5884,6 +5894,14 @@ read-pkg@^3.0.0:
normalize-package-data "^2.3.2"
path-type "^3.0.0"

read-pkg@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
dependencies:
normalize-package-data "^2.3.2"
parse-json "^4.0.0"
pify "^3.0.0"

readable-stream@1.1:
version "1.1.13"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
Expand Down Expand Up @@ -6234,14 +6252,16 @@ rx-lite@*, rx-lite@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"

rx@2.3.24:
version "2.3.24"
resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"

rx@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"

rxjs@6.2.2:
version "6.2.2"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
dependencies:
tslib "^1.9.0"

rxjs@^5.5.2:
version "5.5.11"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87"
Expand Down Expand Up @@ -6828,12 +6848,18 @@ supports-color@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"

supports-color@^3.1.2, supports-color@^3.2.3:
supports-color@^3.1.2:
version "3.2.3"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
dependencies:
has-flag "^1.0.0"

supports-color@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
dependencies:
has-flag "^2.0.0"

symbol-observable@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
Expand Down Expand Up @@ -7049,6 +7075,10 @@ trunc-text@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/trunc-text/-/trunc-text-1.0.1.tgz#58f876d8ac59b224b79834bb478b8656e69622b5"

tslib@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"

tunnel-agent@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
Expand Down Expand Up @@ -7092,6 +7122,10 @@ uberproto@^2.0.0, uberproto@^2.0.1, uberproto@^2.0.2:
version "2.0.3"
resolved "https://registry.yarnpkg.com/uberproto/-/uberproto-2.0.3.tgz#3414e4b63c1eafc65e2a21217b93ee553b2ca6e2"

uberproto@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/uberproto/-/uberproto-2.0.4.tgz#f215bcc227c1b8fd8fccd8d701b9c96dd71ff85d"

uglify-js@^2.6:
version "2.8.29"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
Expand Down Expand Up @@ -7434,6 +7468,10 @@ xmlhttprequest-ssl@~1.5.4:
version "1.5.5"
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"

xregexp@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"

xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
Expand All @@ -7442,6 +7480,10 @@ y18n@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"

"y18n@^3.2.1 || ^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"

yallist@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
Expand All @@ -7450,6 +7492,12 @@ yallist@^3.0.0, yallist@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"

yargs-parser@^10.1.0:
version "10.1.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
dependencies:
camelcase "^4.1.0"

yargs-parser@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
Expand Down Expand Up @@ -7485,6 +7533,23 @@ yargs@11.1.0:
y18n "^3.2.1"
yargs-parser "^9.0.2"

yargs@^12.0.1:
version "12.0.1"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2"
dependencies:
cliui "^4.0.0"
decamelize "^2.0.0"
find-up "^3.0.0"
get-caller-file "^1.0.1"
os-locale "^2.0.0"
require-directory "^2.1.1"
require-main-filename "^1.0.1"
set-blocking "^2.0.0"
string-width "^2.0.0"
which-module "^2.0.0"
y18n "^3.2.1 || ^4.0.0"
yargs-parser "^10.1.0"

yargs@^7.0.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
Expand Down

0 comments on commit f3e6bf1

Please # to comment.