2679 Commits

Author	SHA1	Message	Date
Kiwi	7baa551a5c	Merge branch 'master' into rm-commonjs-framework	2017-07-07 12:39:00 +02:00
Chi Vinh Le	b7c4dbd224	Remove CommonJS style exports in framework	2017-07-07 17:27:05 +07:00
Kiwi	f32c03f002	Merge branch 'master' into threading-cleanup	2017-07-05 17:13:43 +02:00
Chi Vinh Le	693879647e	Cleanup	2017-07-05 22:11:55 +07:00
Kim Gardner	65d6d3221b	Merge branch 'master' into french-translation	2017-07-05 15:36:14 +01:00
Kim Gardner	c976ba0ea4	Merge branch 'master' into french-translation	2017-07-05 09:17:36 +01:00
Chi Vinh Le	6d71bcbee9	Fix styling issues	2017-07-04 22:56:58 +07:00
Chi Vinh Le	9be2a520db	Merge branch 'master' into threading	2017-07-04 22:42:49 +07:00
Chi Vinh Le	d155615102	Add pending comment	2017-07-04 22:41:38 +07:00
Chi Vinh Le	cfa7a74742	Fix isSlotEmpty logic and handle empty plugin_config	2017-07-04 22:22:52 +07:00
Chi Vinh Le	524be1b869	Allow customizing thread levels via TALK_THREADING_LEVEL env	2017-07-04 22:10:40 +07:00
Chi Vinh Le	31ab54d13c	First round styling	2017-07-04 21:32:33 +07:00
David Erwin	79c1bd9bdd	Merge branch 'master' into dont-show-popup-when-empty	2017-07-03 14:35:44 -04:00
Chi Vinh Le	3a2a4379b8	Change to 4 levels	2017-07-04 01:09:27 +07:00
Chi Vinh Le	f1899f2f4a	Threading support	2017-07-04 01:09:12 +07:00
Chi Vinh Le	fd1f8b24c1	Don't show popup when empty	2017-07-03 19:40:26 +07:00
Chi Vinh Le	270c3b7634	Disable plugin components via plugin_config	2017-07-03 19:01:17 +07:00
Chi Vinh Le	7858ccc45d	Switch to prop-types	2017-06-30 23:25:11 +07:00
Chi Vinh Le	e244d4a286	Merge branch 'master' into button-states ... Conflicts: client/coral-embed-stream/src/components/Stream.js	2017-06-30 17:46:17 +07:00
Chi Vinh Le	9de99a9ef4	Support post, reply, edit, load and view more loading states via global css classnames	2017-06-30 17:00:42 +07:00
Belen Curcio	c3ee442775	Replacing moderation comment and history hashes	2017-06-29 13:30:12 -03:00
Belen Curcio	bad869bdfe	Merge branch 'permalink-id' of github.com:coralproject/talk into permalink-id	2017-06-29 13:27:08 -03:00
Belen Curcio	2289c405d1	Translatios	2017-06-29 13:25:50 -03:00
Belen Curcio	354295c0ae	Adding polyfill	2017-06-29 13:20:27 -03:00
Belén Curcio	fbefd7fd20	Merge branch 'master' into permalink-id	2017-06-29 12:35:06 -03:00
Belen Curcio	d31044f39e	linting	2017-06-29 11:25:52 -03:00
Belen Curcio	db9c3b45c1	Stream Error	2017-06-29 11:06:52 -03:00
Belen Curcio	ddac5c2c85	Avoid Error due to invalid queries	2017-06-29 10:48:29 -03:00
Belen Curcio	87f8ed401f	Using CommentId by queryParam	2017-06-29 10:18:40 -03:00
StephanieDClark	ccaa744a78	Updates to tab classes	2017-06-28 14:26:41 -07:00
Chi Vinh Le	b92afff4e7	Don't alias username 2	2017-06-28 21:14:34 +07:00
Kim Gardner	7817804bae	Merge branch 'master' into smooth-scroll	2017-06-28 12:51:43 +01:00
Kim Gardner	e0a32e5a70	Merge branch 'master' into smooth-scroll	2017-06-28 12:27:40 +01:00
Kiwi	b7a981e84b	Merge branch 'master' into no-username-alias	2017-06-28 16:37:01 +07:00
Kim Gardner	3f03994a51	Merge branch 'master' into flag-reason	2017-06-28 10:27:48 +01:00
Kim Gardner	198efd02b4	Merge branch 'master' into smooth-scroll	2017-06-28 10:27:00 +01:00
Kiwi	aff486e909	Merge branch 'master' into no-username-alias	2017-06-28 16:22:12 +07:00
Belén Curcio	04b562543e	Merge branch 'master' into flag-reason	2017-06-27 16:53:56 -03:00
Belen Curcio	dd76ac1ed4	Now the smooth flag works	2017-06-27 16:51:00 -03:00
Belen Curcio	e03e15fb3b	renaming	2017-06-27 16:20:08 -03:00
Belen Curcio	f13682c125	flagMap added to the admin side	2017-06-27 16:12:13 -03:00
Belén Curcio	6d4765b45d	Merge branch 'master' into no-username-alias	2017-06-27 16:03:03 -03:00
David Erwin	b94824b8ee	Merge branch 'master' into live-suspension	2017-06-27 14:14:21 -04:00
Belen Curcio	35ccc5070d	Flag refactor	2017-06-27 14:52:12 -03:00
Kiwi	efb18cdb32	Merge branch 'master' into unify-taglists	2017-06-28 00:28:32 +07:00
Kiwi	2338ff1694	Merge branch 'master' into no-username-alias	2017-06-28 00:15:14 +07:00
Chi Vinh Le	b134d4099c	More concise and functional subscribing	2017-06-28 00:13:47 +07:00
Kim Gardner	1b40521f88	Merge branch 'master' into live-suspension	2017-06-27 17:53:58 +01:00
Chi Vinh Le	97ab338486	Don't alias username	2017-06-27 23:51:49 +07:00
Chi Vinh Le	b67ac375ba	Pass current user to CommentBox	2017-06-27 22:14:06 +07:00