Commit Graph

8833 Commits

Author SHA1 Message Date
okbel a700e91911 adding debugPlugins 2018-03-17 16:26:46 -03:00
okbel 96dff8ed25 wip :0 2018-03-16 20:16:28 -03: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
Kim Gardner 7c8305695c Merge pull request #1447 from coralproject/logout-bug
Logout Fix
2018-03-14 18:30:19 -04:00
Kim Gardner 867a0d1ea7 Merge branch 'master' into logout-bug 2018-03-14 18:18:50 -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
Wyatt Johnson cbd3b2814e added .vscode to gitignore 2018-03-14 11:23:40 -06:00
Wyatt Johnson bec3e94bbc Disallow logout from unauthenticated requests 2018-03-14 11:02:37 -06: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
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 9ed17dd949 Merge branch 'master' into slots-debug 2018-03-13 19:32:19 -04:00
Kim Gardner 5136683018 Merge branch 'master' into master 2018-03-13 19:31:43 -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 028f2a0d11 Merge branch 'master' into name-collision 2018-03-13 16:03:08 -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