Commit Graph
9233 Commits
Author SHA1 Message Date
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 3b2a9e5c75 improved context perf 2018-03-15 15:03:01 -06: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
Chi Vinh Le 9d9adc8195 Rename typo 2018-03-15 18:38:21 +01:00
Kiwi 164c4e30b8 Merge branch 'master' into extract-css-n-caching 2018-03-15 17:50:24 +01:00
Kiwi 82280a7da7 Merge branch 'master' into better-graph 2018-03-15 17:49:31 +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
Kim Gardner 40228a8ff4 Merge branch 'master' into better-graph 2018-03-14 17:13:30 -04: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
Kiwi 713f3230fe Merge branch 'master' into extract-css-n-caching 2018-03-14 20:39:43 +01:00
Chi Vinh Le 747817edd8 Little Comment 2018-03-14 20:31:16 +01:00
Chi Vinh Le 418a51cbb4 Cache babel-loader branch wide in CI 2018-03-14 20:28:22 +01:00
Chi Vinh Le f74641a548 Cache busting 2018-03-14 20:24:26 +01:00
Wyatt Johnson cbd3b2814e added .vscode to gitignore 2018-03-14 11:23:40 -06:00
Wyatt Johnson 4c2424c323 Merge branch 'master' into del-user 2018-03-14 11:08:35 -06:00
Wyatt Johnson bec3e94bbc Disallow logout from unauthenticated requests 2018-03-14 11:02:37 -06:00
Kiwi 784175ae0a Merge branch 'master' into better-graph 2018-03-14 17:35:12 +01:00
Kim Gardner 6a6b7eab7c Merge pull request #1438 from coralproject/docs-plugin-tutorial-part-1
Adding Plugin Tutorials to Docs
2018-03-14 11:26:21 -04:00
Wyatt Johnson 3bdded34b5 Merge branch 'master' into docs-plugin-tutorial-part-1 2018-03-14 09:19:16 -06:00
Chi Vinh Le 106b2faaf1 Extract css 2018-03-14 14:25:00 +01:00
Chi Vinh Le 3d8fc116a7 Fix defaultComponent bug 2018-03-14 11:32:13 +01:00
Chi Vinh Le ce70c9c925 Merge branch 'master' into better-graph 2018-03-14 09:59:50 +01:00
Kim Gardner 1f548e1c5e Merge branch 'master' into del-user 2018-03-13 21:21:05 -04:00
Kim Gardner 35207888da Merge pull request #1439 from coralproject/job-separation
Job Separation
2018-03-13 19:52:51 -04:00
Kim Gardner 50158d16aa Merge branch 'master' into job-separation 2018-03-13 19:32:45 -04:00