Commit graph

3205 commits

Author SHA1 Message Date
Paul Kaplan
d36b71dcb3
Merge branch 'develop' into hide-backpack-logged-out 2018-11-14 14:12:51 -05:00
Eric Rosenbaum
9f640ffdd6
Merge pull request #2307 from ericrosenbaum/feature/update-microbit-hex-1.1.0
Update microbit hex file version
2018-11-14 13:28:54 -05:00
Benjamin Wheeler
6d09f2dada
Merge pull request #2289 from benjiwheeler/show-creator
Pass authorId and authorUsername to gui
2018-11-14 06:43:29 -05:00
Ben Wheeler
4bb5e641bb added comment about falseness of authorId, authorUsername 2018-11-14 06:42:57 -05:00
Eric Rosenbaum
1840c9ec19 Update microbit hex file version 2018-11-13 15:43:14 -05:00
Ben Wheeler
8e967737e5 use production or staging hosts for static assets url 2018-11-13 15:32:59 -05:00
Ray Schamp
25f7f5b273
Merge pull request #2301 from MasterOfTheTiger/issue/gh2298-job-listing
Removes Full Stack Job Listing
2018-11-11 18:26:16 +00:00
MasterOfTheTiger
4677feb371 State that no jobs are currently available 2018-11-11 08:58:55 -08:00
Ray Schamp
e776e67af0
Merge pull request #2300 from MasterOfTheTiger/scratchjr-links
Use https for ScratchJR links
2018-11-11 16:30:01 +00:00
Ben Wheeler
c965fd15f9 generate author thumbnail and pass to gui 2018-11-10 02:07:48 -05:00
MasterOfTheTiger
12aeba90ed Use https for ScratchJR links 2018-11-09 09:17:04 -08:00
Paul Kaplan
9ed3ecc7bb Split up the backpack options and tie visibility to isLoggedIn 2018-11-08 13:19:12 -05:00
Paul Kaplan
c62470150b
Merge pull request #2290 from paulkaplan/project-not-available
Add "project not available" view for when project body cannot be loaded
2018-11-08 12:58:37 -05:00
Paul Kaplan
ae05f07e07 Fix project not available flag setting and catch 404 responses 2018-11-08 08:43:36 -05:00
Paul Kaplan
315c8b78fc Add "project not available" view for when project body cannot be loaded
This happens when the project id does not exist, or is not visible to the given user.
2018-11-07 16:32:12 -05:00
Ben Wheeler
464d5f7c2d Pass authorId and authorUsername to gui 2018-11-07 12:59:16 -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