Commit Graph

8957 Commits

Author SHA1 Message Date
Belén Curcio f23bdd91bf Merge branch 'master' into hackday-upvote-downvote-ama 2018-03-21 16:12:05 -03: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
Wyatt Johnson 0b01700235 updated docs 2018-03-21 11:12:04 -06: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
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
Kim Gardner 26bc9fc94f Merge branch 'master' into patch-1 2018-03-21 11:58:00 -04: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
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
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
Kim Gardner 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 Gardner 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 Curcio 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
Kiwi 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
Chi Vinh Le d98e64d6d7 Deprecation stuff 2018-03-20 18:45:56 +01:00
Chi Vinh Le 84a79be9c1 Only use plugins_config in redux 2018-03-20 18:39:37 +01:00
Chi Vinh Le dbe80c40d7 Render when pluginsConfig changes 2018-03-20 18:25:04 +01:00
Chi Vinh Le db5eedf6a1 Merge branch 'slots-debug' of ssh://github.com/coralproject/talk into slots-debug 2018-03-20 18:09:55 +01:00
Chi Vinh Le 1e743ea29d Merge branch 'master' into slots-debug 2018-03-20 18:08:59 +01:00
Kim Gardner 8fc69b0551 Translate Slot docs into English 2018-03-20 13:06:37 -04:00
Kim Gardner 88a80c8ffa Merge branch 'slots-debug' of git+ssh://github.com/coralproject/talk into slots-debug 2018-03-20 13:05:09 -04:00
Kim Gardner b2db0bb877 English version of docs 2018-03-20 13:04:13 -04:00
okbel 6c35f02e6b changes 2018-03-20 13:50:28 -03:00
okbel b6ba59ac51 using the plugins service 2018-03-20 13:19:20 -03:00
okbel 74d065ea84 Merge branch 'slots-debug' of github.com:coralproject/talk into slots-debug
* 'slots-debug' of github.com:coralproject/talk:
  some minor fixes
  Fix css order
  Fix rainbow emoji, add name of Part 2 tutorial
  Remove unwanted emptyline
  More comments
  Little Comment
  Cache babel-loader branch wide in CI
  Cache busting
  Extract css
2018-03-20 13:12:30 -03:00
okbel cd9c260995 refactor into using config reducer 2018-03-20 13:10:42 -03:00
Kim Gardner 0242e7b124 Merge pull request #1446 from coralproject/better-graph
Improve Slot and GraphQL framework
2018-03-20 12:07:52 -04:00