3199 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
chrisgarrity	edfee0713a	show intro for logged out users ... Switch `&&` to `||`. Current date before AND after HoC is never true.	2018-11-28 12:23:47 -05:00
chrisgarrity	1f6f4d429f	Merge pull request #2327 from LLK/hotfix/hoc-banner ... Hotfix/hoc banner	2018-11-28 10:07:44 -05:00
chrisgarrity	911005f5ad	Merge branch 'master' into hotfix/hoc-banner	2018-11-19 12:03:02 -05:00
chrisgarrity	a06d8ec11e	Add more bottom padding to activities button ... Also restore hocbanner messages to l10n.json.	2018-11-19 11:11:48 -05:00
chrisgarrity	f2f4a6ac7c	2018 Hour of Code Banners ... * add Top and Middle HoC banners * banners share styles * add new assets for banners * update presentation to check date to determine whether to show the HoC banners.	2018-11-16 14:02:56 -05:00
Ray Schamp	a454fdf583	Merge pull request #2292 from LLK/release/october-2018 ... [Master] Release for October 2018	2018-11-16 15:47:44 +00:00
Benjamin Wheeler	8f35cfaa22	Merge pull request #2294 from benjiwheeler/release/october-2018 ... point to scratch-gui latest npm release, not develop	2018-11-08 15:52:37 -05:00
Ben Wheeler	c6654106e4	point to scratch-gui latest npm release, not develop	2018-11-08 15:36:57 -05:00
Ray Schamp	e2795ec4d6	Merge pull request #2284 from rschamp/bugfix/offline-homepage ... Avoid displaying an error when /news returns a 500	2018-11-07 17:57:10 +00:00
Bryce Taylor	5e44248889	Merge pull request #2286 from BryceLTaylor/update-chromedriver ... Update chromedriver so tests pass more reliably	2018-11-07 11:51:24 -05:00
Paul Kaplan	80028bfea5	Merge pull request #2288 from paulkaplan/ip-muted-comments ... Add IP Mute message to project comment errors	2018-11-07 11:47:44 -05:00
chrisgarrity	c5b2fff0e9	Merge pull request #2287 from chrisgarrity/feature/hoc-strings ... Add new strings in preparation for Hour of Code	2018-11-07 11:42:35 -05:00
BryceLTaylor	fc7979944b	Update Chrome version in Saucelabs tests	2018-11-07 11:40:10 -05:00
Paul Kaplan	4105e88cfd	Add IP Mute message to project comment errors	2018-11-07 10:58:07 -05:00
chrisgarrity	b5d551b705	Add new strings in preparation for Hour of Code	2018-11-06 16:15:54 -05:00
BryceLTaylor	9bb8b7db28	Update chromedriver so tests pass more reliably	2018-11-06 15:35:21 -05:00
Ray Schamp	037078d623	Avoid displaying an error when /news returns a 500 ... This situation probably occurs most frequently when running dev servers while offline, but could also happen if the API is having issues. 500 responses from the API should not take down the homepage so drastically, and are also sometimes unavoidable while working offline.	2018-11-06 12:25:04 +00:00
Andrew Sliwinski	7721418165	Merge pull request #2269 from DeleteThisAcount/patch-1 ... Fix typo on micro:bit landing page	2018-11-05 13:00:19 -05:00
Benjamin Wheeler	47b7e6463c	Merge pull request #2274 from benjiwheeler/hide-share-banner ... make share banner appear only if user has the power to share this project	2018-11-02 15:54:08 -04:00
Benjamin Wheeler	e190e036b3	Merge pull request #2276 from LLK/revert-2241-latest-gui ... Revert "Track scratch-gui@latest "	2018-11-01 16:48:26 -04:00
Benjamin Wheeler	f935374571	Revert "Track scratch-gui@latest "	2018-11-01 16:37:57 -04:00
Ben Wheeler	7aae4219ec	make share banner appear only if user has the power to share this project	2018-11-01 14:19:28 -04:00
DeleteThisAcount	ab9004f901	fix small typo	2018-10-31 17:52:16 +01:00
Benjamin Wheeler	e14cb0f8f2	Merge pull request #2250 from benjiwheeler/share-button-icon ... removed erroneous share button icon	2018-10-30 22:29:19 -04:00
Karishma Chadha	950f13a35a	Merge pull request #2245 from kchadha/cloudhost ... Configure Cloud Host	2018-10-30 14:26:17 -04:00
Benjamin Wheeler	75fa44dfbe	Merge pull request #2235 from julescubtree/develop ... Update README.md	2018-10-29 21:38:57 -04:00
julescubtree	5ffe31beb4	Update README.md ... correct `PROJECTS_HOST` to `PROJECT_HOST`	2018-10-29 14:45:00 -07:00
Ben Wheeler	78f059e8b4	removed erroneous share button icon	2018-10-29 17:30:53 -04:00
chrisgarrity	b629d28a6d	Merge pull request #2242 from chrisgarrity/issue/2030-gui-layers ... remove obsolete code	2018-10-29 09:59:50 -04:00
Benjamin Wheeler	183bdccdae	Merge pull request #2223 from sehgalvibhor/develop ... Responsive about page!	2018-10-29 06:59:56 -04:00
Karishma Chadha	e771e91164	Configure cloud host and pass it as a prop to the gui.	2018-10-29 01:05:36 -04:00
Vibhor Sehgal	93d847271d	Travis Fix	2018-10-29 08:08:13 +05:30
chrisgarrity	9dd13dac74	remove obsolete code ... Preview doesn’t need to set a z-index (the first version was trying to overlay gui on top of the project view).	2018-10-26 15:11:46 -04:00
Benjamin Wheeler	76d6b66bb1	Merge pull request #2241 from benjiwheeler/latest-gui ... Track scratch-gui@latest	2018-10-26 14:10:23 -04:00
Ben Wheeler	792f1addb3	use latest scratch-gui, not develop, temporarily	2018-10-26 13:57:47 -04:00
Paul Kaplan	f2490baa16	Merge pull request #2239 from paulkaplan/fix-comments-id ... Use #comments-id instead of #comment-id for fetching single comments	2018-10-25 16:56:27 -04:00
Benjamin Wheeler	cff5733833	Merge pull request #2234 from benjiwheeler/isshared ... pass isShared to gui	2018-10-25 15:57:07 -04:00
Benjamin Wheeler	8653e358b1	Merge pull request #2232 from benjiwheeler/dont-get-extensions ... moved getExtensions out of constructor, and out of projectInfo response	2018-10-25 15:56:39 -04:00
Paul Kaplan	32f0999bb0	Use #comments-id instead of #comment-id for fetching single comments	2018-10-25 15:53:34 -04:00
Paul Kaplan	e563254c8f	Merge pull request #2231 from paulkaplan/comment-linking ... Decorate comment text to add @username links and scratch-domain links	2018-10-25 15:18:56 -04:00
Paul Kaplan	39364eac4e	Merge pull request #2238 from paulkaplan/fix-form-styling ... Fix form styling for project edit fields	2018-10-25 11:39:38 -04:00
Paul Kaplan	f133f29353	Fix form styling for project edit fields	2018-10-25 11:38:27 -04:00
Paul Kaplan	d9fa10316b	Merge pull request #2237 from paulkaplan/fix-formsy-perf ... Keep each input in its own formsy wrapper to improve performance	2018-10-25 10:50:07 -04:00
Paul Kaplan	209c8da9f7	Keep each input in its own formsy wrapper to improve performance ... Having Formsy around the entire page was causing re-renders to happen when you typed into an input, when really just that component needed to re-render.	2018-10-25 10:27:54 -04:00
Vibhor Sehgal	04adcb5063	Retaining Flex Layout	2018-10-25 09:53:28 +08:00
julescubtree	eef2e1a814	Update README.md ... correct `ASSETS_HOST` to `ASSET_HOST`	2018-10-24 15:39:17 -07:00
Ben Wheeler	c4de63d93a	pass isShared to gui	2018-10-24 18:13:57 -04:00
Paul Kaplan	dbca5a4044	Merge pull request #2226 from LLK/i10n-preview ... Extract strings for localizing the preview page	2018-10-24 16:00:40 -04:00
Paul Kaplan	fa7c2d5b09	Merge pull request #2230 from paulkaplan/single-comment-mode ... Showing specific comment by url hash on preview	2018-10-24 15:41:14 -04:00
Ben Wheeler	dd07e46c6a	moved getExtensions out of constructor, and out of projectInfo response	2018-10-24 15:38:18 -04:00