wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-15 11:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,856 Commits 10 Branches 125 Tags
8fcbd4b4c48cc1c92e86e76dca90fbb9270a745f
Commit Graph
8856 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
okbel 8fcbd4b4c4 Merge branch 'slots-debug' of github.com:coralproject/talk into slots-debug 
* 'slots-debug' of github.com:coralproject/talk:
  Asset Manager Tutorial
  fixed some missing calls to service
  fixed bug with endpoint
  Restore the userCreated event
  moved user deletion into graph
 2018-03-19 15:15:23 -03:00
okbel eb331551c5 support for both 2018-03-19 15:14:48 -03:00
okbel 346a099c1b changes - ready to be tested 2018-03-19 15:10:14 -03:00
Kim GardnerandGitHub 9c6f4c2799 Merge branch 'master' into slots-debug 2018-03-19 13:54:16 -04:00
okbel 40782a5d0b Adding off method to the Stream Interface 2018-03-17 18:55:39 -03:00
okbel 0209cc5b13 refactor due to auth probs 2018-03-17 16:44:01 -03:00
okbel a700e91911 adding debugPlugins 2018-03-17 16:26:46 -03:00
okbel 96dff8ed25 wip :0 2018-03-16 20:16:28 -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
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
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 CurcioandGitHub 5cde5f89d4 Merge branch 'master' into slots-debug 2018-03-14 21:58:14 -03: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
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
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
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