Commit Graph

8345 Commits

Author SHA1 Message Date
David Erwin e5512a0e54 Standardizing username 2017-02-16 17:56:46 -05:00
David Jay 1b2d84f38d Merge branch 'master' into update-on-post-comment 2017-02-16 17:28:40 -05:00
David Jay e3e85c5f3b Fixing error when posting comment. 2017-02-16 17:18:36 -05:00
David Jay e4e7ff27d2 Adding don't agree action to typedefs. 2017-02-16 16:54:05 -05:00
David Erwin fa597ca04d Merge pull request #322 from coralproject/bug-close-fb-win
Adds back the timeout to close window.
2017-02-16 15:42:21 -05:00
Riley Davis 1bda098045 Merge branch 'master' into the-answer-is-42 2017-02-16 13:41:01 -07:00
David Erwin 24f052024d Merge branch 'master' into update-on-post-comment 2017-02-16 15:40:51 -05:00
David Erwin 82811b8fae Merge branch 'master' into bug-close-fb-win 2017-02-16 15:39:06 -05:00
David Erwin 88214a008c Merge pull request #320 from coralproject/add-icon-qbox
Adds icon and style to the question box.
2017-02-16 15:38:44 -05:00
Riley Davis c771e72ac3 Merge branch 'master' into the-answer-is-42 2017-02-16 13:34:31 -07:00
David Erwin a59296db14 Merge branch 'master' into update-on-post-comment 2017-02-16 15:32:23 -05:00
Wyatt Johnson 7f11efb648 Merge branch 'master' into bug-close-fb-win 2017-02-16 13:29:08 -07:00
David Erwin 4b2cd1731b Merge branch 'master' into add-icon-qbox 2017-02-16 15:28:15 -05:00
David Erwin 29b134af87 Merge pull request #319 from coralproject/story-139830877-bug-local-user
It changes from displayname to username
2017-02-16 15:26:51 -05:00
gaba 06d426b72b Adds back the timeout to close window. 2017-02-16 12:17:20 -08:00
Riley Davis c53aa1d93b add a badge to the queues to show the count. proptypes 2017-02-16 12:48:36 -07:00
Riley Davis 1dcdd4a9c9 make Dashboard first tab per Sam. simplify tabs 2017-02-16 12:04:24 -07:00
gaba 8e14c1986d Adds icon and style to the question box. 2017-02-16 10:33:28 -08:00
David Jay b0e81d97ec Merge branch 'master' into update-on-post-comment 2017-02-16 12:16:31 -05:00
Gabriela Rodríguez Berón c8870f6097 Merge branch 'master' into story-139830877-bug-local-user 2017-02-16 08:54:58 -08:00
David Erwin a482d6c4bf Merge pull request #318 from coralproject/flags-button
Added count clearing for status changes
2017-02-16 11:41:28 -05:00
David Erwin 3c28557736 Merge branch 'master' into flags-button 2017-02-16 11:36:57 -05:00
Belén Curcio 501e65f729 Merge branch 'master' into update-on-post-comment 2017-02-16 13:36:39 -03:00
David Erwin d54f3103f9 Merge pull request #313 from coralproject/load-more-replies
Load more replies
2017-02-16 11:35:55 -05:00
David Erwin ca1d9a04f6 Merge branch 'master' into load-more-replies 2017-02-16 11:31:32 -05:00
David Erwin b6e9e3dcf5 Merge pull request #314 from coralproject/sory-139595043-qbox
Story 139595043 Question Box to Comment Stream
2017-02-16 11:31:17 -05:00
David Erwin 5467d980df Merge branch 'master' into sory-139595043-qbox 2017-02-16 11:26:22 -05:00
David Erwin 04c0d42278 Merge branch 'master' into update-on-post-comment 2017-02-16 11:26:11 -05:00
David Erwin 57d11c63d2 Merge pull request #317 from coralproject/flag-widget
most flagged assets widget
2017-02-16 11:23:08 -05:00
gaba ccb5228a9a Errors when saving the user. 2017-02-15 18:28:49 -08:00
Wyatt Johnson 3be8ae39c4 Removed old TODO's 2017-02-15 17:53:13 -07:00
Wyatt Johnson 9ab2653054 Merge branch 'master' into flags-button 2017-02-15 17:51:56 -07:00
Wyatt Johnson fa152bda3f Added count clearning for status changes 2017-02-15 17:48:40 -07:00
Wyatt Johnson 27819d0d6a Changed aggregate -> find 2017-02-15 17:42:54 -07:00
Wyatt Johnson b75aed8bd8 Another optimization pass 2017-02-15 17:28:47 -07:00
Wyatt Johnson 9eefc0299f Optimization pass 2017-02-15 17:12:17 -07:00
Riley Davis 6c141cbce0 now with likes 2017-02-15 16:52:06 -07:00
Wyatt Johnson 56fe8ef08e Merge branch 'master' into flag-widget 2017-02-15 16:17:30 -07:00
Wyatt Johnson 93636aabac Added like summaries 2017-02-15 16:15:43 -07:00
David Jay 80c60c560a Merge branch 'master' into update-on-post-comment 2017-02-15 17:56:44 -05:00
David Jay 45b419139e Merge branch 'master' of github.com:coralproject/talk into load-more-replies 2017-02-15 17:51:30 -05:00
Riley Davis f91607cff9 show the author and publication date 2017-02-15 15:36:46 -07:00
Riley Davis da1a931a40 remove a comma 2017-02-15 15:13:54 -07:00
Riley Davis b3b36a245a even more translations en Español 2017-02-15 14:23:54 -07:00
riley b26c170a52 add some translations and link to mod queue 2017-02-15 14:11:44 -07:00
David Erwin 8a3309da92 Merge branch 'master' into sory-139595043-qbox 2017-02-15 15:50:42 -05:00
David Erwin a37e103e87 Merge pull request #315 from coralproject/flags-button
Admin actions for Flagged comments
2017-02-15 15:48:32 -05:00
Belen Curcio 1796efd3ba Ádding NONE to the FE 2017-02-15 17:34:29 -03:00
Belen Curcio 0778b7832f Merge branch 'flags-button' of github.com:coralproject/talk into flags-button 2017-02-15 17:33:30 -03:00
Belen Curcio 675f823849 no comments endpoints in /admin 🎉 2017-02-15 17:32:54 -03:00