Commit Graph
9233 Commits
Author SHA1 Message Date
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
Kim Gardner 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 Gardner 92e910a53f Merge branch 'master' into rte-rework 2018-03-21 13:10:34 -04:00
Kiwi 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
Kiwi 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
Kiwi 9c9e3bf798 Merge branch 'master' into rte-rework 2018-03-21 17:33:59 +01:00
Kim Gardner 9ba2ca9156 Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-21 12:32:18 -04:00
Kim Gardner 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 Gardner 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
Chi Vinh Le a4987f2947 Less deprecation messages 2018-03-21 16:48:28 +01:00
Chi Vinh Le 1256007eba New API for comment input tags 2018-03-21 16:46:08 +01:00
Kim Gardner 313c738b8b Merge pull request #1457 from coralproject/password-reset-fix
Password Reset Form Fix
2018-03-21 11:44:11 -04:00
Chi Vinh Le a73b93b0c3 Move label and placeholder to plugins 2018-03-21 16:04:03 +01:00
Chi Vinh Le 1ecc2a8f40 Remove rows 2018-03-21 15:46:00 +01:00
Chi Vinh Le 65778c31ff Refactor draft area api step 1 2018-03-21 15:41:27 +01:00
Chi Vinh Le f6e661090c Support preSubmit return input 2018-03-21 13:54:10 +01:00
Chi Vinh Le bd2fcf837a Move coral rte to talk-plugin-rich-text 2018-03-21 13:45:29 +01:00
Chi Vinh Le 44b5a122c5 Merge branch 'master' into coral-rte 2018-03-21 12:59:21 +01:00
Juan Pablo Kutianski b43b67e8fa change Facebook to Google+ 2018-03-20 23:10:30 -03:00
Wyatt Johnson 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 Johnson 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
Kiwi d4cfe5034f Merge branch 'master' into context-perf 2018-03-20 21:19:39 +01:00
Kim Gardner 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 Gardner 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 Gardner 3ec6823a15 Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-20 15:50:23 -04:00
Kim Gardner b4e8f2212c Merge pull request #1454 from coralproject/update-readme
Update README
2018-03-20 15:50:10 -04:00
Kim Gardner 5ebfd14c84 Merge branch 'master' into update-readme 2018-03-20 15:42:24 -04:00