Commit Graph

8881 Commits

Author SHA1 Message Date
Kim Gardner b2db0bb877 English version of docs 2018-03-20 13:04:13 -04:00
okbel 74d065ea84 Merge branch 'slots-debug' of github.com:coralproject/talk into slots-debug
* 'slots-debug' of github.com:coralproject/talk:
  some minor fixes
  Fix css order
  Fix rainbow emoji, add name of Part 2 tutorial
  Remove unwanted emptyline
  More comments
  Little Comment
  Cache babel-loader branch wide in CI
  Cache busting
  Extract css
2018-03-20 13:12:30 -03:00
okbel cd9c260995 refactor into using config reducer 2018-03-20 13:10:42 -03:00
okbel 030deb1b81 refactor into using config reducer 2018-03-20 12:09:32 -03:00
okbel d6fba2d515 refactor into using config reducer 2018-03-20 11:52:44 -03:00
Kim Gardner 17e02deecb Merge branch 'master' into slots-debug 2018-03-19 17:12:54 -04:00
Kim Gardner 55e829ca66 Merge pull request #1448 from coralproject/extract-css-n-caching
Extract CSS and Cache improvements
2018-03-19 17:12:24 -04:00
Kim Gardner f35c870da8 Merge branch 'master' into extract-css-n-caching 2018-03-19 15:38:35 -04:00
Kim Gardner 1ce9219dc5 Merge pull request #1449 from coralproject/docs-tweaks
Fix rainbow emoji, add name of Part 2 tutorial
2018-03-19 15:37:10 -04:00
Wyatt Johnson d70d5db685 Merge branch 'master' into extract-css-n-caching 2018-03-19 13:10:28 -06:00
Wyatt Johnson 58c5026fb7 some minor fixes 2018-03-19 13:00:41 -06:00
okbel 8a2fa2432f @Deprecated plugin_config 2018-03-19 15:26:18 -03:00
okbel 8fcbd4b4c4 Merge branch 'slots-debug' of github.com:coralproject/talk into slots-debug
* 'slots-debug' of github.com:coralproject/talk:
  Asset Manager Tutorial
  fixed some missing calls to service
  fixed bug with endpoint
  Restore the userCreated event
  moved user deletion into graph
2018-03-19 15:15:23 -03:00
okbel eb331551c5 support for both 2018-03-19 15:14:48 -03:00
okbel 346a099c1b changes - ready to be tested 2018-03-19 15:10:14 -03:00
Kim Gardner 9c6f4c2799 Merge branch 'master' into slots-debug 2018-03-19 13:54:16 -04:00
Belén Curcio 12cf5826f2 Merge branch 'master' into docs-tweaks 2018-03-19 14:52:21 -03:00
okbel 40782a5d0b Adding off method to the Stream Interface 2018-03-17 18:55:39 -03:00
okbel 0209cc5b13 refactor due to auth probs 2018-03-17 16:44:01 -03:00
okbel a700e91911 adding debugPlugins 2018-03-17 16:26:46 -03:00
okbel 96dff8ed25 wip :0 2018-03-16 20:16:28 -03:00
Kim Gardner f346cf4caf Merge pull request #1451 from coralproject/asset-manager-tutorial
Asset Manager Tutorial
2018-03-15 21:07:24 -04:00
Kim Gardner a84ad511e8 Merge branch 'master' into asset-manager-tutorial 2018-03-15 21:00:23 -04:00
Wyatt Johnson c9ec5ca2ce Merge pull request #1441 from coralproject/restore-new-user-event
Restore the userCreated event
2018-03-15 13:30:00 -06:00
Wyatt Johnson c27def3167 Asset Manager Tutorial 2018-03-15 12:46:02 -06:00
Kiwi cb6fe6fd16 Merge branch 'master' into restore-new-user-event 2018-03-15 18:47:26 +01:00
Kiwi 164c4e30b8 Merge branch 'master' into extract-css-n-caching 2018-03-15 17:50:24 +01:00
Wyatt Johnson 4a05a45379 Merge pull request #1440 from coralproject/del-user
User Delete
2018-03-15 10:01:55 -06:00
Kiwi cbe2725f00 Merge branch 'master' into restore-new-user-event 2018-03-15 16:57:06 +01:00
okbel 7d7e3f60d3 show dep message only once 2018-03-14 23:33:06 -03:00
okbel fb519286c3 Merge branch 'slots-debug' of github.com:coralproject/talk into slots-debug
* 'slots-debug' of github.com:coralproject/talk: (78 commits)
  added translations
  lint
  improved db query support, added tests
  added .vscode to gitignore
  Disallow logout from unauthenticated requests
  parse env json the same as the rest, with hjson
  Slack plugin fix
  disabled firefox local integration tests :(
  re-enabled headless support
  added logs to artifacts
  disable headless tests, run with full browsers
  applied fix to allow local run with firefox
  store test results as artifacts every time
  replaced circleci image with ours temp
  Update Comment.js
  Update UserDetailComment.js
  Update Comment.js
  Update UserDetailComment.js
  Remove curly quote
  Update sidebar
  ...
2018-03-14 23:22:24 -03:00
okbel 4f844dfd58 Adding deprecation notice 2018-03-14 22:38:27 -03:00
Belén Curcio 5cde5f89d4 Merge branch 'master' into slots-debug 2018-03-14 21:58:14 -03:00
Kiwi b64ab62807 Merge branch 'master' into extract-css-n-caching 2018-03-15 00:42:08 +01:00
Chi Vinh Le a23f4fd5db Fix css order 2018-03-15 00:40:10 +01:00
Kim Gardner 804711cac5 Merge branch 'master' into del-user 2018-03-14 18:30:41 -04:00
Kim Gardner 7c8305695c Merge pull request #1447 from coralproject/logout-bug
Logout Fix
2018-03-14 18:30:19 -04:00
Kim Gardner 21722d36ea Merge branch 'master' into restore-new-user-event 2018-03-14 18:19:29 -04:00
Kim Gardner 867a0d1ea7 Merge branch 'master' into logout-bug 2018-03-14 18:18:50 -04:00
Kim Gardner adbf041bbe Fix rainbow emoji, add name of Part 2 tutorial 2018-03-14 18:11:53 -04:00
Wyatt Johnson cc06808e9b Merge pull request #1442 from ollyd/master
Use asset.url as a fallback when asset.title is missing
2018-03-14 15:45:46 -06:00
Wyatt Johnson 8c7e8080c3 added translations 2018-03-14 15:13:44 -06:00
Wyatt Johnson bb1b265cae lint 2018-03-14 15:12:38 -06:00
Wyatt Johnson 6b486c86a5 Merge branch 'master' into master 2018-03-14 15:02:01 -06:00
Wyatt Johnson 6c591e803b Merge pull request #1427 from kitwestneat/name-collision
checks for and mitigates username collisions with new external users
2018-03-14 15:01:37 -06:00
Wyatt Johnson 2f1689d2ca Merge branch 'master' into name-collision 2018-03-14 14:55:54 -06:00
Wyatt Johnson 1a8006e3a3 improved db query support, added tests 2018-03-14 14:55:24 -06:00
Chi Vinh Le d58bc5cfb1 Remove unwanted emptyline 2018-03-14 20:46:53 +01:00
Chi Vinh Le 608db5cdb0 Merge branch 'extract-css-n-caching' of ssh://github.com/coralproject/talk into extract-css-n-caching 2018-03-14 20:43:50 +01:00
Chi Vinh Le 3d571a60c2 More comments 2018-03-14 20:43:27 +01:00