wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-18 12:40:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,806 Commits 10 Branches 125 Tags
2eac8f48d623d717c4e5331ef79fe1b8d9061dfd
Commit Graph
9806 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
KiwiandGitHub 784175ae0a Merge branch 'master' into better-graph 2018-03-14 17:35:12 +01: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
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 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 9ed17dd949 Merge branch 'master' into slots-debug 2018-03-13 19:32:19 -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
Kim Gardner 8dfa9de3f8 Fix merge conflict 2018-03-13 19:29:14 -04:00
Kim GardnerandGitHub d2c8fa03a5 Merge branch 'master' into rte-upgrade 2018-03-13 19:24:30 -04:00
Wyatt JohnsonandGitHub 60c4f56132 Merge pull request #1445 from coralproject/slack-fix 
Slack plugin fix
 2018-03-13 17:10:03 -06:00
Wyatt JohnsonandGitHub 56fab6be6c Merge branch 'master' into slack-fix 2018-03-13 17:03:40 -06:00
Wyatt JohnsonandGitHub 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 JohnsonandGitHub 613688456a Merge branch 'master' into fixing-plugins-env-js 2018-03-13 16:51:10 -06:00
Wyatt JohnsonandGitHub ecb457fef3 Merge pull request #1437 from coralproject/docs-updates 
Docs updates
 2018-03-13 16:50:55 -06:00
Chi Vinh Le 73fce8624c Fix query data detection 2018-03-13 23:32:21 +01:00
Wyatt JohnsonandGitHub 965c6f2934 Merge branch 'master' into docs-updates 2018-03-13 16:31:51 -06:00
Wyatt JohnsonandGitHub c01de4f24d Merge pull request #1432 from coralproject/user-create 
Restored User Creation CLI
 2018-03-13 16:31:32 -06:00
Wyatt JohnsonandGitHub f49c095dfa Merge branch 'master' into user-create 2018-03-13 16:21:36 -06:00
Wyatt JohnsonandGitHub 6a02f666ea Merge pull request #1433 from memz/ar_translation 
Arabic Translation
 2018-03-13 16:21:18 -06:00
Chi Vinh Le 414b62ff66 Refactor talk-plugin-notifications using the new withGraphQLExtension 2018-03-13 23:11:27 +01:00
Wyatt JohnsonandGitHub 403c1996bf Merge branch 'master' into docs-updates 2018-03-13 16:03:56 -06:00
Wyatt JohnsonandGitHub 2cb8bf324f Merge branch 'master' into fixing-plugins-env-js 2018-03-13 16:03:22 -06:00
Wyatt JohnsonandGitHub 07bec45ff8 Merge branch 'master' into ar_translation 2018-03-13 16:03:14 -06:00
Wyatt JohnsonandGitHub 028f2a0d11 Merge branch 'master' into name-collision 2018-03-13 16:03:08 -06:00
Wyatt JohnsonandGitHub c402ef4a03 Merge branch 'master' into slack-fix 2018-03-13 16:02:49 -06:00
Wyatt JohnsonandGitHub 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