150 Commits

Author	SHA1	Message	Date
Kim Gardner	d65fb64b7e	Update for major release to include Best Comments	2017-03-03 11:28:22 -05:00
Kim Gardner	65c9bc550e	Merge branch 'master' into bump-version-101	2017-03-03 09:59:15 -05:00
Belén Curcio	f30275e375	Merge branch 'master' into 138617379_best_comments	2017-03-03 09:51:25 -05:00
Kim Gardner	edd694cfa5	Bump version for 1.0.1 release	2017-03-03 06:55:55 -05:00
Wyatt Johnson	daf0d38c26	fixes #362	2017-03-02 12:07:42 -07:00
Wyatt Johnson	eb8b733ac7	Merge branch 'master' into 138617379_best_comments	2017-03-01 11:46:04 -07:00
Wyatt Johnson	af8c926296	Pinning to 7.6 until upstream issues resolved, see #357	2017-03-01 11:37:29 -07:00
Wyatt Johnson	69deba245a	Merge branch 'master' into 138617379_best_comments	2017-03-01 10:32:57 -07:00
Benjamin Goering	405dac292c	Only transform-async-to-generator for client code. Allows async to work with mocha tests (if proper node version)	2017-03-01 13:43:39 +08: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	afcdacff0d	Added yarn.lock to Dockerfile	2017-02-17 17:49:59 -07:00
David Jay	4fedb7f31e	Merge branch 'master' of github.com:coralproject/talk into load-more-comments	2017-02-10 14:34:19 -08:00
Wyatt Johnson	25103630b5	Added graphql docs endpoint.	2017-02-08 17:41:28 -07:00
David Jay	0c777cbad4	Adding loadMore function.	2017-02-08 08:59:38 -08:00
Wyatt Johnson	6b582fdb2c	Updated docker + build	2017-02-01 12:54:04 -07:00
Wyatt Johnson	f4177f318f	Upgraded webpack	2017-02-01 12:34:17 -07:00
David Jay	4a6b09ac96	Merge branch 'master' into e2e-port-fix	2017-01-31 14:41:43 -05:00
Wyatt Johnson	e6ef4b615f	Changed prompt lib, updated cli's ... - fixes #252	2017-01-30 17:46:09 -07:00
David Jay	e8d8c7af5b	Switching e2e to port 3011.	2017-01-30 18:04:17 -05:00
David Jay	fcf22ef4f9	Adding selenium settings and fixing bug in moderation approval.	2017-01-27 14:07:34 -05:00
David Jay	aa83aea849	Merge branch 'master' of github.com:coralproject/talk into e2e-env-fix	2017-01-25 17:17:04 -05:00
Wyatt Johnson	edf9ced454	Added PID support	2017-01-25 11:11:33 -07:00
Wyatt Johnson	603854c0be	Adjusted tests for circle	2017-01-24 14:06:39 -07:00
Wyatt Johnson	9e22c100f0	Added admin login form (naive approach)	2017-01-23 16:31:37 -07:00
Wyatt Johnson	6563f29ccf	Moved tests -> test because mocha likes that	2017-01-20 17:28:08 -07:00
Riley Davis	5f63af8140	Merged branch master into graphql	2017-01-18 14:24:45 -07:00
David Erwin	e36ecdfb33	Implement stream with data fetch	2017-01-18 15:58:36 -05: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	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
Wyatt Johnson	17849898ae	First pass	2017-01-18 00:09:26 -07:00
Wyatt Johnson	10aaa037dc	Added dev-start and --config flag	2017-01-11 11:37:06 -07:00
Wyatt Johnson	4eb7c72ae2	Merge branch 'master' into email-confirm	2017-01-05 18:45:06 -07:00
gaba	864b08135a	Moves the packages to dependencies.	2017-01-04 16:24:17 -03:00
gaba	3718efce1e	Adds cookie parser	2017-01-04 12:47:19 -03:00
gaba	ec3e9d1cd4	Merge branch 'master' into csrf	2016-12-22 14:23:01 -08:00
gaba	075fe7f6b4	Merge branch 'master' into csrf	2016-12-21 16:03:59 -08:00
Riley Davis	b6a11fb729	Merged branch master into suspect-wordlist	2016-12-21 11:12:26 -07:00
Wyatt Johnson	ef38ed3443	Added postinstall hook for heroku deploys	2016-12-20 17:51:30 -07:00
Wyatt Johnson	36c9f51aa8	Initial support for Heroku Deployment	2016-12-20 17:33:18 -07:00
Riley Davis	ef0055e689	highlight suspect words	2016-12-20 16:42:16 -07:00
Riley Davis	652a41971b	Merge branch 'master' ... Conflicts: client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js	2016-12-20 14:51:36 -07:00
gaba	16a4daaeb3	Merge branch 'master' into csrf	2016-12-20 13:46:08 -08:00
Riley Davis	123ba07b63	add tag package to simplify wordlist ui	2016-12-19 16:43:00 -07:00
Belen Curcio	3fbb8f2345	test env	2016-12-19 14:54:27 -03:00
Belen Curcio	428a62ffd4	tests	2016-12-18 11:31:27 -03:00
Belen Curcio	d36a471780	Updating package.json and nightwatch package	2016-12-17 10:45:53 -03:00
gaba	7b8131d4b0	Use session instead of cookies.	2016-12-15 15:01:05 -08:00
gaba	e76d6e4694	Merge branch 'master' into csrf	2016-12-15 13:23:18 -08:00