2204 Commits

Author	SHA1	Message	Date
gaba	8dddff25f9	Update es translation and add link to transifex.	2017-05-18 16:01:12 -07:00
gaba	12cb59ce30	Merge branch 'master' into i18n-refactor	2017-05-18 15:44:14 -07:00
gaba	1a7ad410f5	Loads timeago translation when loading translations.	2017-05-18 15:38:53 -07:00
gaba	3ca22bd101	Fix translation keys.	2017-05-18 15:14:37 -07:00
Kim Gardner	b3e494d279	Merge branch 'master' into read-only-inputs	2017-05-18 17:14:48 -04:00
Kim Gardner	12ec058588	Merge branch 'master' into edit-comment-settings	2017-05-18 17:07:37 -04:00
Riley Davis	c772cffc92	handle no-interaction input the correct way	2017-05-18 13:51:48 -06:00
Kim Gardner	e80e79f267	Merge branch 'master' into edit-comment-settings	2017-05-18 14:23:14 -04:00
Benjamin Goering	1d322d8c70	Merge branch 'master' into fix-ignore-user	2017-05-18 10:50:00 -07:00
Benjamin Goering	aaa2da6c23	Stream container refetch then setCommentCountCache to asset.commentCount instead of silly zero	2017-05-18 10:43:38 -07:00
Wyatt Johnson	12713dae86	Removed unused assets	2017-05-18 11:18:08 -06:00
Benjamin Goering	fb33eefe8e	trivial changes requested by review	2017-05-18 08:19:52 -07:00
Benjamin Goering	cfc6d4bfea	Merge branch 'fix-ignore-user' of github.com:gobengo/talk into fix-ignore-user	2017-05-18 08:12:40 -07:00
Benjamin Goering	6bbeee3a6b	StopIgnoringUser does not refetch EmbedQuery	2017-05-18 08:11:39 -07:00
Benjamin Goering	340d3cea62	contains/Stream setCommentCountCache waits for refetch promise	2017-05-18 08:10:20 -07:00
Kim Gardner	e8e9dbe3ca	Merge branch 'master' into fix-ignore-user	2017-05-18 09:49:54 -04:00
gaba	9e954f0ae3	Fix timeago with lang.	2017-05-17 18:05:41 -07:00
Benjamin Goering	cb45f0a8b3	Merge branch 'master' into edit-comment-settings	2017-05-17 15:46:14 -07:00
Benjamin Goering	d93ad38dd1	Admins can change Edit Comment Window length in Moderation Settings	2017-05-17 15:39:19 -07:00
Riley Davis	e343897526	user detail copy button regression	2017-05-17 15:11:00 -06:00
Benjamin Goering	294eb6c81d	Merge branch 'master' into fix-ignore-user	2017-05-17 13:57:23 -07:00
Benjamin Goering	9eac05c8fb	Ignored user tombstones work again	2017-05-17 13:18:59 -07:00
gaba	8d492ca4e9	Adds a few missing keys.	2017-05-17 13:18:04 -07:00
gaba	3aceb0dc38	Merge branch 'master' into i18n-refactor	2017-05-17 12:59:24 -07:00
gaba	5bd9bc992b	Move i18n into a service	2017-05-17 12:53:36 -07:00
Riley Davis	a0f41bb19d	show total comments and rejected %	2017-05-17 10:54:14 -06:00
riley	7896b3f33b	merge master	2017-05-16 09:43:49 -06:00
Chi Vinh Le	c7e0577708	Merge branch 'master' into invalidate-old-data	2017-05-16 18:17:45 +07:00
Chi Vinh Le	2ab8cc9481	Allow Apollo to invalidate old user data	2017-05-16 18:17:43 +07:00
Chi Vinh Le	e1b80c3317	Only refetch for login	2017-05-16 17:50:17 +07:00
Chi Vinh Le	ec19618052	Readd login fixes	2017-05-16 17:26:53 +07:00
Chi Vinh Le	81f51b69ec	Clear token before dispatching logout action	2017-05-16 17:13:19 +07:00
Belen Curcio	d3252b8c87	Done :)	2017-05-15 23:47:29 -03:00
Belen Curcio	1eada688fe	Prettier	2017-05-15 23:23:22 -03:00
gaba	35c941d4d0	Add missing translations from commentbox.	2017-05-15 16:17:53 -07:00
gaba	61856c3cf6	Use timeago.	2017-05-15 16:04:10 -07:00
gaba	c0c6dd6252	The merge got back some code to the coral-framework.	2017-05-15 14:23:56 -07:00
gaba	423cb3cade	Merge branch 'master' into i18n-refactor	2017-05-15 14:02:34 -07:00
gaba	54e103b55a	Change a few translations that had wrong key.	2017-05-15 13:44:46 -07:00
Belen Curcio	2b7f545c2d	lint	2017-05-15 17:31:53 -03:00
gaba	0ead2cb610	Adds sign in translations.	2017-05-15 13:25:09 -07:00
Belen Curcio	b789a8e107	Removing kiwis fix since this was fixed in auth tokens branch	2017-05-15 17:23:57 -03:00
Belen Curcio	b2e5c0452a	The merge conficts	2017-05-15 17:13:48 -03:00
gaba	f32eac4eab	Lint YAML and notations	2017-05-15 12:53:28 -07:00
Chi Vinh Le	74e1436ae4	Use correct error key	2017-05-16 01:09:33 +07:00
Chi Vinh Le	def35f0a93	Fix login issues	2017-05-16 00:55:12 +07:00
Chi Vinh Le	06001763ff	Remove unused files	2017-05-16 00:52:37 +07:00
Belen Curcio	75aa8d79df	linting	2017-05-15 14:50:26 -03:00
Belen Curcio	843c3a16c8	Admin share same network interface, and unifying actions	2017-05-15 14:48:12 -03:00
Belen Curcio	4e86e4197c	handling logout	2017-05-15 13:13:28 -03:00