Commit Graph

1169 Commits

Author SHA1 Message Date
gaba 6dfd3fc4ef Fix the people tag. 2017-02-28 22:10:14 -08:00
gaba da3c812dc1 Adds graphql for users flagged in the server and client. 2017-02-28 21:33:01 -08:00
gaba ca4b03872b Merge branch 'master' into story-138187767-mod-flag-names 2017-02-27 09:39:52 -08:00
David Jay 22793c02e2 Merge branch 'master' into dont-agree 2017-02-27 12:29:19 -05:00
gaba 714b496c9d Merge branch 'master' into story-138187767-mod-flag-names 2017-02-27 07:46:23 -08:00
Belen Curcio e8a92b768c logout and version in drawer 2017-02-27 11:52:21 -03:00
Belen Curcio f85a6d4da1 Drawer 2017-02-27 11:49:53 -03:00
gaba d650779c1a Removes ; 2017-02-24 16:10:38 -08:00
gaba 7557592dc4 Get more data into the store. 2017-02-24 16:06:18 -08:00
David Erwin f1c1214229 Merge branch 'master' into story-140080313-modal-dn 2017-02-24 15:40:11 -05:00
Riley Davis 11a664d446 Merge branch 'master'
Conflicts:
	client/coral-plugin-commentbox/CommentBox.js
2017-02-24 13:33:25 -07:00
Riley Davis 5c441e90e7 do not update countCache if the CommentBox is in a reply 2017-02-24 13:08:48 -07:00
David Jay 4015bea1db Merge branch 'master' into story-140080313-modal-dn 2017-02-24 14:39:51 -05:00
Riley Davis 886240a7bc translations. remove console.log on frontend. remove notification on POST moderation 2017-02-24 11:11:18 -07:00
gaba ad1e640b87 Adds emptystate. 2017-02-23 16:44:30 -08:00
gaba b01db3297d Adds menu for Community. Rename community to people. Adds account flagged tabs. 2017-02-23 16:37:16 -08:00
David Jay b150668d86 Merge branch 'comment-design-pass' of github.com:coralproject/talk into comment-design-pass 2017-02-23 17:11:21 -05:00
David Jay 39536046c9 Fixing permalink icon and adding padding to comment content. 2017-02-23 17:08:35 -05:00
David Jay e735fb800a Updating button and signin style. 2017-02-23 17:02:35 -05:00
gaba 92aa107eeb Merge branch 'master' into story-140080313-modal-dn 2017-02-23 13:58:10 -08:00
gaba 022667c9ae Brings some of the components into FakeComment 2017-02-23 13:55:51 -08:00
David Jay 66ef4e38a8 Merge branch 'master' into comment-design-pass 2017-02-23 16:28:20 -05:00
David Jay 2456fe5145 Merge branch 'master' into comment-design-pass 2017-02-23 16:22:35 -05:00
David Jay 761d0aaa3a Merge branch 'master' into new-comments 2017-02-23 16:21:36 -05:00
David Jay c1e3aec181 Updating styles. 2017-02-23 16:20:20 -05:00
Kim Gardner 532f2d92ca Merge branch 'master' into empty-states 2017-02-23 16:15:05 -05:00
David Jay 3e2634be76 Merge branch 'master' into new-comments 2017-02-23 16:11:01 -05:00
David Jay 4cc3426af4 Adding bolding, adding translations to settings page. 2017-02-23 16:07:41 -05:00
David Jay 471607403c Switching font. 2017-02-23 15:26:02 -05:00
David Jay d73a6a87a4 Adding border radius to tag label. 2017-02-23 15:19:38 -05:00
David Jay da732ece14 Updating button padding and font size. 2017-02-23 15:03:09 -05:00
gaba 5d0ea6a880 Rmove continue button, fix bug with facebook signup. 2017-02-23 09:48:59 -08:00
David Jay 3f5d751a80 Setting reason to null for dontAgree. 2017-02-23 12:24:32 -05:00
David Jay 8cb0f9cd90 Merge branch 'master' into dont-agree 2017-02-23 12:12:53 -05:00
Riley Davis e3b9799d4a nested ternaries hurt me 2017-02-23 09:58:31 -07:00
Riley Davis 7ae81fd172 fixing mixed types 2017-02-23 09:43:50 -07:00
Riley Davis 953c749bd2 show login page instead of communicorn :'( 2017-02-22 16:14:14 -07:00
David Jay 27bd1404b3 Adding es translation. 2017-02-22 15:13:46 -05:00
David Jay bb0b3f461a Moving polling interval to constant. 2017-02-22 15:11:50 -05:00
David Jay 6becb88b56 Adding style to new comments button. 2017-02-22 15:07:32 -05:00
gaba 32bc754bf7 It needs to send the translation key 2017-02-22 11:22:51 -08:00
David Jay 096bd12df6 Loading new comments. 2017-02-22 13:45:02 -05:00
Riley Davis 2acd099f3f add empty state for asset search 2017-02-22 11:15:13 -07:00
David Jay dd09ddf968 Adding NewCount component. 2017-02-22 13:13:25 -05:00
Gabriela Rodríguez Berón b29614256b Merge branch 'master' into empty-states 2017-02-22 08:13:44 -08:00
gaba 2c60285981 The component needs the banned value. 2017-02-22 07:00:15 -08:00
gaba 1b79a10580 Change username when it changes. 2017-02-21 16:36:50 -08:00
Riley Davis e7c4acde4d small bugfix 2017-02-21 16:11:56 -07:00
gaba 5d0730b4d5 Adds fake comment component. 2017-02-21 14:52:19 -08:00
David Jay ca107afb9b Avoiding new comment button when a comment is posted. 2017-02-21 17:29:58 -05:00