Commit Graph

9026 Commits

Author SHA1 Message Date
Kim Gardner ef11a27e1d Merge branch 'master' into docs-plug 2018-03-22 18:35:42 -04:00
Kim Gardner 752c16f513 Move Plugin Client and Slots docs to API section 2018-03-22 18:35:14 -04:00
Kim Gardner 6844960300 Merge pull request #1473 from coralproject/email-verification
Email Verification Copy
2018-03-22 15:16:01 -04:00
Wyatt Johnson 34fa2fb891 Verification link copy 2018-03-22 12:50:37 -06:00
okbel 64094c40db More 2018-03-22 12:38:33 -03:00
okbel 1fc7500837 More 2018-03-22 12:36:46 -03:00
okbel 773c843834 Click Outside 2018-03-22 11:59:33 -03:00
Belén Curcio a4c2b879ea Merge branch 'master' into docs-plug 2018-03-22 11:46:39 -03:00
Kim Gardner b65e7a0ad9 Merge pull request #1469 from coralproject/fix-typo
Fix typos
2018-03-21 19:15:48 -04:00
Kim Gardner 678f535500 Fix typos 2018-03-21 19:08:13 -04:00
Wyatt Johnson 47a2c5a174 Merge pull request #1463 from coralproject/update-default-plugins
Update default plugins
2018-03-21 16:43:54 -06:00
Kim Gardner cb59d51a74 Merge branch 'master' into update-default-plugins 2018-03-21 18:33:08 -04:00
Wyatt Johnson b9420406ed removed rich text from defaults 2018-03-21 16:26:54 -06:00
Kim Gardner 5491ac034c Merge branch 'update-default-plugins' of git+ssh://github.com/coralproject/talk into update-default-plugins 2018-03-21 18:26:26 -04:00
Kim Gardner 3799495929 Remove rich text from default for now 2018-03-21 18:25:47 -04:00
Kim Gardner 5463959347 Merge pull request #1468 from coralproject/docs
Updated Notifications Docs
2018-03-21 18:18:36 -04:00
Wyatt Johnson eab17b4c1d Merge branch 'master' into docs 2018-03-21 16:10:12 -06:00
Wyatt Johnson ad1ea9a810 Updated Notifications Docs 2018-03-21 16:09:02 -06:00
Kim Gardner 101450273a Merge branch 'master' into docs-plug 2018-03-21 17:49:11 -04:00
Kim Gardner 5a2212846d Merge branch 'master' into update-default-plugins 2018-03-21 17:40:18 -04:00
Kim Gardner 6ee4a258ff Merge pull request #1460 from coralproject/rte-rework
Comment Drafting and Editing Refactor + Coral RTE
2018-03-21 17:39:56 -04:00
Kim Gardner 8e3395d0e8 Merge branch 'master' into rte-rework 2018-03-21 17:14:02 -04:00
Kim Gardner 5b436e3c4a Merge pull request #1453 from coralproject/hackday-upvote-downvote-ama
Upvote and Downvote
2018-03-21 17:13:48 -04:00
Kim Gardner 9185d3df43 Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-21 17:06:16 -04:00
Kim Gardner 822c605103 Merge pull request #1467 from coralproject/dep-fix
Fixed misplaced deps
2018-03-21 17:05:49 -04:00
Wyatt Johnson 273cc9927a Fixed misplaced deps 2018-03-21 14:51:05 -06:00
Kim Gardner bce56f2719 Merge branch 'master' into rte-rework 2018-03-21 16:42:54 -04:00
Kim Gardner 1928bc3819 Merge branch 'master' into update-default-plugins 2018-03-21 16:42:38 -04:00
Kim Gardner 11ca430ad9 Merge pull request #1465 from coralproject/mailer-template-fix
Mailer Template Fix
2018-03-21 16:42:26 -04:00
Kim Gardner dc8f4a1765 Merge branch 'master' into mailer-template-fix 2018-03-21 16:35:34 -04:00
Kim Gardner ec493f9a3a Merge pull request #1466 from coralproject/dep-fix
Moved extract-text-webpack-plugin from devDependencies to dependencies
2018-03-21 16:33:35 -04:00
Kim Gardner 58899293af Merge branch 'master' into rte-rework 2018-03-21 16:19:59 -04:00
Wyatt Johnson bf37ab8c78 Moved extract-text-webpack-plugin from devDependencies to dependencies 2018-03-21 14:14:04 -06:00
Wyatt Johnson 881d7abfa6 replaced fs-extra call to fs 2018-03-21 13:58:22 -06:00
Wyatt Johnson bf54959ef5 Fix for template rendering 2018-03-21 13:56:16 -06:00
Kim Gardner 937ee5ea67 Merge branch 'master' into update-default-plugins 2018-03-21 15:34:43 -04:00
Kim Gardner 5f526eb49c Merge pull request #1456 from coralproject/docs
GraphQL Docs Fixes
2018-03-21 15:34:27 -04:00
Chi Vinh Le f3b379922b Merge branch 'rte-rework' of ssh://github.com/coralproject/talk into rte-rework 2018-03-21 20:12:48 +01:00
Belén Curcio f23bdd91bf Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-21 16:12:05 -03:00
Kim Gardner 24f9afd531 Update sidebar and add title info 2018-03-21 15:06:20 -04:00
Chi Vinh Le 78eb92e3ab Fix styling on admin site 2018-03-21 19:48:33 +01:00
Belén Curcio b7ff6f004d Merge branch 'master' into docs-plug 2018-03-21 15:45:49 -03:00
okbel 95934b87a4 Adding docs for plugins api 2018-03-21 15:43:40 -03:00
Kim Gardner f4575e2075 Merge branch 'master' into docs 2018-03-21 14:40:48 -04:00
Kim Gardner 694a9bb438 Merge branch 'master' into rte-rework 2018-03-21 14:40:08 -04:00
Chi Vinh Le 1aeae553e5 Add border radius 2018-03-21 19:24:36 +01:00
Kim Gardner cc0dcc1620 Update default plugins 2018-03-21 14:12:44 -04:00
Chi Vinh Le 483c21990f Merge branch 'rte-rework' of ssh://github.com/coralproject/talk into rte-rework 2018-03-21 18:56:25 +01:00
Kim Gardner 1f0630d875 Merge pull request #1461 from coralproject/force-notification-settings
Notification Settings Pane Controls
2018-03-21 13:52:19 -04:00
Belén Curcio 44a8e6eb8f Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-21 14:46:05 -03:00