Commit Graph
8775 Commits
Author SHA1 Message Date
David Jay 096bd12df6 Loading new comments. 2017-02-22 13:45:02 -05:00
Riley Davis 5ef5a01f59 Merged branch master into assets-by-like 2017-02-22 11:15:35 -07: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
Riley Davis 691d001213 simplify a bit 2017-02-22 10:49:48 -07:00
Riley Davis bc48496327 add most liked comments widget 2017-02-22 10:47:23 -07:00
Wyatt Johnson 80706d2fdf fixed issue related to action create on suspect word match 2017-02-22 10:33:47 -07:00
Wyatt Johnson 6398e2faad Fixed issue with comment hydration 2017-02-22 09:32:51 -07:00
Gabriela Rodríguez BerónandGitHub 224e58f3e2 Merge branch 'master' into story-140080313-modal-dn 2017-02-22 08:16:51 -08:00
Gabriela Rodríguez BerónandGitHub b29614256b Merge branch 'master' into empty-states 2017-02-22 08:13:44 -08:00
Gabriela Rodríguez BerónandGitHub 3e2b8b1a20 Merge branch 'master' into dont-agree 2017-02-22 08:09:55 -08:00
Wyatt JohnsonandGitHub 07a956e582 Merge pull request #333 from coralproject/rest-depreciation
Cleaned up some routes
2017-02-22 08:13:02 -07: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
Wyatt Johnson d7a6bf9e1f Cleaned up some routes 2017-02-21 15:24:44 -07:00
David Jay 9149b737f5 Retrieving counts and displaying new comments to user. 2017-02-21 17:23:09 -05:00
Wyatt Johnson 2360f280d2 Added commentMetrics edge. 2017-02-21 14:30:52 -07:00
Riley DavisandGitHub 30fbcd30a9 Merge branch 'master' into assets-by-like 2017-02-21 14:18:22 -07:00
Riley Davis f32fe2629c css is the worst 2017-02-21 14:16:02 -07:00
Riley Davis 5d94a98305 Like and Flag summaries work again 2017-02-21 14:05:49 -07:00
gaba 02c05e8ae1 CSS, translations and code for new create username dialog. 2017-02-21 12:43:02 -08:00
David JayandGitHub 0aaa52e01f Merge branch 'master' into dont-agree 2017-02-21 15:02:33 -05:00
David Jay 3377aa3da2 Displaying DontAgree actions as flags. 2017-02-21 14:55:00 -05:00
Riley Davis f76befd6ac no comments in user list 2017-02-21 12:48:01 -07:00
David Jay 1d8ce1ae34 Posting DontAgree actions. 2017-02-21 14:41:33 -05:00
Riley Davis 9000778d8f empty result for users in Community 2017-02-21 12:39:29 -07:00
Riley Davis e24a0caa20 add EmptyCard component. fix typos. more PropTypes. 2017-02-21 12:08:02 -07:00
Riley Davis 364cf1808e assets by like? 2017-02-21 10:28:33 -07:00
David ErwinandGitHub 17813e23a9 Merge pull request #327 from coralproject/error_translation_key
Error translation key
2017-02-17 20:13:11 -05:00
David ErwinandGitHub 0563b93d39 Merge branch 'master' into error_translation_key 2017-02-17 20:07:49 -05:00
David ErwinandGitHub df53b101ab Merge pull request #316 from coralproject/update-on-post-comment
Apollo update on post comment
2017-02-17 20:07:40 -05:00
David ErwinandGitHub 6f17a84097 Merge branch 'master' into update-on-post-comment 2017-02-17 20:02:41 -05:00
Wyatt JohnsonandGitHub 09513c0e83 Merge pull request #329 from coralproject/docker-fixx
Added yarn.lock to Dockerfile
2017-02-17 18:02:26 -07:00
Wyatt Johnson 301c8e829f Added production flag back 2017-02-17 17:56:44 -07:00
Wyatt Johnson afcdacff0d Added yarn.lock to Dockerfile 2017-02-17 17:49:59 -07:00
Riley Davis 8866366d3c storing my place in case we want to come back to this 2017-02-17 16:07:34 -07:00
David ErwinandGitHub a8396481f9 Merge pull request #328 from coralproject/graph-tests
Initial graph tests
2017-02-17 18:01:17 -05:00
Wyatt Johnson 4cccf09a87 spelling... 2017-02-17 15:53:23 -07:00
Wyatt JohnsonandGitHub 3e4dc9c8b2 Merge branch 'master' into graph-tests 2017-02-17 15:50:21 -07:00
Wyatt Johnson a00befafcb Initial graph tests 2017-02-17 15:48:46 -07:00
Gabriela Rodríguez BerónandGitHub 31dda920c6 Merge branch 'master' into error_translation_key 2017-02-17 14:30:00 -08:00
gaba 9f168e627a It uses message and not translation key. 2017-02-17 14:19:30 -08:00
Riley Davis 2506442453 toISOString 2017-02-17 14:10:21 -07:00
Riley Davis 6eb4725dd9 remove ternary from return statement 2017-02-17 14:03:37 -07:00
David ErwinandGitHub 5d1bc5fb5a Merge branch 'master' into update-on-post-comment 2017-02-17 13:52:25 -05:00
David ErwinandGitHub 62ee81e5a9 Merge pull request #326 from coralproject/stream-settings
Stream Settings
2017-02-17 13:51:26 -05:00
gaba 5a09beb727 It has to be translation_key and not message. 2017-02-17 10:12:37 -08:00