Merge branch 'admin' of github.com:coralproject/talk into admin

* 'admin' of github.com:coralproject/talk: (23 commits)
  [next] SSO Refactor (#1912)
  Upgrade rte (#1906)
  review: fixes
  Simplify getLevelClassName
  Refactor indent level className
  Remove unused line
  Give last level a display name
  More comments
  More comments
  Add some comments
  More tests
  Implement local reply list for last threading level
  fix: test fixes
  fix: test patches
  fix: fixed issues with sorting
  fix: addressed cursor issue
  fix: removed dead code comment
  fix: updated comment
  feat: prime current user in user cache
  feat: added root parent edge
  ...
This commit is contained in:
Belén Curcio
2018-09-26 16:33:07 -03:00
53 changed files with 4340 additions and 486 deletions
+3 -1
View File
@@ -52,6 +52,7 @@
"fs-extra": "^6.0.1",
"graphql": "^0.13.2",
"graphql-config": "^2.0.1",
"graphql-fields": "^1.1.0",
"graphql-playground-middleware-express": "^1.7.2",
"graphql-redis-subscriptions": "^1.5.0",
"graphql-tools": "^3.0.5",
@@ -79,6 +80,7 @@
"passport-strategy": "^1.0.0",
"performance-now": "^2.1.0",
"permit": "^0.2.4",
"striptags": "^3.1.1",
"subscriptions-transport-ws": "^0.9.12",
"tlds": "^1.203.1",
"uuid": "^3.3.2"
@@ -90,7 +92,7 @@
"@babel/polyfill": "7.0.0-beta.49",
"@babel/preset-env": "7.0.0-beta.49",
"@babel/preset-react": "7.0.0-beta.49",
"@coralproject/rte": "^0.10.11",
"@coralproject/rte": "^0.10.12",
"@types/bcryptjs": "^2.4.1",
"@types/bull": "^3.3.16",
"@types/bunyan": "^1.8.4",