Commit Graph

251 Commits

Author SHA1 Message Date
David Erwin 17d36c69d0 Merge branch 'master' into action-focus-states 2017-06-19 09:23:40 -04:00
Kim Gardner dfccf962d4 Update version number 2017-06-16 17:30:09 -04:00
Belen Curcio ca08efea8a Adding proptypes as a package, and linting 2017-06-15 18:49:05 -03:00
Kim Gardner 69ab46d32a Merge branch 'master' into bump-version-2-0-0 2017-06-14 14:26:57 -04:00
Chi Vinh Le e2fdba4898 Upgrade subscriptions-transport-ws 2017-06-13 00:00:40 +07:00
Chi Vinh Le 2a283a9a5a Support live updates 2017-06-12 23:21:27 +07:00
Kim Gardner dbb0a68766 Prep to release 2.0.0 2017-06-08 15:53:12 -04:00
Kim Gardner 490a5d3263 Merge branch 'master' into 142993479-tags 2017-06-08 11:56:14 -04:00
Kim Gardner 8c1eaf09bc Bump version 1.9.1 2017-06-08 11:51:16 -04:00
Kim Gardner f3dcfd23f3 Merge branch 'master' into 142993479-tags 2017-06-08 11:01:57 -04:00
Kim Gardner a40dd04c1b Update version number 2017-06-07 19:10:13 -04:00
Belen Curcio 63a35cbceb Merge issues 2017-06-07 16:38:36 -03:00
Wyatt Johnson 6827ff2f1f Added support for version enforcing 2017-06-07 10:27:42 -06:00
Wyatt Johnson 1e904584e7 Added model migrations 2017-06-06 17:31:52 -06:00
Wyatt Johnson 7956c193c5 Merge branch 'master' into subscribe-to-comments 2017-06-05 16:38:28 -06:00
Wyatt Johnson a595e94394 Removed parse-duration in favour of ms 2017-06-05 16:31:06 -06:00
Chi Vinh Le 9993350b7e Animate flash for new comments 2017-06-06 00:54:12 +07:00
Chi Vinh Le c20df65ebc Use same lifespan for cookies as for tokens 2017-06-05 18:21:40 +07:00
gaba 44d82f8b13 Merge branch 'master' into i18n-emails 2017-06-01 16:26:44 -07:00
gaba 276b2c7591 Merge branch 'master' into i18n-emails 2017-05-31 15:31:14 -07:00
gaba a126c94aa4 Adds service for translations in the backend. Clean yaml. 2017-05-31 13:55:27 -07:00
Kim Gardner 9bd75a5670 Bump version in prep for 1.8.0 release 2017-05-31 16:55:14 -04:00
Chi Vinh Le 0b7432b75e Merge branch 'master' into i18n-refactor
Conflicts:
	client/coral-sign-in/components/FakeComment.js
	client/coral-sign-in/components/UserBox.js
2017-05-29 20:23:27 +07:00
Chi Vinh Le ee2068f5f1 Merge branch 'master' into auth-flow
Conflicts:
	client/coral-admin/src/actions/auth.js
2017-05-27 01:07:19 +07:00
Chi Vinh Le 99a9154d40 Remove unused dependency 2017-05-27 00:26:04 +07:00
Kim Gardner 178cecad05 Update version 1.7.0 2017-05-25 16:58:35 -04:00
Belen Curcio 460f3f292b Ádding dependencies 2017-05-25 17:41:35 -03:00
Belen Curcio bd21719ea5 Handling non safari browsers 2017-05-24 17:20:23 -03:00
gaba 625362d51e Merge branch 'master' into i18n-refactor 2017-05-19 12:44:34 -07:00
gaba 12cb59ce30 Merge branch 'master' into i18n-refactor 2017-05-18 15:44:14 -07:00
Chi Vinh Le 061c18670b Merge branch 'master' into suspend-user
Conflicts:
	client/coral-admin/src/constants/moderation.js
	client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
2017-05-19 02:19:24 +07:00
Wyatt Johnson 555c593059 Added gzip compression to bundle assets 2017-05-18 11:08:46 -06:00
riley 7896b3f33b merge master 2017-05-16 09:43:49 -06:00
Chi Vinh Le 97121382c7 Merge branch 'master' into suspend-user
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
	client/coral-admin/src/containers/ModerationQueue/components/Comment.js
	client/coral-framework/utils/index.js
	package.json
2017-05-16 21:02:33 +07:00
gaba 423cb3cade Merge branch 'master' into i18n-refactor 2017-05-15 14:02:34 -07:00
Belen Curcio b2e5c0452a The merge conficts 2017-05-15 17:13:48 -03:00
Belen Curcio 4e86e4197c handling logout 2017-05-15 13:13:28 -03:00
Chi Vinh Le 63fa3c4de7 Implement suspend user components 2017-05-15 22:28:04 +07:00
Belen Curcio 76b96a66a2 Adding Bearer token to the Graph Client 2017-05-15 11:41:36 -03:00
Wyatt Johnson d497ad3369 initial pagination rewrite, cleanups to comment edit 2017-05-11 17:27:02 -06:00
gaba 3b80ee8b13 Add YAML loader. Fix i18n module to get YAML files. 2017-05-11 15:05:09 -07:00
gaba 653091fdf9 Merge branch 'master' into i18n-refactor 2017-05-11 09:02:21 -07:00
riley 57b0b5ec67 add a drawer for the user details 2017-05-04 13:58:43 -06:00
Benjamin Goering b97fa228b1 merge with master after huge coral-embed-stream refactor 2017-05-03 19:19:03 -07:00
Benjamin Goering c8e7ec6cbf streamQuery reduces editComment mutations to reflect edits without contacting server 2017-05-03 13:35:51 -07:00
Kim Gardner 28ea498df2 Bump version to 1.6.0 2017-05-03 12:12:25 -04:00
Benjamin Goering aa18a433f8 Can't edit comment outside of edit window 2017-05-02 16:47:00 -05:00
gaba c0fc87ea21 Merge branch 'master' into i18n-refactor 2017-05-01 11:28:06 -07:00
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