Commit Graph
87 Commits
Author SHA1 Message Date
gaba 4765973a58 Other small changes and fix bug because displayname instead displayName... 2017-02-16 16:07:19 -08:00
gaba 3166692d4e Rename everywhere to username. 2017-02-16 15:16:54 -08:00
Wyatt Johnson 3cd2b28bc2 Inital rename of displayName -> username 2017-02-09 16:48:59 -07:00
David JayandGitHub 652170735b Merge branch 'master' into username-ban 2017-02-06 18:14:13 -08:00
David Jay b22895b908 Switching displayname update to account endpoint. 2017-02-06 14:38: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
gaba 7da141ed29 Dispatch other action to only trigger change when sign up. 2017-02-02 15:44:45 -08: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 f4d672ddcf Merge branch 'master' into story-134624635 2017-02-01 10:42:00 -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
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
gaba e803593fc7 Move stuff around. 2017-01-30 11:34:04 -08:00
Belen Curcio 7a227dff91 Notification in the CommentStream Working 2017-01-30 15:11:16 -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 e3b183c565 Items cleanup 2017-01-25 05:15:04 -03:00
Belen Curcio d2acffc19c linting! 2017-01-24 19:07:53 -03:00
Belen Curcio 9edf99730d Status 2017-01-24 18:21:49 -03:00
Belen Curcio 9d7b727f08 Settings container 2017-01-24 18:08:58 -03:00
David Jay 90c58885aa Fixing lint errors and renaming Pym file. 2017-01-24 13:23:42 -05:00
Belen Curcio a409fcbab7 Asset reducers 2017-01-24 15:10:09 -03:00
Belen Curcio 365f60c428 Reducer and constants 2017-01-24 14:22:58 -03:00
Belen Curcio 2615db8575 mutations and queries, lint errors 2017-01-20 17:59:28 -03:00
Belen Curcio ae29d65c75 mutations and queries in separate folders 🎉 2017-01-20 17:40:33 -03:00
Gabriela Rodríguez BerónandGitHub 1e445efaec Merge branch 'master' into issue-191 2017-01-06 13:33:25 -03:00
Wyatt Johnson 4eb7c72ae2 Merge branch 'master' into email-confirm 2017-01-05 18:45:06 -07:00
gaba ac6fba2286 Clean user state on logout. Allow flagging only if not banned. 2017-01-05 15:34:27 -03:00
Wyatt Johnson a7680ae5d9 Initial pass at email confirmation 2017-01-03 17:35:58 -07:00
gaba 8e6aa23d32 More CSRF in front-end. 2016-12-23 13:07:16 -08:00
gaba f49ca9f89a PAss the token around. 2016-12-19 18:11:11 -08:00
Riley Davis 6f0de84144 fix lint 2016-12-15 14:03:54 -07:00
Riley Davis 1ea284d428 remove fromJS call 2016-12-15 13:43:06 -07:00
Riley Davis 29b6fc08cd hydrate the assets in the comment response 2016-12-14 14:41:54 -07:00
Riley Davis 601010f1f9 update constant names 2016-12-14 13:58:28 -07:00
Riley Davis 5962037c21 display list of comments with asset url 2016-12-13 16:03:50 -07:00
riley 2be60b3208 Merged master into my-comments 2016-12-13 14:33:17 -07:00
gaba 475c84dfbc Fix date comparision and change article for asset. 2016-12-12 22:18:11 -08:00
Riley Davis d43cd9caf9 list comments out 2016-12-12 16:26:02 -07:00
Riley Davis a5b2a4ebc0 merge master 2016-12-12 11:35:25 -07:00
Belen Curcio a872128a55 logOut Stae 2016-12-11 22:52:47 -03:00
Gabriela Rodríguez BerónandGitHub 1fefd3c8b4 Merge branch 'master' into wordlist 2016-12-09 10:26:39 -10:00
David Jay e032a5521e Merge branch 'master' of github.com:coralproject/talk into wordlist 2016-12-09 13:05:11 -05:00
Dan Zajdband 09ba535d68 Merge with master 2016-12-09 10:17:55 -05:00
Belen Curcio acbd465636 merge 2016-12-08 16:37:11 -03:00
Riley DavisandGitHub be2d9838e6 Merge branch 'master' into wordlist 2016-12-08 09:13:48 -10:00