1539 Commits

Author	SHA1	Message	Date
Riley Davis	546dd63d8c	why did only this get changed?	2017-03-20 16:21:01 -06:00
gaba	e5bac88bb5	Merge branch 'master' into story-138187767-mod-flag-names	2017-03-20 15:02:38 -07:00
gaba	be2ecf0838	Adds user and message to flagaction to display in FE.	2017-03-20 13:38:11 -07:00
gaba	9e76ca5d27	Fix CSS.	2017-03-20 12:37:21 -07:00
Riley Davis	09ec2dba94	combine destructuring	2017-03-20 10:47:00 -07:00
Wyatt Johnson	46ecf0c06f	Renamed pageData -> config	2017-03-20 10:46:59 -07:00
Wyatt Johnson	b35170484e	Merge branch 'master' into recaptcha-fix	2017-03-20 10:46:59 -07:00
Wyatt Johnson	8eac8d6890	Merge branch 'master' into recaptcha-fix	2017-03-20 10:46:58 -07:00
Wyatt Johnson	5768d30a7a	Added new pageData action/reducer	2017-03-20 10:46:57 -07:00
Riley Davis	9d64639f8e	differentiate between top- and comment-level LoadMore	2017-03-20 10:45:31 -07:00
Riley Davis	316aa12481	add spanish translations	2017-03-20 10:45:31 -07:00
Riley Davis	73c59cb137	show different copy per # of replies	2017-03-20 10:45:30 -07:00
Riley Davis	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
Riley Davis	d2e2eef046	do a null check.	2017-03-20 10:27:31 -07:00
gaba	a2833538a7	move CountdownTimer to its own component	2017-03-20 10:26:12 -07:00
Kim Gardner	1a83ffe482	Merge branch 'master' into config-shuffle	2017-03-20 10:21:59 -07:00
Riley Davis	92055c7814	correctly handle error when not logged in	2017-03-20 10:21:58 -07:00
riley	e975d6d809	move pre-mod links	2017-03-20 10:21:57 -07:00
Riley Davis	63c3d02329	change Stream > Story sometimes	2017-03-20 10:21:56 -07:00
Riley Davis	dedcb87435	Merge branch 'master' into recaptcha-support	2017-03-20 10:21:55 -07:00
gaba	7232d09eb3	Merge branch 'master' into remove-like-widget	2017-03-20 07:47:37 -07:00
Riley Davis	5c767b6aa6	Merge branch 'master' into recaptcha-support	2017-03-20 07:42:31 -07:00
riley	1ff5ab2e3e	remove like widget for now	2017-03-20 07:42:31 -07:00
David Erwin	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 Gardner	6af8ef7838	Merge branch 'master' into hide-dashboard-cta	2017-03-20 07:39:31 -07:00
Kim Gardner	01db845814	Merge branch 'master' into firefox-mod-buttons	2017-03-20 07:39:29 -07:00
Riley Davis	337b6accec	remove fakeurl	2017-03-20 07:39:28 -07:00
riley	39e69f3bdc	button text was wrapping in firefox	2017-03-20 07:39:27 -07:00
riley	21acb0d1d7	indentation and flag -> report	2017-03-20 07:39:27 -07:00
Riley Davis	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 Erwin	1d061ce359	Merge branch 'master' into asset-comment-metrics	2017-03-20 07:36:23 -07:00
Riley Davis	f005907894	add some translations	2017-03-20 07:36:23 -07:00
Riley Davis	2c4bf52f6b	add Activity widget	2017-03-20 07:36:22 -07:00
Riley Davis	c8a0ded4ad	try to just add recaptcha manually ... use react-recaptcha remove recaptcha file	2017-03-20 07:36:21 -07:00
riley	ca07406b1a	Merge branch 'master' into recaptcha-support	2017-03-20 07:36:20 -07:00
Riley Davis	f8b3c5752e	Merge branch 'master' into keyboard-shortcut-scroll	2017-03-20 07:36:19 -07:00
Riley Davis	46e8d30e22	scrollIntoView will work in more browsers	2017-03-20 07:36:18 -07:00
David Jay	ae4bae6cd2	Scrolling to keep selected comments in view.	2017-03-20 07:36:17 -07:00
David Erwin	fe6e6fbd2f	Merge branch 'master' into widen-notifications	2017-03-20 07:32:56 -07:00
Riley Davis	eab5832457	Merge branch 'master' into bugfix-ban-dialog-language	2017-03-20 07:32:55 -07:00
David Jay	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
Riley Davis	e5c108f8fb	make notifications wider	2017-03-20 07:29:09 -07:00
David Erwin	2f86b9eecf	Merge branch 'master' into bugfix-ban-dialog-language	2017-03-20 07:29:09 -07:00
Riley Davis	587ee82787	Merge branch 'master' into widget-auto-update	2017-03-20 07:29:07 -07:00
David Jay	88538d7b64	Merge branch 'master' into remove-notification-warning	2017-03-20 07:29:05 -07:00
David Jay	2d968126ab	Merge branch 'master' into remove-notification-warning	2017-03-20 07:29:05 -07:00