wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-02 13:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,028 Commits 10 Branches 125 Tags
7d617ca611dd2ca34bf5570dab437718d8aee25c
Commit Graph
79 Commits
Author SHA1 Message Date
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
David Jay c756b22302 Switching Load More to stateless component. 2017-02-13 15:15:27 -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
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
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
David JayandGitHub 652170735b Merge branch 'master' into username-ban 2017-02-06 18:14:13 -08:00
David JayandGitHub 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
David Jay feb0860ba1 Merge branch 'master' of github.com:coralproject/talk into username-ban 2017-02-02 12:29:29 -05: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
David Jay 5831a6f927 Merge branch 'master' of github.com:coralproject/talk into username-ban 2017-02-01 20:00:54 -05:00
David Jay d703cc2168 Prompting user to update name when banned. 2017-02-01 19:53:37 -05:00
gaba 445eb97d76 Moves create displayname dialog to sign-in plugin. 2017-02-01 14:00:09 -08:00
David Jay e3da45daeb Displaying appropriate suspension message. 2017-02-01 16:38:01 -05: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 282c7dc4f5 Removes duplicate func and adds tests. 2017-01-31 14:04:31 -08:00
Riley Davis e63e1f3428 Merge branch 'master' 
Conflicts:
	errors.js
	test/routes/api/auth/index.js
 2017-01-31 12:05:16 -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
Belen Curcio f83def83bd tab 2017-01-30 19:38:58 -03:00
gaba e803593fc7 Move stuff around. 2017-01-30 11:34:04 -08:00
Belen Curcio 744f2085da Lint 🎉 2017-01-30 15:38:26 -03:00
Belen Curcio b316d626f5 Bio and Embed Stream refresh 2017-01-30 15:33:08 -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 177a4d8f2e Permalinks and Embed 2017-01-30 07:32:19 -03:00
Belen Curcio e5976576c1 merge 2017-01-30 05:37:25 -03:00
Wyatt Johnson 04cd7312a6 Added support for new commentCount 2017-01-27 15:52:05 -07:00
Belen Curcio 55a8b4984a only importing isEqual 2017-01-27 14:58:36 -03:00
Belen Curcio dc89b22abb Clicking user goes to Settings Tab 2017-01-26 15:39:16 -03: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 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
Belen Curcio fb791a9df9 merge 2017-01-24 18:52:37 -03:00
Belen Curcio 9d7b727f08 Settings container 2017-01-24 18:08:58 -03:00
David Jay ce73118f53 Loading history links in parent page. 2017-01-24 16:04:03 -05:00
David Jay 8b8bef4ea7 Merge branch 'graphql' of github.com:coralproject/talk into graphql 2017-01-24 14:19:58 -05:00
David Jay 4b33199f2f Adding signin button to settings page. 2017-01-24 14:19:20 -05:00