Commit Graph

2257 Commits

Author SHA1 Message Date
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
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
Kim Gardner 3a6a8ff199 Merge pull request #334 from coralproject/story-140080313-modal-dn
Prompt for username when signing up with Facebook
2017-02-27 08:08:19 -05:00
gaba a429af3c0e Removes varialbe not used. 2017-02-24 16:10:39 -08:00
gaba d650779c1a Removes ; 2017-02-24 16:10:38 -08:00
David Erwin f1c1214229 Merge branch 'master' into story-140080313-modal-dn 2017-02-24 15:40:11 -05:00
David Erwin 2739a01cd3 Merge pull request #341 from coralproject/notifications-alerts
copy updates and remove notification
2017-02-24 15:37:34 -05:00
Riley Davis 11a664d446 Merge branch 'master'
Conflicts:
	client/coral-plugin-commentbox/CommentBox.js
2017-02-24 13:33:25 -07:00
David Erwin b981bea97f Merge pull request #343 from coralproject/updateCountCache-bug
fix Reply bug
2017-02-24 15:31:16 -05:00
Riley Davis d20fa3f497 Merge branch 'master' into notifications-alerts 2017-02-24 13:29:44 -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
Wyatt Johnson e14389c492 Merge pull request #340 from coralproject/heroku-setup-patch
Adjusted route for Heroku app.json
v0.0.4
2017-02-24 11:20:01 -07:00
Wyatt Johnson 6566505fc1 Adjusted route 2017-02-24 11:15:46 -07:00
Riley Davis 886240a7bc translations. remove console.log on frontend. remove notification on POST moderation 2017-02-24 11:11:18 -07:00
Kim Gardner a8d629d680 Merge pull request #339 from coralproject/comment-design-pass
Comment stream design pass
2017-02-23 17:48:48 -05: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 423095360e Merge pull request #336 from coralproject/new-comments
View New Comments
2017-02-23 16:25:16 -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 498eb63e1a Merge pull request #330 from coralproject/empty-states
Empty states for different lists
2017-02-23 16:18:24 -05:00
Kim Gardner 532f2d92ca Merge branch 'master' into empty-states 2017-02-23 16:15:05 -05:00
Wyatt Johnson 58af8ed003 Merge pull request #335 from coralproject/suspect-word-flag-reason
Fixed issue related to action create on suspect word match
2017-02-23 14:14:46 -07:00
Wyatt Johnson b50808d365 Merge branch 'master' into suspect-word-flag-reason 2017-02-23 14:11:21 -07: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 2dda81f257 Merge pull request #338 from coralproject/admin-login
show login page instead of communicorn :'(
2017-02-23 12:12:21 -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 9d13a95a7c Merge branch 'master' into new-comments 2017-02-22 15:20:39 -05: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