Commit Graph

1186 Commits

Author SHA1 Message Date
Kim Gardner b3b10efbba Use tú to match other translations 2017-02-28 12:35:20 -05:00
Kim Gardner 3bfde67d58 Copy updates with translations 2017-02-28 12:32:51 -05:00
Wyatt Johnson 87d64e575b Merge branch 'master' into whizard-whitelist 2017-02-27 15:52:16 -07:00
Belen Curcio 95876fa0e8 Merge branch 'master' of github.com:coralproject/talk into whizard-whitelist 2017-02-27 17:19:54 -03:00
Belen Curcio 555faa02f5 new translations for configure 2017-02-27 17:18:37 -03:00
Belen Curcio 1234a99a0d copy for install permitted domains updated 2017-02-27 17:16:19 -03:00
Belen Curcio b9e9d3e7fa status 2017-02-27 17:06:22 -03:00
Belen Curcio 628e8844f3 final translations 2017-02-27 17:04:14 -03:00
Belen Curcio b47fd35437 add user translations 2017-02-27 16:58:16 -03:00
David Jay 1b495b9b09 Merge branch 'master' into bugfix-second-new-comments 2017-02-27 14:57:24 -05:00
Belen Curcio 7341fdff4e add Organization translations 2017-02-27 16:54:03 -03:00
Belen Curcio 1e52c579cc Ínitial translations 2017-02-27 16:50:04 -03:00
Belen Curcio 013625df27 no validation for domains 2017-02-27 16:39:52 -03:00
David Jay dfd211deda Merge branch 'master' into mod-queue-sort 2017-02-27 14:05:04 -05:00
Belen Curcio 9305853502 Renamed to PermittedDomains 2017-02-27 15:50:07 -03:00
Belen Curcio b1ec512721 Adding whitelist step, sending whitelist 2017-02-27 14:42:57 -03:00
David Jay 83e713d889 Merge branch 'master' into bugfix-second-new-comments 2017-02-27 12:34:11 -05:00
David Jay 491f254206 Merge branch 'mod-queue-sort' of github.com:coralproject/talk into mod-queue-sort 2017-02-27 12:30:04 -05:00
David Jay 2b22ce076c Merge branch 'master' into mod-queue-sort 2017-02-27 12:29:42 -05:00
David Jay 22793c02e2 Merge branch 'master' into dont-agree 2017-02-27 12:29:19 -05:00
David Jay 37b08fd4e4 Displaying oldest first by default. 2017-02-27 12:28:13 -05: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
David Jay 847df91cbc Merge branch 'master' into bugfix-second-new-comments 2017-02-24 20:03:42 -05:00
gaba d650779c1a Removes ; 2017-02-24 16:10:38 -08:00
David Jay 66a890458c Adding sort to moderation queue. 2017-02-24 17:42:29 -05:00
David Jay 6a9d8c0436 Removing refetch and prevent 0 from displaying on empty comment streams. 2017-02-24 15:51:43 -05: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 dcc16dc598 Removing extra semicolon. 2017-02-24 14:45:47 -05: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
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