597 Commits

Author	SHA1	Message	Date
Kim Gardner	ce4ab4e86c	Merge branch 'master' into next	2018-01-04 17:28:13 -05:00
Kim Gardner	fc272ed1e1	Merge branch 'master' into master	2018-01-04 17:02:32 -05:00
Kim Gardner	4eaa234dd8	Merge branch 'master' into simplified-chinese-merge-fixes	2018-01-04 16:48:46 -05:00
Kim Gardner	bf1fbfe03f	Fix merge conflicts on master	2018-01-04 16:43:51 -05:00
Kim Gardner	b9412dcb10	Merge branch 'master' into master	2018-01-04 15:55:18 -05:00
liz	bb8a75937a	Fix for typo in plugin	2018-01-03 18:10:25 +08:00
liz	783e485aa5	Add traditional Chinese locales for plugins	2018-01-03 17:21:30 +08:00
MEL27	a5d7bca8c0	Refine zh_CN translation	2017-12-26 00:20:58 +08:00
MEL27	8a40093399	Refine zh_CN translation	2017-12-25 22:22:46 +08:00
MEL27	b3d76bba05	Miscellaneous zh_CN translation changes	2017-12-25 17:45:03 +08:00
okbel	570c0edfb3	merge conficts	2017-12-20 16:06:55 -03:00
Kim Gardner	70bfd91359	Merge branch 'master' into virtualized	2017-12-18 17:37:04 -06:00
okbel	1cdef8f864	bounded	2017-12-18 15:20:06 -03:00
Belen Curcio	278e1cec1d	done	2017-12-18 13:42:59 -03:00
Belen Curcio	6ad218782e	styling	2017-12-18 13:39:02 -03:00
Belen Curcio	8f1f875d76	less data to the store	2017-12-18 13:36:30 -03:00
Belen Curcio	9fb8e01cd2	working, still wip	2017-12-18 13:34:48 -03:00
okbel	338c23dc3d	unnecesary class	2017-12-18 12:46:24 -03:00
okbel	4d6f38a3d9	wip	2017-12-18 12:43:46 -03:00
okbel	02da749c65	Adding containers and components	2017-12-18 12:20:20 -03:00
okbel	5a1393c039	Adding translations	2017-12-18 12:20:06 -03:00
okbel	d7a5e613fa	Adding reducer	2017-12-18 12:19:46 -03:00
Chi Vinh Le	2b312dbf8e	Next try	2017-12-14 20:41:05 +01:00
Wyatt Johnson	2d70caf03d	Merge branch 'next' into user-status-refactor	2017-12-04 15:42:57 -07:00
Wyatt Johnson	419784f6d1	Merge branch 'master' into next	2017-12-04 15:28:41 -07:00
Belen Curcio	ce9ee0a5b0	Adding styles for mob devs	2017-12-01 15:28:09 -03:00
Belen Curcio	a78bff5ee6	Merge branch 'master' of github.com:coralproject/talk into user-status-refactor	2017-11-30 11:12:53 -03:00
Kim Gardner	a8c0ff0c0a	Merge branch 'master' into next	2017-11-30 11:41:36 +00:00
Wyatt Johnson	fc824b1fbe	Merge branch 'master' into next	2017-11-28 12:58:58 -07:00
Wyatt Johnson	f2fe095b43	fixed bug with featuring comments doesn't work	2017-11-27 16:27:43 -07:00
Wyatt Johnson	13865ff29e	roles -> role, null -> COMMENTER for user roles	2017-11-27 11:53:40 -07:00
Chi Vinh Le	31f87dc192	Pass hover props to extendable tabs in order to support firefox	2017-11-23 14:46:23 +01:00
Belen Curcio	903973ce4b	Adding message	2017-11-23 08:13:03 -03:00
Belen Curcio	fd0b475b84	banUser and unBanUser - removing setUserStatus	2017-11-23 08:07:13 -03:00
Belen Curcio	48e87c4659	Updating contations and deleting legacy code	2017-11-22 12:22:27 -03:00
Belen Curcio	e782776ab5	refactor changeUsername - Product question,	2017-11-22 02:37:58 -03:00
Belen Curcio	69c93cd048	wip	2017-11-22 01:43:35 -03:00
Belen Curcio	e3a8656e32	wip ChangeUsername	2017-11-22 01:32:32 -03:00
Belen Curcio	f19d6b6800	changes ChangeUsername	2017-11-22 00:53:01 -03:00
Belen Curcio	2706e47f85	Now using changeUsername	2017-11-20 16:07:50 -03:00
Belen Curcio	dbe88e58f4	setUsername refactor	2017-11-20 15:35:16 -03:00
Belen Curcio	6a3c80468b	Missing proptype	2017-11-19 22:48:45 -03:00
Belen Curcio	e34ba248b9	Refactor for setUserStatus to setUserBanStatus	2017-11-19 21:04:04 -03:00
Wyatt Johnson	c98c9b3369	Merge branch 'master' into next	2017-11-17 09:29:31 -07:00
Kiwi	ecd9219e17	Merge branch 'master' into extendable-embed-stream-tab	2017-11-15 19:46:04 +01:00
Chi Vinh Le	ce4ad426a7	Extendable embed stream tabs	2017-11-15 19:38:25 +01:00
Belén Curcio	3c5b56c599	Merge branch 'master' into more-undo	2017-11-15 15:00:48 -03:00
Chi Vinh Le	f2b9db9dbc	Support long words for my and featured comments	2017-11-15 13:07:33 +01:00
Chi Vinh Le	5a71db2568	Undo to previous status + Live updates	2017-11-14 13:58:18 +01:00
Wyatt Johnson	81f825d4b3	Merge branch 'master' into next	2017-11-13 16:01:11 -07:00