2910 Commits

Author	SHA1	Message	Date
Wyatt Johnson	fd87ef3b85	Merge branch 'master' into update-my-comments	2017-08-09 09:58:44 +10:00
Wyatt Johnson	1521ec43eb	Merge branch 'master' into view-more-history	2017-08-09 09:39:53 +10:00
Kiwi	9f1bce1221	Merge branch 'master' into update-my-comments	2017-08-08 17:55:22 +02:00
Kiwi	528c2a9491	Merge branch 'master' into view-more-history	2017-08-08 17:55:17 +02:00
Kiwi	948d362c40	Merge branch 'master' into expose-avatar-container-class	2017-08-08 17:54:52 +02:00
Wyatt Johnson	49ad48d70f	Merge branch 'master' into fix-bugs-action-summaries	2017-08-08 15:40:21 +10:00
Erik Reyna	1e8d2ce3a6	expose talk-stream-comment-avatar class	2017-08-07 14:11:51 -04:00
Chi Vinh Le	c2f8f41e59	Support rendering system flags	2017-08-07 18:12:07 +07:00
Chi Vinh Le	d2a2f94531	Merge branch 'view-more-history' of ssh://github.com/coralproject/talk into view-more-history	2017-08-04 23:30:10 +07:00
Chi Vinh Le	0df4fd1e37	Adjust styling	2017-08-04 23:24:40 +07:00
Chi Vinh Le	5ceda4f2d2	Update my comments after posting	2017-08-04 22:35:26 +07:00
Kiwi	0523a1f828	Merge branch 'master' into view-more-history	2017-08-04 17:07:57 +02:00
Chi Vinh Le	12d3273d3d	Support load more in user history	2017-08-04 22:02:44 +07:00
Kim Gardner	e6330cd8c3	Merge branch 'master' into more-css-classes	2017-08-04 07:04:43 -04:00
Chi Vinh Le	203707124c	More css classes	2017-08-04 16:55:02 +07:00
Wyatt Johnson	e435c323ec	Merge branch 'master' into correctly-resolve-isClosed	2017-08-04 14:01:49 +10:00
Chi Vinh Le	5d2b9439d8	Add some comments	2017-08-03 21:50:16 +07:00
Chi Vinh Le	b8f24b952b	Automatically close stream when passed closedAt date	2017-08-03 21:41:01 +07:00
Chi Vinh Le	b6d284495e	Merge branch 'master' into correctly-resolve-isClosed	2017-08-03 21:00:28 +07:00
Chi Vinh Le	a527990413	Merge branch 'master' into correctly-resolve-isClosed	2017-08-03 20:26:32 +07:00
Wyatt Johnson	325626fecf	removed all emitter listeners when we remove the stream	2017-08-03 11:33:07 +10:00
Wyatt Johnson	15c7a7cad7	Added support for embed unloading	2017-08-03 11:23:06 +10:00
Chi Vinh Le	da0d0349dd	Implement approve and live updates	2017-08-02 21:34:48 +07:00
Chi Vinh Le	b6b7570bcc	Remove subscription code	2017-08-02 18:14:52 +07:00
Belen Curcio	145910c4a6	Merge branch 'master' of github.com:coralproject/talk into featured-adm	2017-08-01 18:27:12 -03:00
Belen Curcio	4e5f1528f9	BE Subscription for Featured Comments	2017-08-01 18:27:02 -03:00
Kim Gardner	8157a223d0	Merge branch 'master' into portuguese-translation	2017-08-01 13:38:45 -04:00
Kim Gardner	b03223b67b	Merge branch 'master' into portuguese-translation	2017-08-01 13:37:48 -04:00
Kim Gardner	eac8c63045	Fix language files	2017-08-01 13:28:59 -04:00
Chi Vinh Le	b972f4305e	Correctly determine the status of the asset	2017-08-02 00:04:11 +07:00
Kim Gardner	d300025c00	Update i18n config	2017-08-01 12:55:05 -04:00
Belen Curcio	779260c245	Working featured comments on the admin side	2017-08-01 13:06:21 -03:00
Kim Gardner	faa6971961	Merge branch 'master' into provide-valid-optimistic-status	2017-08-01 11:59:34 -04:00
Chi Vinh Le	26c70bcee8	Provide a valid comment status in optimistic response	2017-08-01 22:44:53 +07:00
Kim Gardner	1487a454e9	Merge branch 'master' into fix-popup-safari-errors	2017-08-01 11:05:17 -04:00
Belen Curcio	d40242f92f	Merge branch 'master' of github.com:coralproject/talk into featured-adm	2017-08-01 11:28:10 -03:00
Chi Vinh Le	5b751b7ba4	Fix Safari issues for popups	2017-08-01 20:32:49 +07:00
Kiwi	270d9b3e22	Merge branch 'master' into new-queue	2017-08-01 14:34:56 +02:00
Wyatt Johnson	a99ffa1228	removed all traces of transform-runtime	2017-08-01 22:18:56 +10:00
Wyatt Johnson	2ac6a9d829	changes to babelrc	2017-08-01 22:12:02 +10:00
Chi Vinh Le	9929046536	Fix reported queue take 2	2017-08-01 18:06:06 +07:00
Chi Vinh Le	cb874f8670	Change moderate link in user detail	2017-08-01 17:29:36 +07:00
Chi Vinh Le	d2c8019408	Change moderate link	2017-08-01 17:28:51 +07:00
Chi Vinh Le	33a30e4f8d	Remove unnessecary query fields	2017-08-01 17:24:48 +07:00
Chi Vinh Le	59ea17119d	Remove unnessecary arrow function	2017-08-01 17:20:29 +07:00
Chi Vinh Le	2a78ce2bf1	Restore flagged queue	2017-08-01 17:18:52 +07:00
Chi Vinh Le	b1b24d0f9d	Change admin index route	2017-08-01 17:18:41 +07:00
Chi Vinh Le	3ae6dff098	Change href of moderate stream	2017-08-01 17:16:53 +07:00
Kim Gardner	57ff4f10f3	Merge branch 'master' into babel	2017-07-31 19:22:51 -04:00
Kim Gardner	bb5f245df8	Merge branch 'master' into new-queue	2017-07-31 19:21:57 -04:00