wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-07 11:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,872 Commits 10 Branches 125 Tags
3a145e99272da015216e1bbd503cd5889fbbc8ef
Commit Graph
249 Commits
Author SHA1 Message Date
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
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 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 6fd2a927f1 Linted 2017-01-30 20:51:28 -03:00
Belen Curcio 76f55b4524 Cursor on user name, and Reply Bio box 2017-01-30 20:50:25 -03: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
Belen Curcio f9363e86d0 Merge 2017-01-30 17:24:57 -03:00
Belén CurcioandGitHub 887fe08819 Merge branch 'master' into graph-pagination 2017-01-30 17:12:23 -03:00
Belen Curcio 019e2a4fa9 Flag order 2017-01-30 16:37:00 -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 e4839468e3 Merge branch 'master' of github.com:coralproject/talk into design-pass-tweaks 2017-01-30 15:34:23 -03:00
Belen Curcio b316d626f5 Bio and Embed Stream refresh 2017-01-30 15:33:08 -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 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
David Jay b674ff45c0 Addressing errors with replies in e2e. 2017-01-27 17:29:23 -05:00
Belen Curcio 55a8b4984a only importing isEqual 2017-01-27 14:58:36 -03:00
David ErwinandGitHub 2086bd7b72 Merge branch 'master' into collapse-replies 2017-01-26 16:17:23 -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
Belen Curcio 58c4d5ceb5 Comment button order 2017-01-26 16:09:56 -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
David Erwin c4256fd27b Ditch console logs 2017-01-25 17:44:21 -05:00
David Erwin ad9684acd9 Create load stream by id route 2017-01-25 14:08:19 -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 e993330467 Adding fragments 🎉 2017-01-25 05:20:34 -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
Belen Curcio ee9674cd23 Settings stream tab 2017-01-24 17:27:30 -03: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
Riley Davis d977c33cf5 refetch when you post a comment 2017-01-24 12:13:56 -07:00
Riley Davis 0994023864 Merged branch graphql into graphql 2017-01-24 12:09:16 -07:00