wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-19 11:28:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,813 Commits 10 Branches 125 Tags
bb1b265cae1bd8383c8f989a80e285c8689b5779
Commit Graph
8813 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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 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
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
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
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
Olly DuttonandGitHub 6efda40e29 Update Comment.js 
fix linting error
 2018-03-13 15:34:28 +11:00
Olly DuttonandGitHub 8e0c53ef3b Update UserDetailComment.js 
fix linting error
 2018-03-13 15:33:46 +11:00
Olly DuttonandGitHub bfb9ea1eea Update Comment.js 
Ternary to display asset url if there's no asset title in admin comments
 2018-03-13 12:18:21 +11:00
Olly DuttonandGitHub 93e850ba3f Update UserDetailComment.js 
Ternary to display asset url if there's no asset title in admin comments
 2018-03-13 12:16:59 +11:00
Kim GardnerandGitHub 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
Kit WestneatandGitHub 2cfbc1bb12 Merge branch 'master' into name-collision 2018-03-12 17:05:22 -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