Commit Graph
8970 Commits
Author SHA1 Message Date
Kim GardnerandGitHub 9185d3df43 Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-21 17:06:16 -04:00
Kim GardnerandGitHub 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 GardnerandGitHub 11ca430ad9 Merge pull request #1465 from coralproject/mailer-template-fix
Mailer Template Fix
2018-03-21 16:42:26 -04:00
Kim GardnerandGitHub dc8f4a1765 Merge branch 'master' into mailer-template-fix 2018-03-21 16:35:34 -04:00
Kim GardnerandGitHub 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
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 GardnerandGitHub 5f526eb49c Merge pull request #1456 from coralproject/docs
GraphQL Docs Fixes
2018-03-21 15:34:27 -04:00
Belén CurcioandGitHub f23bdd91bf Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-21 16:12:05 -03:00
Kim GardnerandGitHub f4575e2075 Merge branch 'master' into docs 2018-03-21 14:40:48 -04:00
Kim GardnerandGitHub 1f0630d875 Merge pull request #1461 from coralproject/force-notification-settings
Notification Settings Pane Controls
2018-03-21 13:52:19 -04:00
Belén CurcioandGitHub 44a8e6eb8f Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-21 14:46:05 -03:00
Kim GardnerandGitHub 96865be27a Merge branch 'master' into force-notification-settings 2018-03-21 13:43:20 -04:00
Wyatt Johnson 0b01700235 updated docs 2018-03-21 11:12:04 -06:00
KiwiandGitHub 195bc1715b Merge pull request #1452 from coralproject/context-perf
Context Performance
2018-03-21 18:07:48 +01:00
Wyatt Johnson a43c173a12 Added support for forcing the notification settings pane 2018-03-21 11:04:41 -06:00
KiwiandGitHub a3ea964c15 Merge branch 'master' into context-perf 2018-03-21 17:54:34 +01:00
Kim GardnerandGitHub 9ba2ca9156 Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-21 12:32:18 -04:00
Kim GardnerandGitHub c4aa2fc141 Merge pull request #1458 from jkutianski/patch-1
change Facebook to Google+
2018-03-21 12:32:04 -04:00
Kim Gardner d9b0071edc Merge branch 'hackday-upvote-downvote-ama' of git+ssh://github.com/coralproject/talk into hackday-upvote-downvote-ama 2018-03-21 12:30:56 -04:00
Kim Gardner 7bef612ad0 Add TODOs for when we deprecate font awesome 2018-03-21 12:30:22 -04:00
Kim GardnerandGitHub 26bc9fc94f Merge branch 'master' into patch-1 2018-03-21 11:58:00 -04:00
Kim GardnerandGitHub 313c738b8b Merge pull request #1457 from coralproject/password-reset-fix
Password Reset Form Fix
2018-03-21 11:44:11 -04:00
Juan Pablo KutianskiandGitHub b43b67e8fa change Facebook to Google+ 2018-03-20 23:10:30 -03:00
Wyatt JohnsonandGitHub 638043632c Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-20 16:08:29 -06:00
Wyatt Johnson 3415163cfb changed name based on review 2018-03-20 16:07:42 -06:00
Wyatt Johnson db1934e897 fixed password reset email form 2018-03-20 16:04:41 -06:00
Wyatt JohnsonandGitHub 076a07fba4 Merge branch 'master' into docs 2018-03-20 15:42:16 -06:00
Wyatt Johnson ff24f521be fixed graphql docs, added graphql tutorial 2018-03-20 15:39:38 -06:00
KiwiandGitHub d4cfe5034f Merge branch 'master' into context-perf 2018-03-20 21:19:39 +01:00
Kim GardnerandGitHub ad418f49ba Merge pull request #1436 from coralproject/slots-debug
Upgrade for Debug Tools for Slots and Plugins
2018-03-20 16:19:09 -04:00
Kim Gardner 08978ba942 Merge branch 'slots-debug' of git+ssh://github.com/coralproject/talk into slots-debug 2018-03-20 16:09:51 -04:00
Kim GardnerandGitHub baca86f5be Merge branch 'master' into slots-debug 2018-03-20 16:09:49 -04:00
Kim Gardner db64f21beb Typo 2018-03-20 16:09:33 -04:00
Kim GardnerandGitHub 3ec6823a15 Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-20 15:50:23 -04:00
Kim GardnerandGitHub b4e8f2212c Merge pull request #1454 from coralproject/update-readme
Update README
2018-03-20 15:50:10 -04:00
Kim GardnerandGitHub 5ebfd14c84 Merge branch 'master' into update-readme 2018-03-20 15:42:24 -04:00
Kim GardnerandGitHub 5285670a56 Merge pull request #1455 from coralproject/removing-pell
Removing talk-plugin-rich-text-editor-pell from core
2018-03-20 15:42:08 -04:00
Kim GardnerandGitHub cf370d330d Merge branch 'master' into update-readme 2018-03-20 15:38:33 -04:00
Kim Gardner 2f9f72ccf3 Add most-liked back to gitignore oops 2018-03-20 15:14:19 -04:00
Kim Gardner cf6073e6a2 Merge branch 'hackday-upvote-downvote-ama' of git+ssh://github.com/coralproject/talk into hackday-upvote-downvote-ama 2018-03-20 15:08:16 -04:00
Kim Gardner 98b6ce066b Add package.json for each plugin 2018-03-20 15:03:12 -04:00
okbel 5cd2cce7d8 removing pell 2018-03-20 15:59:48 -03:00
Kim Gardner 025604c4cd Remove comments and example code 2018-03-20 14:53:28 -04:00
Belén CurcioandGitHub 6edb5923d7 Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-20 15:53:15 -03:00
Kim Gardner cd2426511c Remove dupe files 2018-03-20 14:08:23 -04:00
KiwiandGitHub 7e4feda033 Merge branch 'master' into context-perf 2018-03-20 19:07:37 +01:00
Chi Vinh Le d08aaecd12 Rerender all Slot Components when config changes 2018-03-20 19:00:19 +01:00