 David Jay
|
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 |
|
|
David Jay
|
1d8ce1ae34
|
Posting DontAgree actions.
|
2017-02-21 14:41:33 -05:00 |
|
|
David Jay
|
f6a6f443a9
|
Merge branch 'master' into update-on-post-comment
|
2017-02-17 12:30:42 -05:00 |
|
|
gaba
|
3166692d4e
|
Rename everywhere to username.
|
2017-02-16 15:16:54 -08:00 |
|
|
David Erwin
|
24f052024d
|
Merge branch 'master' into update-on-post-comment
|
2017-02-16 15:40:51 -05:00 |
|
|
gaba
|
8e14c1986d
|
Adds icon and style to the question box.
|
2017-02-16 10:33:28 -08:00 |
|
|
Belén Curcio
|
501e65f729
|
Merge branch 'master' into update-on-post-comment
|
2017-02-16 13:36:39 -03:00 |
|
|
David Erwin
|
ca1d9a04f6
|
Merge branch 'master' into load-more-replies
|
2017-02-16 11:31:32 -05:00 |
|
|
David Jay
|
80c60c560a
|
Merge branch 'master' into update-on-post-comment
|
2017-02-15 17:56:44 -05:00 |
|
|
David Jay
|
45b419139e
|
Merge branch 'master' of github.com:coralproject/talk into load-more-replies
|
2017-02-15 17:51:30 -05:00 |
|
|
Gabriela Rodríguez Berón
|
a33daea5a3
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-15 11:57:39 -08:00 |
|
|
David Jay
|
1cad1d36d5
|
Updating asset_id to camelcase.
|
2017-02-15 13:26:56 -05:00 |
|
|
David Jay
|
a9104b749c
|
Updating comments and replies using updatequeries w/ optimistic updating.
|
2017-02-15 12:19:36 -05:00 |
|
|
gaba
|
0f074dc034
|
Changes styles for Emma and Sam's design.
|
2017-02-14 17:13:08 -08:00 |
|
|
David Jay
|
fbf543727b
|
Moving load more limit to constant.
|
2017-02-14 18:54:51 -05:00 |
|
|
David Jay
|
00c2305ff7
|
Adding view more button to replies.
|
2017-02-14 18:29:59 -05:00 |
|
|
Riley Davis
|
63982aa241
|
add PropTypes to LoadMore component
|
2017-02-14 15:27:36 -07:00 |
|
|
gaba
|
f51c857e8b
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-14 08:51:58 -08:00 |
|
|
David Jay
|
edc3671839
|
Updating load-more-comments style.
|
2017-02-13 19:32:39 -05:00 |
|
|
David Jay
|
7d617ca611
|
Merge branch 'master' of github.com:coralproject/talk into load-more-comments
|
2017-02-13 18:26:05 -05:00 |
|
|
Belen Curcio
|
8953182329
|
merge
|
2017-02-13 19:14:27 -03:00 |
|
|
gaba
|
f9f32b1ef6
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-13 14:13:28 -08:00 |
|
|
gaba
|
5a2e4b708b
|
Adds question box
|
2017-02-13 13:48:03 -08:00 |
|
|
gaba
|
b16bdafc1a
|
Adds plugin for question box.
|
2017-02-13 12:22:05 -08:00 |
|
|
David Jay
|
c756b22302
|
Switching Load More to stateless component.
|
2017-02-13 15:15:27 -05:00 |
|
|
David Jay
|
5b2f52a283
|
Restyling Load More button.
|
2017-02-13 13:22:50 -05:00 |
|
|
Belen Curcio
|
90ed1f1056
|
Ban user with graphql, 100 refactor
|
2017-02-13 11:50:16 -03:00 |
|
|
Wyatt Johnson
|
de54433c5c
|
Merge branch 'master' into username-displayname
|
2017-02-10 16:19:27 -07:00 |
|
|
David Jay
|
4fedb7f31e
|
Merge branch 'master' of github.com:coralproject/talk into load-more-comments
|
2017-02-10 14:34:19 -08:00 |
|
|
gaba
|
e2e40ca2b3
|
Merge branch 'master' into story-137818425-tag-staff
|
2017-02-10 13:42:50 -08:00 |
|
|
gaba
|
11ef12c14c
|
Adds padding and resolves when is not staff.
|
2017-02-10 13:33:57 -08:00 |
|
|
gaba
|
71fcf9cd3f
|
FE for the Staff Tag. Modifed typedfs graphql.
|
2017-02-10 10:20:34 -08:00 |
|
|
David Jay
|
05fcc61c9c
|
Resolving bug on comment load.
|
2017-02-09 17:56:28 -08:00 |
|
|
David Jay
|
1272dabb4b
|
Updating frontend actions to new format.
|
2017-02-09 17:01:16 -08:00 |
|
|
Wyatt Johnson
|
3cd2b28bc2
|
Inital rename of displayName -> username
|
2017-02-09 16:48:59 -07:00 |
|
|
gaba
|
10937cf717
|
Tag.name as string. Debuging comment.tag in Embed stream.
|
2017-02-09 15:28:09 -08:00 |
|
|
gaba
|
3be4fea8ad
|
Merge branch 'master' into story-137818425-tag-staff
|
2017-02-09 12:32:26 -08:00 |
|
|
gaba
|
1c26e64c71
|
Adds Tags to the graphql.
|
2017-02-09 12:23:40 -08:00 |
|
|
gaba
|
f2341ca9d3
|
Adds tag label plugin.
|
2017-02-09 09:17:56 -08:00 |
|
|
Belen Curcio
|
d3184d9afb
|
Merge issues and Settings reducer updated
|
2017-02-09 13:58:55 -03:00 |
|
|
Riley Davis
|
ddeb28d729
|
have cursor be the date of the oldest comment
|
2017-02-08 16:27:09 -07:00 |
|
|
David Jay
|
0c777cbad4
|
Adding loadMore function.
|
2017-02-08 08:59:38 -08:00 |
|
|
Belen Curcio
|
6a6574239f
|
Mod Queue Working
|
2017-02-08 12:36:05 -03:00 |
|
|
Belen Curcio
|
a4d62f78f2
|
Apollo config ready
|
2017-02-07 20:10:18 -03:00 |
|
|
Belen Curcio
|
f8d83ffbde
|
Rest of the embed side config
|
2017-02-07 16:15:53 -03:00 |
|
|
David Jay
|
652170735b
|
Merge branch 'master' into username-ban
|
2017-02-06 18:14:13 -08:00 |
|
|
David Jay
|
cb78e8d563
|
Merge branch 'master' into username-ban
|
2017-02-06 10:23:14 -08:00 |
|
|
Riley Davis
|
a0c03605b9
|
Merge branch 'master'
Conflicts:
client/coral-embed-stream/src/Embed.js
client/coral-framework/constants/auth.js
client/coral-framework/reducers/auth.js
client/coral-sign-in/components/SignUpContent.js
|
2017-02-03 13:12:32 -07:00 |
|
|
Riley Davis
|
a0cf467f1b
|
remove confirm and replace with verify
|
2017-02-02 14:59:45 -07:00 |
|