Commit Graph

8807 Commits

Author SHA1 Message Date
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
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
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
Kim Gardner 3c03999814 Merge pull request #1435 from coralproject/rte-upgrade
Rich Text Plugin Upgrade - Escaping <blockquote>
2018-03-13 19:32:23 -04:00
Kim Gardner 94fa21c57f Merge branch 'master' into job-separation 2018-03-13 19:31:20 -04:00
Kim Gardner 8dfa9de3f8 Fix merge conflict 2018-03-13 19:29:14 -04:00
Kim Gardner d2c8fa03a5 Merge branch 'master' into rte-upgrade 2018-03-13 19:24:30 -04:00
Wyatt Johnson 60c4f56132 Merge pull request #1445 from coralproject/slack-fix
Slack plugin fix
2018-03-13 17:10:03 -06:00
Wyatt Johnson 56fab6be6c Merge branch 'master' into slack-fix 2018-03-13 17:03:40 -06:00
Wyatt Johnson 4fcdec92d8 Merge pull request #1434 from evgenykireev/fixing-plugins-env-js
do not use hjson for plugins.env.js
2018-03-13 17:03:18 -06:00
Wyatt Johnson a36960a6f0 parse env json the same as the rest, with hjson 2018-03-13 16:55:02 -06:00
Wyatt Johnson 613688456a Merge branch 'master' into fixing-plugins-env-js 2018-03-13 16:51:10 -06:00
Wyatt Johnson ecb457fef3 Merge pull request #1437 from coralproject/docs-updates
Docs updates
2018-03-13 16:50:55 -06:00
Wyatt Johnson 965c6f2934 Merge branch 'master' into docs-updates 2018-03-13 16:31:51 -06:00
Wyatt Johnson c01de4f24d Merge pull request #1432 from coralproject/user-create
Restored User Creation CLI
2018-03-13 16:31:32 -06:00
Wyatt Johnson f49c095dfa Merge branch 'master' into user-create 2018-03-13 16:21:36 -06:00
Wyatt Johnson 6a02f666ea Merge pull request #1433 from memz/ar_translation
Arabic Translation
2018-03-13 16:21:18 -06:00
Wyatt Johnson 403c1996bf Merge branch 'master' into docs-updates 2018-03-13 16:03:56 -06:00
Wyatt Johnson 2cb8bf324f Merge branch 'master' into fixing-plugins-env-js 2018-03-13 16:03:22 -06:00
Wyatt Johnson 07bec45ff8 Merge branch 'master' into ar_translation 2018-03-13 16:03:14 -06:00
Wyatt Johnson c402ef4a03 Merge branch 'master' into slack-fix 2018-03-13 16:02:49 -06:00
Wyatt Johnson ed16cd1d60 Merge pull request #1443 from coralproject/integration-fix
Integration Fixes
2018-03-13 16:01:49 -06:00
Wyatt Johnson 0dcb0bcaab Slack plugin fix 2018-03-13 16:01:38 -06:00
Wyatt Johnson a0d2a4147c disabled firefox local integration tests :( 2018-03-13 15:39:13 -06:00
Wyatt Johnson b6a2d791ec re-enabled headless support 2018-03-13 15:18:54 -06:00
Wyatt Johnson 7af9458710 added logs to artifacts 2018-03-13 14:46:00 -06:00
Wyatt Johnson 7598784acc disable headless tests, run with full browsers 2018-03-13 14:33:52 -06:00
Wyatt Johnson 8613ced71d applied fix to allow local run with firefox 2018-03-13 14:19:23 -06:00
Wyatt Johnson 1b3a74a011 store test results as artifacts every time 2018-03-13 13:33:45 -06:00
Wyatt Johnson 22e0aef306 replaced circleci image with ours temp 2018-03-13 12:13:21 -06:00
Kim Gardner 77839c1fbe Merge branch 'master' into rte-upgrade 2018-03-12 18:08:37 -04:00
Kim Gardner 940185d9b6 Remove curly quote 2018-03-12 17:54:51 -04:00
Kim Gardner 810d43cc6f Update sidebar 2018-03-12 17:35:22 -04:00
Kim Gardner a6adb0ceba Adding Part 2 2018-03-12 17:34:46 -04:00
Kim Gardner 4df803187f Relative link to Talk quickstart 2018-03-12 16:28:55 -04:00
Kim Gardner fd88ae9433 Change y to and 2018-03-12 16:26:47 -04:00
Kim Gardner 0937e8a946 Fix sidebar 2018-03-12 16:25:44 -04:00
Kim Gardner 686074f6cd Set max-width for images 2018-03-12 16:16:49 -04:00
Kim Gardner 931c21539b Create image folder and upload images 2018-03-12 16:16:33 -04:00
Kim Gardner 8fbbe62cdb Add Plugin Tutorial Part 1 2018-03-12 16:15:57 -04:00
Wyatt Johnson 96323de147 added option to disable jobs from starting 2018-03-12 14:10:51 -06:00
Wyatt Johnson 21e3e24d9f Docs updates 2018-03-12 12:26:26 -06:00