Commit Graph

  • 7914296997 Merge pull request #347 from coralproject/header Kim Gardner 2017-02-27 11:50:30 -05:00
  • 714b496c9d Merge branch 'master' into story-138187767-mod-flag-names gaba 2017-02-27 07:46:23 -08:00
  • e8a92b768c logout and version in drawer Belen Curcio 2017-02-27 11:52:21 -03:00
  • f85a6d4da1 Drawer Belen Curcio 2017-02-27 11:49:53 -03:00
  • 3a6a8ff199 Merge pull request #334 from coralproject/story-140080313-modal-dn Kim Gardner 2017-02-27 08:08:19 -05:00
  • 847df91cbc Merge branch 'master' into bugfix-second-new-comments David Jay 2017-02-24 20:03:42 -05:00
  • a429af3c0e Removes varialbe not used. gaba 2017-02-24 16:09:22 -08:00
  • d650779c1a Removes ; gaba 2017-02-24 16:08:25 -08:00
  • 7557592dc4 Get more data into the store. gaba 2017-02-24 16:06:18 -08:00
  • 66a890458c Adding sort to moderation queue. David Jay 2017-02-24 17:42:29 -05:00
  • 6a9d8c0436 Removing refetch and prevent 0 from displaying on empty comment streams. David Jay 2017-02-24 15:51:43 -05:00
  • f1c1214229 Merge branch 'master' into story-140080313-modal-dn David Erwin 2017-02-24 15:40:11 -05:00
  • 2739a01cd3 Merge pull request #341 from coralproject/notifications-alerts David Erwin 2017-02-24 15:37:34 -05:00
  • 212037891a Merge branch 'master' into assets-by-like Wyatt Johnson 2017-02-24 13:36:54 -07:00
  • 11a664d446 Merge branch 'master' Riley Davis 2017-02-24 13:33:25 -07:00
  • b981bea97f Merge pull request #343 from coralproject/updateCountCache-bug David Erwin 2017-02-24 15:31:16 -05:00
  • d20fa3f497 Merge branch 'master' into notifications-alerts Riley Davis 2017-02-24 13:29:44 -07:00
  • 5c441e90e7 do not update countCache if the CommentBox is in a reply Riley Davis 2017-02-24 13:08:48 -07:00
  • 893fe97e66 Merged branch master into assets-by-like Riley Davis 2017-02-24 12:58:33 -07:00
  • aefcb29877 remove comment count from results Riley Davis 2017-02-24 12:58:06 -07:00
  • dcc16dc598 Removing extra semicolon. David Jay 2017-02-24 14:45:47 -05:00
  • 4015bea1db Merge branch 'master' into story-140080313-modal-dn David Jay 2017-02-24 14:39:51 -05:00
  • 1058bff8ad remove logs Riley Davis 2017-02-24 11:30:59 -07:00
  • 38e093aac3 remove most liked comments widget Riley Davis 2017-02-24 11:26:23 -07:00
  • e14389c492 Merge pull request #340 from coralproject/heroku-setup-patch v0.0.4 Wyatt Johnson 2017-02-24 11:20:01 -07:00
  • 6566505fc1 Adjusted route Wyatt Johnson 2017-02-24 11:15:46 -07:00
  • 886240a7bc translations. remove console.log on frontend. remove notification on POST moderation Riley Davis 2017-02-24 11:11:18 -07:00
  • 799727264e Removed log Wyatt Johnson 2017-02-24 09:57:57 -07:00
  • f5277ce5e3 Patched silly bug Wyatt Johnson 2017-02-24 09:56:18 -07:00
  • c283f193de remove console.log Riley Davis 2017-02-24 09:07:03 -07:00
  • c8c3c4acaf lint riley 2017-02-24 08:59:23 -07:00
  • dc5f95ec7f simplify moderationqueue Riley Davis 2017-02-24 08:50:52 -07:00
  • 5d1139dbdd Merge branch 'master' Riley Davis 2017-02-24 08:49:30 -07:00
  • ad1e640b87 Adds emptystate. gaba 2017-02-23 16:44:30 -08:00
  • b01db3297d Adds menu for Community. Rename community to people. Adds account flagged tabs. gaba 2017-02-23 16:37:16 -08:00
  • a8d629d680 Merge pull request #339 from coralproject/comment-design-pass Kim Gardner 2017-02-23 17:48:48 -05:00
  • be25d6f56d "works" Riley Davis 2017-02-23 15:46:44 -07:00
  • 2a0f4906a7 Merged branch assets-by-like into assets-by-like Riley Davis 2017-02-23 15:23:15 -07:00
  • b150668d86 Merge branch 'comment-design-pass' of github.com:coralproject/talk into comment-design-pass David Jay 2017-02-23 17:11:21 -05:00
  • 39536046c9 Fixing permalink icon and adding padding to comment content. David Jay 2017-02-23 17:08:35 -05:00
  • e735fb800a Updating button and signin style. David Jay 2017-02-23 17:02:35 -05:00
  • 92aa107eeb Merge branch 'master' into story-140080313-modal-dn gaba 2017-02-23 13:58:10 -08:00
  • 022667c9ae Brings some of the components into FakeComment gaba 2017-02-23 13:55:51 -08:00
  • 30b6259e87 Patched bug with asset metrics Wyatt Johnson 2017-02-23 14:43:25 -07:00
  • 2f314c6937 omg, a bunch of UI madness Riley Davis 2017-02-23 14:29:51 -07:00
  • 66ef4e38a8 Merge branch 'master' into comment-design-pass David Jay 2017-02-23 16:28:20 -05:00
  • 423095360e Merge pull request #336 from coralproject/new-comments David Jay 2017-02-23 16:25:16 -05:00
  • 2456fe5145 Merge branch 'master' into comment-design-pass David Jay 2017-02-23 16:22:35 -05:00
  • 761d0aaa3a Merge branch 'master' into new-comments David Jay 2017-02-23 16:21:36 -05:00
  • c1e3aec181 Updating styles. David Jay 2017-02-23 16:20:20 -05:00
  • 498eb63e1a Merge pull request #330 from coralproject/empty-states Kim Gardner 2017-02-23 16:18:24 -05:00
  • 532f2d92ca Merge branch 'master' into empty-states Kim Gardner 2017-02-23 16:15:05 -05:00
  • 58af8ed003 Merge pull request #335 from coralproject/suspect-word-flag-reason Wyatt Johnson 2017-02-23 14:14:46 -07:00
  • b50808d365 Merge branch 'master' into suspect-word-flag-reason Wyatt Johnson 2017-02-23 14:11:21 -07:00
  • 3e2634be76 Merge branch 'master' into new-comments David Jay 2017-02-23 16:11:01 -05:00
  • 4cc3426af4 Adding bolding, adding translations to settings page. David Jay 2017-02-23 16:07:41 -05:00
  • 471607403c Switching font. David Jay 2017-02-23 15:26:02 -05:00
  • d73a6a87a4 Adding border radius to tag label. David Jay 2017-02-23 15:19:38 -05:00
  • da732ece14 Updating button padding and font size. David Jay 2017-02-23 15:03:09 -05:00
  • f795a96f46 Returning dontagree id on post. David Jay 2017-02-23 13:19:09 -05:00
  • 5d0ea6a880 Rmove continue button, fix bug with facebook signup. gaba 2017-02-23 09:48:59 -08:00
  • 3f5d751a80 Setting reason to null for dontAgree. David Jay 2017-02-23 12:24:32 -05:00
  • 8cb0f9cd90 Merge branch 'master' into dont-agree David Jay 2017-02-23 12:12:53 -05:00
  • 2dda81f257 Merge pull request #338 from coralproject/admin-login David Jay 2017-02-23 12:12:21 -05:00
  • e3b9799d4a nested ternaries hurt me Riley Davis 2017-02-23 09:58:31 -07:00
  • 7ae81fd172 fixing mixed types Riley Davis 2017-02-23 09:43:50 -07:00
  • 953c749bd2 show login page instead of communicorn :'( Riley Davis 2017-02-22 16:14:14 -07:00
  • 197569714b Merged branch assets-by-like into assets-by-like Riley Davis 2017-02-22 14:25:19 -07:00
  • 9e759c7667 Adjusted BE beheviour Wyatt Johnson 2017-02-22 13:55:48 -07:00
  • e6b78a3e63 change some copy Riley Davis 2017-02-22 13:33:50 -07:00
  • 9d13a95a7c Merge branch 'master' into new-comments David Jay 2017-02-22 15:20:39 -05:00
  • 27bd1404b3 Adding es translation. David Jay 2017-02-22 15:13:46 -05:00
  • bb0b3f461a Moving polling interval to constant. David Jay 2017-02-22 15:11:50 -05:00
  • 111b956522 change index route to Dashboard component Riley Davis 2017-02-22 13:10:50 -07:00
  • 6becb88b56 Adding style to new comments button. David Jay 2017-02-22 15:07:32 -05:00
  • 32bc754bf7 It needs to send the translation key gaba 2017-02-22 11:22:51 -08:00
  • 096bd12df6 Loading new comments. David Jay 2017-02-22 13:45:02 -05:00
  • 5ef5a01f59 Merged branch master into assets-by-like Riley Davis 2017-02-22 11:15:35 -07:00
  • 2acd099f3f add empty state for asset search Riley Davis 2017-02-22 11:15:13 -07:00
  • dd09ddf968 Adding NewCount component. David Jay 2017-02-22 13:13:25 -05:00
  • 691d001213 simplify a bit Riley Davis 2017-02-22 10:49:48 -07:00
  • bc48496327 add most liked comments widget Riley Davis 2017-02-22 10:47:23 -07:00
  • 80706d2fdf fixed issue related to action create on suspect word match Wyatt Johnson 2017-02-22 10:33:47 -07:00
  • 6398e2faad Fixed issue with comment hydration Wyatt Johnson 2017-02-22 09:32:51 -07:00
  • 224e58f3e2 Merge branch 'master' into story-140080313-modal-dn Gabriela Rodríguez Berón 2017-02-22 08:16:51 -08:00
  • b29614256b Merge branch 'master' into empty-states Gabriela Rodríguez Berón 2017-02-22 08:13:44 -08:00
  • 3e2b8b1a20 Merge branch 'master' into dont-agree Gabriela Rodríguez Berón 2017-02-22 08:09:55 -08:00
  • 07a956e582 Merge pull request #333 from coralproject/rest-depreciation Wyatt Johnson 2017-02-22 08:13:02 -07:00
  • 2c60285981 The component needs the banned value. gaba 2017-02-22 07:00:15 -08:00
  • 1b79a10580 Change username when it changes. gaba 2017-02-21 16:36:50 -08:00
  • e7c4acde4d small bugfix Riley Davis 2017-02-21 16:11:56 -07:00
  • 5d0730b4d5 Adds fake comment component. gaba 2017-02-21 14:52:19 -08:00
  • ca107afb9b Avoiding new comment button when a comment is posted. David Jay 2017-02-21 17:29:58 -05:00
  • d7a6bf9e1f Cleaned up some routes Wyatt Johnson 2017-02-21 15:24:44 -07:00
  • 9149b737f5 Retrieving counts and displaying new comments to user. David Jay 2017-02-21 17:23:09 -05:00
  • 2360f280d2 Added commentMetrics edge. Wyatt Johnson 2017-02-21 14:17:56 -07:00
  • 30fbcd30a9 Merge branch 'master' into assets-by-like Riley Davis 2017-02-21 14:18:22 -07:00
  • f32fe2629c css is the worst Riley Davis 2017-02-21 14:16:02 -07:00
  • 5d94a98305 Like and Flag summaries work again Riley Davis 2017-02-21 14:05:49 -07:00
  • 02c05e8ae1 CSS, translations and code for new create username dialog. gaba 2017-02-21 12:43:02 -08:00