800 Commits

Include renames

Author	SHA1	Message	Date
rileyandgaba	1ff5ab2e3e	remove like widget for now	2017-03-20 07:42:31 -07:00
David Erwinandgaba	c55b4d22d7	Language update	2017-03-20 07:42:29 -07:00
gaba	a71b8a4ae4	Merge branch 'master' into asset-comment-metrics	2017-03-20 07:41:12 -07:00
Kim Gardnerandgaba	6af8ef7838	Merge branch 'master' into hide-dashboard-cta	2017-03-20 07:39:31 -07:00
rileyandgaba	39e69f3bdc	button text was wrapping in firefox	2017-03-20 07:39:27 -07:00
Riley Davisandgaba	2124ca0f34	save dismissed timer note to localStorage	2017-03-20 07:39:26 -07:00
gaba	6f3cb34817	Merge branch 'master' into asset-comment-metrics	2017-03-20 07:39:00 -07:00
David Erwinandgaba	1d061ce359	Merge branch 'master' into asset-comment-metrics	2017-03-20 07:36:23 -07:00
Riley Davisandgaba	f005907894	add some translations	2017-03-20 07:36:23 -07:00
Riley Davisandgaba	2c4bf52f6b	add Activity widget	2017-03-20 07:36:22 -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
rileyandgaba	ca07406b1a	Merge branch 'master' into recaptcha-support	2017-03-20 07:36:20 -07:00
Riley Davisandgaba	f8b3c5752e	Merge branch 'master' into keyboard-shortcut-scroll	2017-03-20 07:36:19 -07:00
Riley Davisandgaba	46e8d30e22	scrollIntoView will work in more browsers	2017-03-20 07:36:18 -07:00
David Jayandgaba	ae4bae6cd2	Scrolling to keep selected comments in view.	2017-03-20 07:36:17 -07:00
Riley Davisandgaba	eab5832457	Merge branch 'master' into bugfix-ban-dialog-language	2017-03-20 07:32:55 -07:00
David Jayandgaba	a243310ecd	Merge branch 'master' into bugfix-ban-dialog-language	2017-03-20 07:32:54 -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	db38bcb477	modify to light grey	2017-03-20 07:29:04 -07:00
gaba	b2234bc3c9	Merge branch 'master' ... Conflicts: client/coral-admin/src/containers/Dashboard/Widget.css	2017-03-20 07:28:17 -07:00
Riley Davisandgaba	e0d3ad32e2	Merge branch 'master' into open-closed-stream-buttons	2017-03-20 07:27:20 -07:00
David Erwinandgaba	5f5d33931e	Merge branch 'master' into open-closed-stream-buttons	2017-03-20 07:27:19 -07:00
Riley Davisandgaba	b94401a8cf	make only the title clickable	2017-03-20 07:27:19 -07:00
David Jayandgaba	1fd74068cd	Merge branch 'master' into open-closed-stream-buttons	2017-03-20 07:27:18 -07:00
Riley Davisandgaba	90298436c6	Merge branch 'master' into widget-auto-update	2017-03-20 07:27:17 -07:00
David Jayandgaba	203776d07c	Merge branch 'mod-queue-load-more' of github.com:coralproject/talk into mod-queue-load-more	2017-03-20 07:27:16 -07:00
David Jayandgaba	a78648fc0d	Merge branch 'master' into mod-queue-load-more	2017-03-20 07:27:15 -07:00
Belén Curcioandgaba	6d43969e3b	Merge branch 'master' into autoreject-on-ban	2017-03-20 07:27:14 -07:00
Riley Davisandgaba	aec0f678c0	Merge branch 'master' into autoreject-on-ban	2017-03-20 07:27:13 -07:00
gaba	ff71908a10	Merge branch 'master' into mod-queue-load-more	2017-03-20 07:26:00 -07:00
David Erwinandgaba	a430ca65c2	Merge branch 'master' into widget-auto-update	2017-03-20 07:24:17 -07:00
David Erwinandgaba	8b0f01f2aa	Merge pull request #394 from coralproject/bugfix-mod-queue-refresh ... Preventing admin panel refresh on accept and reject	2017-03-20 07:24:14 -07:00
Riley Davis	43119e5e15	sort the stories by date	2017-03-17 14:30:11 -06:00
Riley Davis	c48ce8323d	combine destructuring	2017-03-17 10:18:07 -06:00
Wyatt Johnson	df4e07d39c	Renamed pageData -> config	2017-03-17 08:37:58 -06: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	1043a37eef	do a null check.	2017-03-16 09:28:17 -06:00
Riley Davis	378e855c4c	remove logs	2017-03-15 14:20:27 -06:00
Riley Davis	9ddc3aa0b7	move CountdownTimer to its own component	2017-03-15 14:13:18 -06:00
Kim GardnerandGitHub	babd1b3d8d	Merge branch 'master' into config-shuffle	2017-03-15 13:30:43 -04:00
Riley Davis	9beff74862	correctly handle error when not logged in	2017-03-15 11:16:13 -06:00
riley	3071b3783e	move pre-mod links	2017-03-15 10:15:47 -06:00
Riley Davis	04298aca7d	change Stream > Story sometimes	2017-03-14 16:30:02 -06:00
Riley DavisandGitHub	dbd1366c26	Merge branch 'master' into recaptcha-support	2017-03-14 15:56:20 -06:00
Riley Davis	b612bbd96c	Merge branch 'master' into remove-like-widget	2017-03-14 15:35:07 -06:00
Riley DavisandGitHub	099cc36b89	Merge branch 'master' into recaptcha-support	2017-03-14 15:33:18 -06:00