wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-03 11:28:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,586 Commits 10 Branches 125 Tags
6a46fb822d82237db9443bf94de63e8ed95de5d7
Commit Graph

49 Commits

Author SHA1 Message Date
David Erwin 06378209a2 Merge branch 'master' into optimise-initial-query 2017-04-27 13:49:12 -04:00
Wyatt Johnson ec915208e5 Moved dep to devDeps 2017-04-27 10:48:03 -06:00
Chi Vinh Le 8c53bc2d22 Postpone first query until checked login 2017-04-27 22:55:36 +07:00
Wyatt Johnson 5559940967 Fixed dockerfile temp, updated yarn.lock 2017-04-27 08:29:16 -06:00
David Erwin 077daeb793 Merge branch 'master' into subscriptions 2017-04-26 16:55:32 -04:00
Chi Vinh Le 4bacc2b0c2 Update Apollo 2017-04-25 22:31:59 +07:00
Wyatt Johnson 7acaaadcd6 Merge branch 'master' into subscriptions 2017-04-10 14:33:08 -06:00
Wyatt Johnson c12660be3b Merge branch 'master' into subscriptions 2017-04-06 15:39:24 -06:00
Belen Curcio f779a55096 Merge branch 'master' of github.com:coralproject/talk into plugin 2017-04-06 18:33:17 -03:00
Wyatt Johnson 1f367e666b Added joi plugin validation 2017-04-06 10:39:36 -06:00
Chi Vinh Le 7c2b16521a Merge branch 'master' into plugin 
Conflicts:
	.eslintignore
	.gitignore
	graph/resolvers/index.js
	plugins.json
 2017-04-06 21:22:40 +07:00
Wyatt Johnson 3c91b9cda1 Merge branch 'master' into subscriptions 2017-04-05 13:36:57 -06:00
Chi Vinh Le b0effe8731 Merge with 'master' 2017-04-06 01:26:48 +07:00
Chi Vinh Le 582f799b6c Revert "Merge" 
This reverts commit d9835a17d3, reversing
changes made to 18d6846f4e.
 2017-04-06 00:53:21 +07:00
Wyatt Johnson 8a06118d94 Added coral facebook auth plugin, some circ dep fixes 2017-04-05 11:39:54 -06:00
Belen Curcio d9835a17d3 Merge 2017-04-05 12:08:07 -03:00
Wyatt Johnson 45c7cbad9e Merge branch 'master' into subscriptions 2017-04-05 08:08:56 -06:00
Chi Vinh Le 765bee40b4 Update apollo 2017-04-05 18:46:16 +07:00
Wyatt Johnson 07d1f9d3cf Merge branch 'master' into subscriptions 2017-04-04 09:58:50 -06:00
Wyatt Johnson b5280b1221 Added support for plugin relative imports 2017-04-03 13:02:32 -06:00
Chi Vinh Le 73e2b899d8 Use custom plugins loader 2017-04-03 14:19:51 +07:00
Wyatt Johnson 1b8489165b Merge branch 'master' into docker-plugins 2017-03-31 16:41:34 -06:00
Wyatt Johnson c4edab9bbd cleaned up cli 2017-03-31 16:09:56 -06:00
Wyatt Johnson 0108673566 Added remote plugin reconciliation 2017-03-31 15:54:39 -06:00
Wyatt Johnson 5fec7c3a11 Added support for resolveType post hooks 2017-03-30 15:55:41 -06:00
Belén Curcio 0ec582e411 Merge branch 'master' into markdown-infobox 2017-03-30 13:04:07 -03:00
Chi Vinh Le 4c79f45556 Support Markdown in Infobox 2017-03-30 22:19:02 +07:00
Chi Vinh Le 2d0208046b Implement MarkdownEditor 2017-03-30 20:49:18 +07:00
Chi Vinh Le e878d1ebfd Upgrade React 2017-03-30 17:13:02 +07:00
Wyatt Johnson ffbe976760 working websockets 2017-03-29 09:35:56 -06:00
Wyatt Johnson 228fdeac4d Removed root .babelrc file, upgrades 
- Upgraded packages
- Fixed sourcemaps
- Moved .babelrc config into client folder
- Created .babelrc in tests folder for client tests
 2017-03-24 11:12:57 -06:00
Wyatt Johnson 05efbc4ded Updated lockfile 2017-03-24 10:15:03 -06:00
Wyatt Johnson 63ef49d595 Initial subscription impl 2017-03-23 11:09:14 -06:00
Belen Curcio 5729b03656 my-comments-ux 2017-03-22 15:35:40 -03:00
Wyatt Johnson 6426663103 Merge branch 'master' into plugins 2017-03-17 08:26:42 -06:00
Wyatt Johnson fff9d84303 Initial implementation at plugins 2017-03-14 17:46:04 -06:00
Riley Davis 7bbf8abd3d try to just add recaptcha manually 
use react-recaptcha

remove recaptcha file
 2017-03-14 15:32:16 -06:00
riley b1f426e70d Merge branch 'master' into recaptcha-support 2017-03-13 12:27:19 -06:00
Wyatt Johnson 93221de563 Added support for total comment count 2017-03-09 17:07:07 -07:00
Wyatt Johnson d82f3d0f0d Added initial recaptcha + RL support 2017-03-06 15:26:44 -07:00
Belén Curcio f30275e375 Merge branch 'master' into 138617379_best_comments 2017-03-03 09:51:25 -05:00
Wyatt Johnson daf0d38c26 fixes #362 2017-03-02 12:07:42 -07:00
Wyatt Johnson 69deba245a Merge branch 'master' into 138617379_best_comments 2017-03-01 10:32:57 -07:00
Benjamin Goering 6e338290a1 addCommentTag mutation works 2017-02-28 19:59:32 +08:00
Wyatt Johnson aa88eb2374 Adjusted build process 2017-02-27 15:33:52 -07:00
Wyatt Johnson 1e81ec9f4e Added new commentCount edge, added more docs 2017-02-16 16:49:14 -07:00
Wyatt Johnson 25103630b5 Added graphql docs endpoint. 2017-02-08 17:41:28 -07:00
Wyatt Johnson f4177f318f Upgraded webpack 2017-02-01 12:34:17 -07:00
Wyatt Johnson 723dee3394 Added yarn.lock back 2017-02-01 12:33:50 -07:00