Commit Graph

8345 Commits

Author SHA1 Message Date
Belen Curcio 0f15c21cc9 Merge branch 'graphql' of github.com:coralproject/talk into graphql 2017-01-20 12:34:14 -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 07b2f9c2e5 Update typeDefs.js 2017-01-20 08:13:45 -07:00
Wyatt Johnson f286263f1f Adjusted placement of server side graph code. 2017-01-19 18:26:33 -07:00
Wyatt Johnson fec18b50d1 Merge branch 'master' into graphql 2017-01-19 18:08:38 -07:00
Wyatt Johnson 1db1908778 Introduced some changes to the resolvers + mutators 2017-01-19 18:06:06 -07:00
Riley Davis 54e5a18546 Merge pull request #250 from coralproject/registration-fix
found the bang
v0.0.2
2017-01-19 14:31:34 -07:00
Riley Davis a7094efda6 Merge branch 'master' into registration-fix 2017-01-19 14:27:49 -07:00
David Erwin c207a59c18 Merge pull request #248 from coralproject/registration-fix
Registration fix
2017-01-19 16:24:49 -05: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
Wyatt Johnson 840c91274d Added comments to typeDefs 2017-01-19 11:17:47 -07:00
Wyatt Johnson 03a5acc736 Modularized reolvers 2017-01-19 11:01:24 -07:00
Wyatt Johnson d683b09b1d Added more mutators 2017-01-19 10:39:29 -07:00
Kim Gardner 70a1525058 Merge pull request #242 from coralproject/design-pass-adm
Design Pass Admin
2017-01-19 12:31:48 -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 44f3f99b47 Adding ability to query the currently logged in user. 2017-01-18 19:20:36 -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
Wyatt Johnson 5b30fd89c8 More comments 2017-01-18 11:28:39 -07:00
Wyatt Johnson 52ed18a9b8 Added comments 2017-01-18 11:23:47 -07:00
David Jay f8e55ddc8b Merge branch 'master' of github.com:coralproject/talk into e2e-env-fix 2017-01-18 12:44:44 -05:00
David Jay 074630e628 Updating usernames and passwords to new standards. 2017-01-18 12:43:09 -05:00
Belén Curcio 7140723570 Merge branch 'master' into design-pass-adm 2017-01-18 14:40:09 -03:00
Riley Davis b4ca90a05d Merge pull request #247 from coralproject/prevent-server-restart
add nodemon config to prevent server restart while developing front end
2017-01-18 10:14:34 -07:00
David Jay b59512d2b8 Allowing e2e to run with only node_env=test. 2017-01-18 12:12:49 -05:00
Riley Davis f9bc623764 make a hidden file 2017-01-18 10:10:47 -07:00
Riley Davis 810cc002c9 add nodemon config to prevent server restart while developing front end 2017-01-18 10:02:15 -07:00
David Erwin c03f85d4b6 Merge pull request #246 from coralproject/my-comment-fix-part-deux
fix my comments
2017-01-18 10:49:33 -05:00
Wyatt Johnson 17849898ae First pass 2017-01-18 00:09:26 -07:00
Riley Davis 14fd5e4451 does a null check 2017-01-17 15:12:19 -07:00
Riley Davis 8588cab228 Merge pull request #245 from coralproject/revert-244-my-comments-fix
Revert "My Comment bug fix"
2017-01-17 14:59:37 -07:00
Riley Davis af71059948 Revert "My Comment bug fix" 2017-01-17 14:53:28 -07:00
Riley Davis dc866437ff Merge pull request #244 from coralproject/my-comments-fix
My Comment bug fix
2017-01-17 14:26:49 -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