3600 Commits

Author	SHA1	Message	Date
Belen Curcio	da2b9aca03	Removing ternary	2017-11-28 14:56:29 -03:00
Belen Curcio	c177403628	Merge branch 'user-status-refactor' of github.com:coralproject/talk into user-status-refactor	2017-11-28 14:37:50 -03:00
Belen Curcio	b7704fb2ca	Translations and Styling	2017-11-28 14:37:23 -03:00
Wyatt Johnson	2437401daf	Merge branch 'next' into user-status-refactor	2017-11-28 09:47:34 -07:00
Wyatt Johnson	7f189cd4d4	Merge branch 'master' into next	2017-11-28 09:47:21 -07:00
Belen Curcio	16e3924d3f	Ban user dialog steps	2017-11-28 13:39:49 -03:00
Belen Curcio	d510905ba2	Adding ban message and setRole	2017-11-28 00:18:09 -03:00
Wyatt Johnson	13865ff29e	roles -> role, null -> COMMENTER for user roles	2017-11-27 11:53:40 -07:00
Belen Curcio	9386912b9b	Approve Username fix	2017-11-27 14:43:04 -03:00
Kim Gardner	e52a6fd9c1	Merge branch 'master' into update-bug-report-link	2017-11-27 16:15:04 +00:00
Belen Curcio	95d356de10	Adding UserDetailCommentList	2017-11-27 12:20:22 -03:00
Kim Gardner	24b5a58584	Merge branch 'master' into autclose-firefox-bug	2017-11-27 13:07:10 +00:00
Kim Gardner	af83d32de1	Merge branch 'master' into more-padding-qbox	2017-11-27 12:51:50 +00:00
Kim Gardner	44b77597ed	Merge branch 'master' into update-bug-report-link	2017-11-27 12:36:59 +00:00
Belen Curcio	f2dccf7845	Adding addUserRole and removeUserRole	2017-11-24 18:36:59 -03:00
Belen Curcio	e442961dbb	UserDetail Refactor	2017-11-24 18:09:22 -03:00
Belen Curcio	d58e54befa	UserDetail Refactor	2017-11-24 17:35:53 -03:00
Belen Curcio	0fe9577abf	Build User History	2017-11-24 16:24:11 -03:00
Belen Curcio	9703b86784	Working account history	2017-11-24 13:42:45 -03:00
Belen Curcio	741419f47b	missing fragment	2017-11-24 12:58:05 -03:00
Chi Vinh Le	37f3c11104	Fix radiogroup not working properly in ff	2017-11-24 12:29:29 +01:00
Chi Vinh Le	9359bfc322	Fix styling bug in firefox	2017-11-23 20:09:16 +01:00
Chi Vinh Le	7f53375c67	More padding for question box	2017-11-23 13:40:19 +01:00
Belen Curcio	6e6ddbf378	Suspension response	2017-11-23 08:42:08 -03:00
Belen Curcio	5793ba45c3	Restoring message for suspend	2017-11-23 08:17:40 -03:00
Belen Curcio	903973ce4b	Adding message	2017-11-23 08:13:03 -03:00
Belen Curcio	c6c7961dc9	Merge branch 'mod-improv' of github.com:coralproject/talk into user-status-refactor	2017-11-23 08:08:44 -03:00
Belen Curcio	fd0b475b84	banUser and unBanUser - removing setUserStatus	2017-11-23 08:07:13 -03:00
Belen Curcio	b69195253b	banUser and unBanUser wip - removing setStatus	2017-11-22 21:45:55 -03:00
Belen Curcio	dcbae2a117	Updating componets	2017-11-22 12:45:16 -03:00
Belen Curcio	e530003c72	Hiding messages for suspension and bann	2017-11-22 12:38:07 -03:00
Belen Curcio	48e87c4659	Updating contations and deleting legacy code	2017-11-22 12:22:27 -03:00
Belen Curcio	9ae32b9366	removing message	2017-11-22 02:51:16 -03:00
Belen Curcio	e782776ab5	refactor changeUsername - Product question,	2017-11-22 02:37:58 -03:00
Belen Curcio	75d914b894	updated tests, changeUsername container, etc	2017-11-22 02:13:26 -03:00
Belen Curcio	69c93cd048	wip	2017-11-22 01:43:35 -03:00
Belen Curcio	3b768c144b	Bug suspending/banning/rejecting users,	2017-11-22 00:58:59 -03:00
Belen Curcio	f19d6b6800	changes ChangeUsername	2017-11-22 00:53:01 -03:00
Chi Vinh Le	c990a812a4	new design for show all comments button	2017-11-21 15:59:20 +01:00
Kim Gardner	4830aec138	Update Report Bug link in Admin Settings	2017-11-20 19:59:57 +00:00
Belen Curcio	2706e47f85	Now using changeUsername	2017-11-20 16:07:50 -03:00
Belen Curcio	43e9da9cbc	setUsername refactor	2017-11-20 15:37:06 -03:00
Belen Curcio	dbe88e58f4	setUsername refactor	2017-11-20 15:35:16 -03:00
Belen Curcio	1756c7c050	Reject username	2017-11-20 02:04:19 -03:00
Belen Curcio	01b8c7aee6	Safe access to objects	2017-11-20 01:22:44 -03:00
Belen Curcio	e6e5e5506e	removing pending	2017-11-20 00:57:01 -03:00
Belen Curcio	8f12fcd09b	Safe access	2017-11-20 00:38:52 -03:00
Belen Curcio	7ec239fd68	Banned User Stream	2017-11-19 22:52:26 -03:00
Belen Curcio	5299ea674e	bug error view options	2017-11-19 22:50:14 -03:00
Belen Curcio	aa4b386ee6	Banned User Stream	2017-11-19 22:45:05 -03:00