Commit Graph

860 Commits

Author SHA1 Message Date
Gabriela Rodríguez Berón d8ab3b8fba Merge branch 'master' into story-134624635 2017-02-01 14:03:56 -08: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
Riley Davis ec956165a3 Merge branch 'master' into bugfix-asset-search 2017-02-01 11:35:59 -07:00
Gabriela Rodríguez Berón 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 282c7dc4f5 Removes duplicate func and adds tests. 2017-01-31 14:04:31 -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
David Jay 7babb14bab Addressing bug in asset search. 2017-01-31 14:37:52 -05:00
Riley Davis ec1dfefc5d lint 2017-01-31 12:15:33 -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
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 Curcio 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
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
Riley Davis 5e521b832c add a confirm-email landing page 2017-01-27 15:04:42 -07:00
David Jay f09d9d0a8b Merge branch 'master' into e2e-env-fix 2017-01-27 14:10:59 -05:00
David Jay fcf22ef4f9 Adding selenium settings and fixing bug in moderation approval. 2017-01-27 14:07:34 -05:00
Belen Curcio 55a8b4984a only importing isEqual 2017-01-27 14:58:36 -03:00
David Erwin c8c160a551 Remove avatar from user cards 2017-01-27 10:16:09 -05:00
David Jay f06edec6a2 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-26 16:38:43 -05:00
David Jay b6d8a90084 Updating style of UserActions and moving ActionButton to its own component. 2017-01-26 16:36:43 -05:00
David Erwin f42b8f324a Merge branch 'master' into hide-premod-links 2017-01-26 16:24:06 -05:00
David Erwin 2086bd7b72 Merge branch 'master' into collapse-replies 2017-01-26 16:17:23 -05:00
David Jay 06331d3c07 Updating bio moderation to graphQL architecture. 2017-01-26 15:31:15 -05:00
Riley Davis 2ad27ef6f9 add a cancel button to the reply box 2017-01-26 13:21:23 -07:00
Riley Davis 3cbe8bb7ac Stream now tracks what reply box is open 2017-01-26 12:45:14 -07:00
David Erwin afb246b173 Hiding premod links 2017-01-26 10:46:01 -05:00
Belen Curcio 88169526c3 Missing semicolon 2017-01-26 10:50:53 -03: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 74bef18098 user checker 2017-01-26 09:34:47 -03:00
Belen Curcio 64ed10845b Merge 2017-01-25 21:59:42 -03:00
David Erwin c4256fd27b Ditch console logs 2017-01-25 17:44:21 -05: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
David Erwin e320a9dd20 Merge branch 'master' into streams-by-asset-id 2017-01-25 15:30:44 -05:00
Belen Curcio ec0dd34d40 Configure tab while you are loggedOff 2017-01-25 16:33:55 -03:00
David Erwin ad9684acd9 Create load stream by id route 2017-01-25 14:08:19 -05:00
Belen Curcio 7c132600f0 Console log and typo 2017-01-25 11:47:35 -03:00
Belen Curcio b3eb3e3c43 Updated tests for Comment History 2017-01-25 11:44:51 -03:00