Commit Graph

199 Commits

Author SHA1 Message Date
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 1f562c8fad Merge branch 'master' into subscriptions 2017-04-20 15:17:44 -06:00
Wyatt Johnson 50219922d5 Switched to lock at node 7.8 2017-04-20 09:35:49 -06:00
Wyatt Johnson 7fac8ef073 Merge branch 'master' into subscriptions 2017-04-17 08:03:14 -06:00
Wyatt Johnson 6c0e00155f Initial update 2017-04-12 13:29:01 -06:00
Wyatt Johnson 9f8c9c7eb1 Merge branch 'master' into subscriptions 2017-04-12 10:37:15 -06:00
Kim Gardner 8e76a34631 Bump version and update description 2017-04-12 08:45:19 -04:00
Wyatt Johnson 3a3b89b03b Fixed bugs with plugin install 2017-04-11 14:59:02 -06:00
Wyatt Johnson 7acaaadcd6 Merge branch 'master' into subscriptions 2017-04-10 14:33:08 -06:00
Belen Curcio 27408e1fa1 Linting and Patch 2017-04-06 18:49:12 -03: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 ffb0ee20e8 Cleanup of subscriptions 2017-04-05 16:15:22 -06: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 21eb532c6e Added postinstall hook 2017-04-05 11:49:22 -06: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
Wyatt Johnson 9c806cb6e4 Added support for plugin upgrades 2017-04-03 11:58:54 -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
Belén Curcio 5fe96cf47c Merge branch 'master' into plugin 2017-03-30 13:22:29 -03: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
Belen Curcio 635df54a2c Extended context 2017-03-29 17:21:31 -03:00
Kim Gardner 71d2baa010 Bump version to 1.4.0 2017-03-29 14:43:19 -04: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 63ef49d595 Initial subscription impl 2017-03-23 11:09:14 -06: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 8e6c2e8075 Resolved #357 2017-03-13 09:43:47 -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
David Jay 3280ed9ae5 Merge branch 'master' into premod-links 2017-03-03 16:17:40 -05:00
David Jay 2e5d453ea7 Updating link search and adding settings in admin panel. 2017-03-03 15:44:03 -05:00
Kim Gardner d65fb64b7e Update for major release to include Best Comments 2017-03-03 11:28:22 -05:00