Commit Graph
9806 Commits
Author SHA1 Message Date
Kim GardnerandGitHub 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 GardnerandGitHub 8e3395d0e8 Merge branch 'master' into rte-rework 2018-03-21 17:14:02 -04:00
Kim GardnerandGitHub 5b436e3c4a Merge pull request #1453 from coralproject/hackday-upvote-downvote-ama
Upvote and Downvote
2018-03-21 17:13:48 -04:00
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 bce56f2719 Merge branch 'master' into rte-rework 2018-03-21 16:42:54 -04:00
Kim GardnerandGitHub 1928bc3819 Merge branch 'master' into update-default-plugins 2018-03-21 16:42:38 -04: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
Kim GardnerandGitHub 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 GardnerandGitHub 937ee5ea67 Merge branch 'master' into update-default-plugins 2018-03-21 15:34:43 -04:00
Kim GardnerandGitHub 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 CurcioandGitHub 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 CurcioandGitHub 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 GardnerandGitHub f4575e2075 Merge branch 'master' into docs 2018-03-21 14:40:48 -04:00
Kim GardnerandGitHub 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 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
Chi Vinh Le 99955b82f5 Blockquote styling 2018-03-21 18:41:27 +01:00
Wyatt Johnson 0b01700235 updated docs 2018-03-21 11:12:04 -06:00
Kim GardnerandGitHub 92e910a53f Merge branch 'master' into rte-rework 2018-03-21 13:10:34 -04: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
Chi Vinh Le 68eddfa6bb Merge branch 'rte-rework' of ssh://github.com/coralproject/talk into rte-rework 2018-03-21 17:43:17 +01:00
Chi Vinh Le 1fa1077bb2 Fix normalizer 2018-03-21 17:35:39 +01:00
KiwiandGitHub 9c9e3bf798 Merge branch 'master' into rte-rework 2018-03-21 17:33:59 +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
Chi Vinh Le ae4cc3ba20 Typo 2018-03-21 17:27:31 +01:00
Chi Vinh Le 973e907275 Combine readme 2018-03-21 17:24:57 +01:00
Chi Vinh Le fa3633b29a Add placeholder to Coral RTE :-) 2018-03-21 17:15:57 +01:00
Chi Vinh Le 16c5a90736 Move label, placeholder strings to DraftArea 2018-03-21 17:01:02 +01:00
Kim GardnerandGitHub 26bc9fc94f Merge branch 'master' into patch-1 2018-03-21 11:58:00 -04:00
Chi Vinh Le 2e96ea0170 Port off topic tags to new api 2018-03-21 16:49:18 +01:00