208 Commits

Include renames

Author	SHA1	Message	Date
gaba	9eaed90318	Revert "Revert "Story 138187767 - Moderate Flag User Names"" ... This reverts commit 903aa23f19.	2017-03-24 11:15:42 -07:00
David ErwinandGitHub	903aa23f19	Revert "Story 138187767 - Moderate Flag User Names"	2017-03-23 11:18:55 -04:00
Riley DavisandGitHub	d8e92968a5	Merge branch 'master' into admin-ux	2017-03-22 13:22:21 -06:00
Belen Curcio	6a5f667336	hover, menu order	2017-03-22 13:20:26 -03:00
gaba	e5bac88bb5	Merge branch 'master' into story-138187767-mod-flag-names	2017-03-20 15:02:38 -07:00
Wyatt Johnsonandgaba	8eac8d6890	Merge branch 'master' into recaptcha-fix	2017-03-20 10:46:58 -07:00
Wyatt Johnsonandgaba	5768d30a7a	Added new pageData action/reducer	2017-03-20 10:46:57 -07:00
Riley Davisandgaba	517ede1977	dashboard reload fix	2017-03-20 10:45:29 -07:00
gaba	2a66a78d41	Merge branch 'master' into recaptcha-support	2017-03-20 10:37:18 -07:00
gaba	a2833538a7	move CountdownTimer to its own component	2017-03-20 10:26:12 -07:00
Riley Davisandgaba	63c3d02329	change Stream > Story sometimes	2017-03-20 10:21:56 -07:00
Riley Davisandgaba	5c767b6aa6	Merge branch 'master' into recaptcha-support	2017-03-20 07:42:31 -07:00
rileyandgaba	39e69f3bdc	button text was wrapping in firefox	2017-03-20 07:39:27 -07:00
Riley Davisandgaba	c8a0ded4ad	try to just add recaptcha manually ... use react-recaptcha remove recaptcha file	2017-03-20 07:36:21 -07:00
gaba	be351e46fd	Merge branch 'master' into bugfix-ban-dialog-language	2017-03-20 07:32:06 -07:00
David Erwinandgaba	2f86b9eecf	Merge branch 'master' into bugfix-ban-dialog-language	2017-03-20 07:29:09 -07:00
Riley Davisandgaba	aec0f678c0	Merge branch 'master' into autoreject-on-ban	2017-03-20 07:27:13 -07:00
Wyatt JohnsonandGitHub	b277f3be75	Merge branch 'master' into recaptcha-fix	2017-03-16 11:59:56 -06:00
Riley Davis	39596399ec	dashboard reload fix	2017-03-16 11:45:10 -06:00
Wyatt Johnson	598fcc4cb0	Added new pageData action/reducer	2017-03-16 11:07:38 -06:00
Riley Davis	736ac11782	Merge branch 'master' into recaptcha-support	2017-03-16 10:12:28 -06:00
Riley Davis	9ddc3aa0b7	move CountdownTimer to its own component	2017-03-15 14:13:18 -06:00
Riley Davis	04298aca7d	change Stream > Story sometimes	2017-03-14 16:30:02 -06:00
Riley DavisandGitHub	099cc36b89	Merge branch 'master' into recaptcha-support	2017-03-14 15:33:18 -06:00
Riley Davis	7bbf8abd3d	try to just add recaptcha manually ... use react-recaptcha remove recaptcha file	2017-03-14 15:32:16 -06:00
riley	801555e66e	button text was wrapping in firefox	2017-03-13 12:08:57 -06:00
David JayandGitHub	542ccc6190	Merge branch 'master' into bugfix-ban-dialog-language	2017-03-09 13:40:44 -05:00
David Jay	377563c798	Hiding rejected note on ban dialog for rejected comments.	2017-03-08 17:02:47 -05:00
David Jay	fac3d26c22	Closing ban dialog after ban is complete.	2017-03-08 16:39:53 -05:00
David Jay	d203a9afe0	Auto-rejecting comments on ban.	2017-03-08 16:06:34 -05:00
gaba	564b8d8eaa	Merge branch 'master' into story-138187767-mod-flag-names	2017-03-07 13:04:28 +01:00
Belen Curcio	5da1af8387	Styles ready!	2017-03-03 13:00:22 -05:00
Kim GardnerandGitHub	b5653eca2d	Merge branch 'master' into keyboard-shortcuts	2017-03-03 09:59:45 -05:00
David Jay	78be17ec6d	Adding keyboard selection of comments.	2017-03-02 15:19:33 -05:00
David Jay	609af767e8	Merge branch 'master' of github.com:coralproject/talk into bugfix-e2e-permalink	2017-03-02 13:04:32 -05:00
David Jay	acda388d4e	Updating e2e tests.	2017-03-02 13:00:54 -05:00
gaba	1899dcbb7e	Suspend User dialog.	2017-03-02 09:27:53 -08:00
gaba	f5ef33d24e	Ban Button with graphql mutation.	2017-03-01 12:57:12 -08:00
Riley Davis	4e5bcbc27f	even more design updates	2017-03-01 11:42:03 -07:00
Riley Davis	045fa3e2a9	also ignore this	2017-03-01 10:42:01 -07:00
Riley Davis	58870e1630	Merged branch master into admin-login-upgrade	2017-03-01 10:40:51 -07:00
Belen Curcio	453894be80	Merge	2017-03-01 11:46:28 -03:00
Belen Curcio	ea0602b7a5	Design Comment Component	2017-03-01 11:42:08 -03:00
gaba	da3c812dc1	Adds graphql for users flagged in the server and client.	2017-02-28 21:33:01 -08:00
Belen Curcio	339aefa72a	Merge branch 'master' of github.com:coralproject/talk into comment-component	2017-02-28 21:26:57 -03:00
riley	7ccf77b1ad	add reset password link	2017-02-28 17:10:51 -07:00
Riley Davis	1f3eb5f516	Merged branch master into admin-login-upgrade	2017-02-28 16:31:49 -07:00
riley	8f23ca678d	add Alert component to coral-ui	2017-02-28 16:31:30 -07:00
Riley Davis	b369fb9101	re-rename	2017-02-28 14:38:19 -07:00
Riley Davis	e2273f5810	change PermissionRequired to LoginView and create a login form. delete old login page	2017-02-28 14:32:01 -07:00