Commit Graph

  • 0aaa52e01f Merge branch 'master' into dont-agree David Jay 2017-02-21 15:02:33 -05:00
  • 3377aa3da2 Displaying DontAgree actions as flags. David Jay 2017-02-21 14:55:00 -05:00
  • f76befd6ac no comments in user list Riley Davis 2017-02-21 12:48:01 -07:00
  • 1d8ce1ae34 Posting DontAgree actions. David Jay 2017-02-21 14:41:33 -05:00
  • 9000778d8f empty result for users in Community Riley Davis 2017-02-21 12:39:29 -07:00
  • e24a0caa20 add EmptyCard component. fix typos. more PropTypes. Riley Davis 2017-02-21 12:08:02 -07:00
  • 364cf1808e assets by like? Riley Davis 2017-02-21 10:28:33 -07:00
  • 17813e23a9 Merge pull request #327 from coralproject/error_translation_key David Erwin 2017-02-17 20:13:11 -05:00
  • 0563b93d39 Merge branch 'master' into error_translation_key David Erwin 2017-02-17 20:07:49 -05:00
  • df53b101ab Merge pull request #316 from coralproject/update-on-post-comment David Erwin 2017-02-17 20:07:40 -05:00
  • 6f17a84097 Merge branch 'master' into update-on-post-comment David Erwin 2017-02-17 20:02:41 -05:00
  • 09513c0e83 Merge pull request #329 from coralproject/docker-fixx Wyatt Johnson 2017-02-17 18:02:26 -07:00
  • 301c8e829f Added production flag back Wyatt Johnson 2017-02-17 17:56:44 -07:00
  • afcdacff0d Added yarn.lock to Dockerfile Wyatt Johnson 2017-02-17 17:49:59 -07:00
  • 8866366d3c storing my place in case we want to come back to this Riley Davis 2017-02-17 16:07:34 -07:00
  • a8396481f9 Merge pull request #328 from coralproject/graph-tests David Erwin 2017-02-17 18:01:17 -05:00
  • 4cccf09a87 spelling... Wyatt Johnson 2017-02-17 15:53:23 -07:00
  • 3e4dc9c8b2 Merge branch 'master' into graph-tests Wyatt Johnson 2017-02-17 15:50:21 -07:00
  • a00befafcb Initial graph tests Wyatt Johnson 2017-02-17 15:48:46 -07:00
  • 31dda920c6 Merge branch 'master' into error_translation_key Gabriela Rodríguez Berón 2017-02-17 14:30:00 -08:00
  • 9f168e627a It uses message and not translation key. gaba 2017-02-17 14:19:30 -08:00
  • 2506442453 toISOString Riley Davis 2017-02-17 14:10:21 -07:00
  • 6eb4725dd9 remove ternary from return statement Riley Davis 2017-02-17 14:03:37 -07:00
  • 5d1bc5fb5a Merge branch 'master' into update-on-post-comment David Erwin 2017-02-17 13:52:25 -05:00
  • 62ee81e5a9 Merge pull request #326 from coralproject/stream-settings David Erwin 2017-02-17 13:51:26 -05:00
  • 5a09beb727 It has to be translation_key and not message. gaba 2017-02-17 10:12:37 -08:00
  • 2d374fcdab Úsing the db url Belen Curcio 2017-02-17 15:08:55 -03:00
  • 54f0705f0f Merge branch 'master' of github.com:coralproject/talk into stream-settings Belen Curcio 2017-02-17 15:05:17 -03:00
  • c92e336c7f Merge pull request #321 from coralproject/the-answer-is-42 David Erwin 2017-02-17 13:00:24 -05:00
  • 98a34892ff Merge branch 'master' into the-answer-is-42 Belén Curcio 2017-02-17 14:42:44 -03:00
  • f6a6f443a9 Merge branch 'master' into update-on-post-comment David Jay 2017-02-17 12:30:42 -05:00
  • bf387af586 Merge pull request #325 from coralproject/displayNameFORALL Gabriela Rodríguez Berón 2017-02-17 09:24:38 -08:00
  • 051978a1ee to the configure Belen Curcio 2017-02-17 14:21:47 -03:00
  • 761afeaf4f Stream cog, settings Belen Curcio 2017-02-17 14:15:16 -03:00
  • 25f366c5f1 Comment Count Component Belen Curcio 2017-02-17 13:55:35 -03:00
  • 7eca9db63c null assetIDs and old typo Belen Curcio 2017-02-17 13:53:34 -03:00
  • dd3435fffe Replace with translation_key to manage error translation. gaba 2017-02-17 08:42:48 -08:00
  • a35af36ee1 Handling premod in optimistic comment updates. David Jay 2017-02-17 11:26:19 -05:00
  • 41d0610985 PropTypes Belen Curcio 2017-02-17 13:22:41 -03:00
  • 3bfac591b3 An N was missing... gaba 2017-02-17 08:20:27 -08:00
  • d10936749d Adding DontAgreeActionSummaries David Jay 2017-02-17 11:14:42 -05:00
  • 5370a6f81a A few more changes from display to username. gaba 2017-02-17 08:05:32 -08:00
  • 8502b43974 Updating more displayname to username David Erwin 2017-02-17 10:04:15 -05:00
  • e8f711ff9c Merge branch 'master' into update-on-post-comment Belén Curcio 2017-02-17 02:38:22 -03:00
  • a903ceb643 Merge branch 'master' into displayNameFORALL gaba 2017-02-16 16:13:36 -08:00
  • 4765973a58 Other small changes and fix bug because displayname instead displayName... gaba 2017-02-16 16:07:19 -08:00
  • 83f2f7b86b Merge branch 'master' into the-answer-is-42 Wyatt Johnson 2017-02-16 16:49:46 -07:00
  • f925e6a8ea fix bug when likes or flags were 0 for an article Riley Davis 2017-02-16 16:39:02 -07:00
  • a267397f06 Standardizing username David Erwin 2017-02-16 17:56:46 -05:00
  • 84dcf3b3b6 Added some comments Wyatt Johnson 2017-02-16 15:47:24 -07:00
  • 1e81ec9f4e Added new commentCount edge, added more docs Wyatt Johnson 2017-02-16 15:11:41 -07:00
  • 902cd8300d Adds back the timeout to close window. gaba 2017-02-16 12:17:20 -08:00
  • e1383293d5 Merge pull request #324 from coralproject/summary-bugfix Gabriela Rodríguez Berón 2017-02-16 15:43:36 -08:00
  • 2b4e16edfa fix bug when likes or flags were 0 for an article Riley Davis 2017-02-16 16:39:02 -07:00
  • 3166692d4e Rename everywhere to username. gaba 2017-02-16 15:16:54 -08:00
  • 465de98318 Merge pull request #323 from coralproject/more-lingering-displayname-bugs David Erwin 2017-02-16 18:02:04 -05:00
  • e5512a0e54 Standardizing username David Erwin 2017-02-16 17:56:46 -05:00
  • 1b2d84f38d Merge branch 'master' into update-on-post-comment David Jay 2017-02-16 17:28:40 -05:00
  • e3e85c5f3b Fixing error when posting comment. David Jay 2017-02-16 17:18:36 -05:00
  • e4e7ff27d2 Adding don't agree action to typedefs. David Jay 2017-02-16 16:54:05 -05:00
  • fa597ca04d Merge pull request #322 from coralproject/bug-close-fb-win David Erwin 2017-02-16 15:42:21 -05:00
  • 1bda098045 Merge branch 'master' into the-answer-is-42 Riley Davis 2017-02-16 13:41:01 -07:00
  • 24f052024d Merge branch 'master' into update-on-post-comment David Erwin 2017-02-16 15:40:51 -05:00
  • 82811b8fae Merge branch 'master' into bug-close-fb-win David Erwin 2017-02-16 15:39:06 -05:00
  • 88214a008c Merge pull request #320 from coralproject/add-icon-qbox David Erwin 2017-02-16 15:38:44 -05:00
  • c771e72ac3 Merge branch 'master' into the-answer-is-42 Riley Davis 2017-02-16 13:34:31 -07:00
  • a59296db14 Merge branch 'master' into update-on-post-comment David Erwin 2017-02-16 15:32:23 -05:00
  • 7f11efb648 Merge branch 'master' into bug-close-fb-win Wyatt Johnson 2017-02-16 13:29:08 -07:00
  • 4b2cd1731b Merge branch 'master' into add-icon-qbox David Erwin 2017-02-16 15:28:15 -05:00
  • 29b134af87 Merge pull request #319 from coralproject/story-139830877-bug-local-user David Erwin 2017-02-16 15:26:51 -05:00
  • 06d426b72b Adds back the timeout to close window. gaba 2017-02-16 12:17:20 -08:00
  • c53aa1d93b add a badge to the queues to show the count. proptypes Riley Davis 2017-02-16 12:48:36 -07:00
  • 1dcdd4a9c9 make Dashboard first tab per Sam. simplify tabs Riley Davis 2017-02-16 12:04:24 -07:00
  • 8e14c1986d Adds icon and style to the question box. gaba 2017-02-16 10:33:28 -08:00
  • b0e81d97ec Merge branch 'master' into update-on-post-comment David Jay 2017-02-16 12:16:31 -05:00
  • c8870f6097 Merge branch 'master' into story-139830877-bug-local-user Gabriela Rodríguez Berón 2017-02-16 08:54:58 -08:00
  • a482d6c4bf Merge pull request #318 from coralproject/flags-button David Erwin 2017-02-16 11:41:28 -05:00
  • 3c28557736 Merge branch 'master' into flags-button David Erwin 2017-02-16 11:36:57 -05:00
  • 501e65f729 Merge branch 'master' into update-on-post-comment Belén Curcio 2017-02-16 13:36:39 -03:00
  • d54f3103f9 Merge pull request #313 from coralproject/load-more-replies David Erwin 2017-02-16 11:35:55 -05:00
  • ca1d9a04f6 Merge branch 'master' into load-more-replies David Erwin 2017-02-16 11:31:32 -05:00
  • b6e9e3dcf5 Merge pull request #314 from coralproject/sory-139595043-qbox David Erwin 2017-02-16 11:31:17 -05:00
  • 5467d980df Merge branch 'master' into sory-139595043-qbox David Erwin 2017-02-16 11:26:22 -05:00
  • 04c0d42278 Merge branch 'master' into update-on-post-comment David Erwin 2017-02-16 11:26:11 -05:00
  • 57d11c63d2 Merge pull request #317 from coralproject/flag-widget David Erwin 2017-02-16 11:23:08 -05:00
  • ccb5228a9a Errors when saving the user. gaba 2017-02-15 18:28:49 -08:00
  • 3be8ae39c4 Removed old TODO's Wyatt Johnson 2017-02-15 17:53:13 -07:00
  • 9ab2653054 Merge branch 'master' into flags-button Wyatt Johnson 2017-02-15 17:51:56 -07:00
  • fa152bda3f Added count clearning for status changes Wyatt Johnson 2017-02-15 17:48:40 -07:00
  • 27819d0d6a Changed aggregate -> find Wyatt Johnson 2017-02-15 17:42:54 -07:00
  • b75aed8bd8 Another optimization pass Wyatt Johnson 2017-02-15 17:28:47 -07:00
  • 9eefc0299f Optimization pass Wyatt Johnson 2017-02-15 17:11:50 -07:00
  • 6c141cbce0 now with likes Riley Davis 2017-02-15 16:52:06 -07:00
  • 56fe8ef08e Merge branch 'master' into flag-widget Wyatt Johnson 2017-02-15 16:17:30 -07:00
  • 93636aabac Added like summaries Wyatt Johnson 2017-02-15 16:14:54 -07:00
  • 80c60c560a Merge branch 'master' into update-on-post-comment David Jay 2017-02-15 17:56:44 -05:00
  • 45b419139e Merge branch 'master' of github.com:coralproject/talk into load-more-replies David Jay 2017-02-15 17:51:30 -05:00
  • f91607cff9 show the author and publication date Riley Davis 2017-02-15 15:36:46 -07:00
  • da1a931a40 remove a comma Riley Davis 2017-02-15 15:13:54 -07:00
  • b3b36a245a even more translations en Español Riley Davis 2017-02-15 14:23:54 -07:00