Commit Graph
8855 Commits
Author SHA1 Message Date
Wyatt Johnson ff24f521be fixed graphql docs, added graphql tutorial 2018-03-20 15:39:38 -06:00
Kim GardnerandGitHub 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 GardnerandGitHub f35c870da8 Merge branch 'master' into extract-css-n-caching 2018-03-19 15:38:35 -04:00
Kim GardnerandGitHub 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 JohnsonandGitHub 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
Belén CurcioandGitHub 12cf5826f2 Merge branch 'master' into docs-tweaks 2018-03-19 14:52:21 -03:00
Kim GardnerandGitHub f346cf4caf Merge pull request #1451 from coralproject/asset-manager-tutorial
Asset Manager Tutorial
2018-03-15 21:07:24 -04:00
Kim GardnerandGitHub a84ad511e8 Merge branch 'master' into asset-manager-tutorial 2018-03-15 21:00:23 -04:00
Wyatt JohnsonandGitHub 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
KiwiandGitHub cb6fe6fd16 Merge branch 'master' into restore-new-user-event 2018-03-15 18:47:26 +01:00
KiwiandGitHub 164c4e30b8 Merge branch 'master' into extract-css-n-caching 2018-03-15 17:50:24 +01:00
Wyatt JohnsonandGitHub 4a05a45379 Merge pull request #1440 from coralproject/del-user
User Delete
2018-03-15 10:01:55 -06:00
KiwiandGitHub cbe2725f00 Merge branch 'master' into restore-new-user-event 2018-03-15 16:57:06 +01:00
KiwiandGitHub 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 GardnerandGitHub 804711cac5 Merge branch 'master' into del-user 2018-03-14 18:30:41 -04:00
Kim GardnerandGitHub 7c8305695c Merge pull request #1447 from coralproject/logout-bug
Logout Fix
2018-03-14 18:30:19 -04:00
Kim GardnerandGitHub 21722d36ea Merge branch 'master' into restore-new-user-event 2018-03-14 18:19:29 -04:00
Kim GardnerandGitHub 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 JohnsonandGitHub 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 JohnsonandGitHub 6b486c86a5 Merge branch 'master' into master 2018-03-14 15:02:01 -06:00
Wyatt JohnsonandGitHub 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 JohnsonandGitHub 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
KiwiandGitHub 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 JohnsonandGitHub 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
Kim GardnerandGitHub 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 JohnsonandGitHub 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
Kim GardnerandGitHub 1f548e1c5e Merge branch 'master' into del-user 2018-03-13 21:21:05 -04:00
Kim GardnerandGitHub 35207888da Merge pull request #1439 from coralproject/job-separation
Job Separation
2018-03-13 19:52:51 -04:00
Kim GardnerandGitHub 50158d16aa Merge branch 'master' into job-separation 2018-03-13 19:32:45 -04:00
Kim GardnerandGitHub 3c03999814 Merge pull request #1435 from coralproject/rte-upgrade
Rich Text Plugin Upgrade - Escaping <blockquote>
2018-03-13 19:32:23 -04:00
Kim GardnerandGitHub e25b2d01c2 Merge branch 'master' into del-user 2018-03-13 19:32:02 -04:00
Kim GardnerandGitHub 8db3f72bb4 Merge branch 'master' into restore-new-user-event 2018-03-13 19:31:50 -04:00
Kim GardnerandGitHub 5136683018 Merge branch 'master' into master 2018-03-13 19:31:43 -04:00
Kim GardnerandGitHub 94fa21c57f Merge branch 'master' into job-separation 2018-03-13 19:31:20 -04:00