Matthew Taylor 8014925cce Merge branch 'develop' of https://github.com/LLK/scratch-www into bugfix/GH-148 ... # By Ray Schamp # Via Andrew Sliwinski (2) and Ray Schamp (2) * 'develop' of https://github.com/LLK/scratch-www: Fix GH-168: Rehabilitate the `Modal` props.style Fix GH-162: Show "user deletion canceled" modal Clean up activity item rendering logic Add some padding to the empty message Make sure boxes aren't transparent Add empty state for What's Happening box # Conflicts: # src/components/registration/registration.jsx		2015-10-25 09:11:43 -04:00
..
components	Merge branch 'develop' of https://github.com/LLK/scratch-www into bugfix/GH-148	2015-10-25 09:11:43 -04:00
lib	Give name to the exported module	2015-10-16 15:10:17 -04:00
mixins	Merge pull request #142 from mewtaylor/issue/forward-accept-language	2015-10-23 08:50:44 -04:00
scripts	Generate output dir if it doesn't exist	2015-10-19 18:16:13 -04:00
views	Merge pull request #143 from rschamp/feature/empty-activity	2015-10-24 18:58:53 -04:00
_colors.scss	Add welcome component and show it conditionally	2015-10-22 12:21:47 -04:00
environment.js	Make app more transparent to Selenium	2015-10-09 14:16:37 -06:00
init.js	Add window.Intl polyfill. Resolves GH-96	2015-10-21 20:49:31 -04:00
main.jsx	Give name to the exported module	2015-10-16 15:10:17 -04:00
main.scss	Add some padding to the empty message	2015-10-24 12:38:23 -04:00