 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
|
3441ec36c6
|
re-direct to sign in when email verification is off. add proptypes
|
2017-02-03 12:50:01 -07:00 |
|
|
gaba
|
7da141ed29
|
Dispatch other action to only trigger change when sign up.
|
2017-02-02 15:44:45 -08:00 |
|
|
gaba
|
d74d2e9e87
|
Dispatchs the user.
|
2017-02-02 15:25:45 -08:00 |
|
|
Riley Davis
|
a53db77c21
|
redirect back to the proper page
|
2017-02-02 15:44:12 -07:00 |
|
|
Riley Davis
|
a0cf467f1b
|
remove confirm and replace with verify
|
2017-02-02 14:59:45 -07:00 |
|
|
gaba
|
d53dc09aed
|
Merge branch 'master' into story-134624635
|
2017-02-02 08:16:50 -08:00 |
|
|
Belén CurcioandGitHub
|
b4a03a5133
|
Merge branch 'master' into design-pass-tweaks
|
2017-02-02 07:55:41 -03:00 |
|
|
gaba
|
445eb97d76
|
Moves create displayname dialog to sign-in plugin.
|
2017-02-01 14:00:09 -08:00 |
|
|
gaba
|
4df09ffbd2
|
Validation for the field underneath.
|
2017-02-01 13:29:47 -08:00 |
|
|
gaba
|
0c360e62a6
|
Display errors that come from the backend.
|
2017-02-01 13:20:17 -08:00 |
|
|
gaba
|
ee0bb50dd5
|
Adds errors on field when not validated.
|
2017-02-01 12:34:02 -08:00 |
|
|
gaba
|
a8e4ce466d
|
Adds validation to the dialog.
|
2017-02-01 12:09:27 -08:00 |
|
|
gaba
|
c9b12fc5d6
|
Thanks git-godesses for the log on finding a bad remove when merging.
|
2017-02-01 10:46:32 -08:00 |
|
|
gaba
|
f4d672ddcf
|
Merge branch 'master' into story-134624635
|
2017-02-01 10:42:00 -08:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
e1650aa721
|
Merge branch 'master' into timeago-fix
|
2017-02-01 09:52:40 -08:00 |
|
|
gaba
|
097934dee5
|
Merge branch 'master' into story-134624635
|
2017-01-31 15:00:14 -08:00 |
|
|
gaba
|
37eae51641
|
Adds component to coral-framework to deal with the change of displayname.
|
2017-01-31 13:52:40 -08:00 |
|
|
gaba
|
80122dfdce
|
Adds formfield to components.
|
2017-01-31 13:48:45 -08:00 |
|
|
Riley Davis
|
e6e8ad5ca6
|
close the resend email box after use. remove dead code
|
2017-01-31 13:29:23 -07:00 |
|
|
Riley Davis
|
e63e1f3428
|
Merge branch 'master'
Conflicts:
errors.js
test/routes/api/auth/index.js
|
2017-01-31 12:05:16 -07:00 |
|
|
Riley Davis
|
56ddc49386
|
resend verify email
|
2017-01-31 12:04:19 -07:00 |
|
|
Belen Curcio
|
5b926b9b85
|
merge
|
2017-01-30 20:42:15 -03:00 |
|
|
Riley Davis
|
976c821715
|
move FormField to coral-ui
|
2017-01-30 16:00:24 -07:00 |
|
|
David Jay
|
235214642e
|
Fixing bug where timeAgo cannot interpret dates from mongoose properly.
|
2017-01-30 17:55:06 -05:00 |
|
|
Belén CurcioandGitHub
|
887fe08819
|
Merge branch 'master' into graph-pagination
|
2017-01-30 17:12:23 -03:00 |
|
|
gaba
|
e803593fc7
|
Move stuff around.
|
2017-01-30 11:34:04 -08:00 |
|
|
Belen Curcio
|
e4839468e3
|
Merge branch 'master' of github.com:coralproject/talk into design-pass-tweaks
|
2017-01-30 15:34:23 -03:00 |
|
|
Belen Curcio
|
f7725f4143
|
Notifications working everywhere :D
|
2017-01-30 15:27:09 -03:00 |
|
|
Belen Curcio
|
7a227dff91
|
Notification in the CommentStream Working
|
2017-01-30 15:11:16 -03:00 |
|
|
Belen Curcio
|
805b5cb441
|
Lintin
|
2017-01-30 09:04:00 -03:00 |
|
|
Belen Curcio
|
c42fea5889
|
SnackBar
|
2017-01-30 08:19:18 -03:00 |
|
|
Wyatt Johnson
|
04cd7312a6
|
Added support for new commentCount
|
2017-01-27 15:52:05 -07:00 |
|
|
David Jay
|
b674ff45c0
|
Addressing errors with replies in e2e.
|
2017-01-27 17:29:23 -05:00 |
|
|
David Jay
|
f06edec6a2
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
|
2017-01-26 16:38:43 -05:00 |
|
|
Belen Curcio
|
4a54c571ed
|
Open Stream and Closed Stream status
|
2017-01-26 10:45:50 -03:00 |
|
|
Belen Curcio
|
853981e21f
|
Working configure tab and refresh data. Adding uncontrolled components, deleting state
|
2017-01-26 10:19:49 -03:00 |
|
|
Belen Curcio
|
64ed10845b
|
Merge
|
2017-01-25 21:59:42 -03:00 |
|
|
David Jay
|
31abe57cb2
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
Integrating graphql, updating tests, and preserving transition to ModerationList from CommentList.
|
2017-01-25 17:15:12 -05:00 |
|
|
Belen Curcio
|
30b6f8d112
|
my Comment History working 🎉 : TADA :
|
2017-01-25 11:04:23 -03:00 |
|
|
Belen Curcio
|
cebc5f2f45
|
Adding fragment views
|
2017-01-25 07:09:11 -03:00 |
|
|
Belen Curcio
|
e3b183c565
|
Items cleanup
|
2017-01-25 05:15:04 -03:00 |
|
|
Wyatt Johnson
|
26b7d48f1f
|
Comment ordering fixed, banned users can't do anything
|
2017-01-24 17:06:40 -07:00 |
|
|
Wyatt Johnson
|
2698045e82
|
Fixed capital
|
2017-01-24 15:50:37 -07:00 |
|
|
Riley Davis
|
da7349343e
|
Merged branch graphql into graphql
|
2017-01-24 15:09:09 -07:00 |
|
|
Riley Davis
|
62ae297887
|
make sure the app does not break if you don't have react devtools installed
|
2017-01-24 15:08:38 -07:00 |
|
|
Belen Curcio
|
d2acffc19c
|
linting!
|
2017-01-24 19:07:53 -03:00 |
|
|
Belen Curcio
|
054baa0530
|
çonfig actions not defined
|
2017-01-24 19:01:45 -03:00 |
|
|
Belen Curcio
|
fb791a9df9
|
merge
|
2017-01-24 18:52:37 -03:00 |
|
|
Belen Curcio
|
9edf99730d
|
Status
|
2017-01-24 18:21:49 -03:00 |
|