Commit Graph

721 Commits

Author SHA1 Message Date
Riley Davis 32d23214f1 replies 2017-01-20 16:23:34 -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
Belen Curcio 450d74848e Notifications are back 2017-01-20 19:20:43 -03:00
Belen Curcio 39bf092ebb Correct Status 2017-01-20 18:56:42 -03:00
Belen Curcio b98b71189f atempt to solution 2017-01-20 18:53:11 -03:00
Belen Curcio f813a77194 queries and mutations 2017-01-20 18:48:35 -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
Belen Curcio d89f41a041 Merge branch 'graphql' of github.com:coralproject/talk into graphql 2017-01-20 16:47:28 -03:00
Belen Curcio 3c540b9daa createComment and suspect list 2017-01-20 16:47:02 -03:00
Riley Davis 8f95e29315 Stream is a separate component that renders comments 2017-01-20 12:41:33 -07:00
Belen Curcio f0f692fc26 ádding webpack loader and post comment 2017-01-20 16:39:23 -03:00
Riley Davis d14fa33077 rename files to make more sense 2017-01-20 12:36:33 -07:00
Riley Davis c16f3b8fbe change scalar URL type for a bit 2017-01-20 11:54:18 -07:00
Belen Curcio 7a5aa0a80c Changes 2017-01-20 15:25:18 -03:00
Belen Curcio cc740a4a5e Adding closedAt status commentStream 2017-01-20 12:52:35 -03:00
Belen Curcio 89c1fd19b7 Merge branch 'graphql' of github.com:coralproject/talk into graphql 2017-01-20 12:32:46 -03:00
Wyatt Johnson fec18b50d1 Merge branch 'master' into graphql 2017-01-19 18:08:38 -07:00
riley 9f4c30f466 found the bang 2017-01-19 14:23:57 -07:00
David Jay 8bad6f7a73 Enabling signup. 2017-01-19 15:51:38 -05:00
David Jay e9846c654c Enabling stream login with graphql. 2017-01-19 15:37:05 -05:00
David Erwin fa53327571 Merge branch 'master' into registration-fix 2017-01-19 15:20:52 -05:00
David Jay 672d1ee19e Updating store to include auth and apollo. 2017-01-19 13:39:46 -05:00
Belen Curcio b172e30e5b By doing this we can refactor one by one and still having a working app 2017-01-19 11:30:30 -03:00
Belen Curcio 2d414a5ab7 Transport, Client, from coral-framework 2017-01-19 10:01:43 -03:00
David Jay d34d511ce6 Merge branch 'graphql' of github.com:coralproject/talk into graphql 2017-01-18 23:13:50 -05:00
David Jay a40971e376 Adding thunk to apollog redux store. 2017-01-18 19:23:47 -05:00
David Jay d3c215a18d Switching bare-bones commentstream to graphql. 2017-01-18 18:23:32 -05:00
Riley Davis bbfd017998 adding changes 2017-01-18 15:27:48 -07:00
Riley Davis 58e7abbe0c sdfasdf 2017-01-18 15:25:48 -07:00
Riley Davis 89a188255f super amazing code. 2017-01-18 15:23:07 -07:00
Riley Davis 5f63af8140 Merged branch master into graphql 2017-01-18 14:24:45 -07:00
David Erwin 347fe8bf2b Showing graphql data in console 2017-01-18 16:15:40 -05:00
David Erwin e36ecdfb33 Implement stream with data fetch 2017-01-18 15:58:36 -05:00
Riley Davis 07e24496da allow uppercase displaynames at creation 2017-01-18 13:13:02 -07:00
Riley Davis f07026d6dd hide uppercase login 2017-01-18 12:57:07 -07:00
Belén Curcio 7140723570 Merge branch 'master' into design-pass-adm 2017-01-18 14:40:09 -03:00
Riley Davis 14fd5e4451 does a null check 2017-01-17 15:12:19 -07:00
Riley Davis af71059948 Revert "My Comment bug fix" 2017-01-17 14:53:28 -07:00
Belen Curcio b5afd9cbeb çhanges 2017-01-17 16:39:05 -03:00
Belen Curcio 3640a93a2f Changes 2017-01-17 16:25:47 -03:00
Riley Davis 1b50cb06d4 gotta commit something to see changes 2017-01-17 11:38:15 -07:00
Belen Curcio 6d826e9115 Working Stream 2017-01-17 12:47:06 -03:00
David Erwin 249a8f78dc Merge branch 'master' into bug-comment-number 2017-01-17 10:03:34 -05:00
David Erwin 04e3f12c87 Merge branch 'master' into bugfix-flagged-actions 2017-01-17 09:52:26 -05:00
David Erwin e41acffcf0 Merge branch 'master' into password-length-test 2017-01-17 09:47:42 -05:00
Gabriela Rodríguez Berón 5a22e99282 Merge branch 'master' into bug-comment-number 2017-01-13 15:25:27 -08:00