Commit Graph
59 Commits
Author SHA1 Message Date
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 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
Riley Davis d977c33cf5 refetch when you post a comment 2017-01-24 12:13:56 -07:00
David Jay 90c58885aa Fixing lint errors and renaming Pym file. 2017-01-24 13:23:42 -05:00
David Jay 0d7b482dc1 Re-adding pym import. 2017-01-24 13:21:13 -05:00
Belen Curcio c1fea3151c Merge 2017-01-24 15:15:17 -03:00
Belen Curcio a409fcbab7 Asset reducers 2017-01-24 15:10:09 -03:00
David Jay c4e1c1ae44 Merge branch 'graphql' of github.com:coralproject/talk into graphql 2017-01-24 12:53:30 -05:00
David Jay 58e50b4242 Fixing permalinks and moving Pym to a seperate file. 2017-01-24 12:51:52 -05:00
Riley Davis 7fd075a7a6 posting a reply refetches comments 2017-01-24 10:43:29 -07:00
Belen Curcio f375ff48c9 dispatching 2017-01-24 14:13:43 -03:00
Belen Curcio 765edb48b9 Émbed 2017-01-24 14:07:46 -03:00
Riley Davis fa4c6e8ec5 lint! 2017-01-23 16:56:44 -07:00
Riley Davis 6282c39f3a merge remote. can reply to a comment 2017-01-23 16:52:16 -07:00
David Jay da761468b6 Enabling like buttons. 2017-01-23 16:18:51 -05:00
David Jay a8227bd4ad Activating post and delete actions on likebutton. 2017-01-23 14:22:25 -05:00
David Jay b2d9688c89 Adding postAction mutation and fixing lint errors. 2017-01-23 13:25:24 -05:00
Wyatt Johnson 0ec2c11cf7 modularized mutators, loaders 2017-01-20 16:49:19 -07:00
Riley Davis 0dcc912fd0 whoops, committed broken code 2017-01-20 15:58:36 -07:00
Riley Davis dfc073ab10 Merge remote-tracking branch 'refs/remotes/origin/graphql'
Conflicts:
	client/coral-embed-stream/src/Embed.js
2017-01-20 15:56:03 -07:00
Riley Davis d724351fb6 merge my changes 2017-01-20 15:54:18 -07:00
Belen Curcio 9c40ee1245 Login sign In back on! 🎉 2017-01-20 19:35:31 -03:00