Commit graph

6863 commits

Author SHA1 Message Date
Ray
7067500aa9 Revert "Nothing to see here!"
This reverts commit dcd74c0bfd.
2019-03-29 16:28:13 -04:00
seotts
dcd74c0bfd Nothing to see here! 2019-03-29 16:26:52 -04:00
Benjamin Wheeler
07417846a9
Merge pull request #2859 from benjiwheeler/comments-for-project-endpoint
add ownerUsername to comment API endpoint URIs
2019-03-29 13:23:47 -04:00
chrisgarrity
35ad77f667 Update all references to scratchr2_translations 2019-03-27 11:36:22 +01:00
chrisgarrity
84ff8d9b7e Add missing l10n source files
Also remove obsolete views from the config. The view code still exists - that’s a separate issue, but we shouldn’t be making translators translate obsolete strings.
2019-03-27 11:30:53 +01:00
chrisgarrity
f3d60a1a2d Remove dependency on scratchr2_translations 2019-03-27 11:08:09 +01:00
Benjamin Wheeler
32484656ba
Merge pull request #2805 from apple502j/patch-12
Add SiP Link
2019-03-26 16:16:41 -04:00
Ben Wheeler
fced35e49c add padding to sip feature banner 2019-03-26 15:54:55 -04:00
Ben Wheeler
aba4647c2c make sip link open in new tab 2019-03-26 14:01:08 -04:00
Eric Rosenbaum
4d9332bb77
Merge pull request #2864 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190326161126
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-26 14:01:06 -04:00
greenkeeper[bot]
ca57f4a312 chore(package): update scratch-gui to version 0.1.0-prerelease.20190326161126
Closes #2862
2019-03-26 17:25:40 +00:00
Ben Wheeler
2c1fd34d20 took sip section out of educators masthead, put between masthead and main content 2019-03-26 12:33:20 -04:00
Ben Wheeler
4f1f712083 using white plus transparent blue, instead of introducing new blue 2019-03-26 09:26:05 -04:00
Ben Wheeler
fc466fa7cc shortened harvard text, improved responsive styles for SiP 2019-03-25 23:32:31 -04:00
Ben Wheeler
dd51cf4ea6 pass token to comments endpoints every time, not only if user is admin 2019-03-25 14:21:06 -04:00
Ben Wheeler
163741f34e add ownerUsername to comment API endpoint URIs; handle error responses from those endpoints 2019-03-25 13:40:12 -04:00
Benjamin Wheeler
a3902acfd1
Merge pull request #2858 from benjiwheeler/studios-for-project-endpoint
change "studios for project" API request to include owner & token, determine endpoint using admin status
2019-03-25 13:38:27 -04:00
Ben Wheeler
49df9a6386 split admin and non-admin project studios endpoints 2019-03-23 10:03:51 -04:00
Ben Wheeler
986c608136 make token optional in call to getProjectStudios endpoint 2019-03-22 15:43:00 -04:00
Ben Wheeler
4a20a09f52 change studios for project endpoint to include owner, token 2019-03-21 21:11:14 -04:00
picklesrus
9e7a14cb76
Merge pull request #2856 from LLK/release/03-21-2019
[DEVELOP] Release/03 21 2019
2019-03-21 15:45:55 -04:00
picklesrus
eb5ca62887
Merge pull request #2855 from LLK/release/03-21-2019
[Master] Release 03/21/2019
2019-03-21 15:45:32 -04:00
picklesrus
cc8efab57c
Update to new GUI
Removes Hindi from speech to text list while some bugs get fixed.
2019-03-21 11:38:42 -04:00
Ben Wheeler
836af62e13 revised educators strings and removed commented out code 2019-03-21 11:35:30 -04:00
Ben Wheeler
dd3b777763 moved educators SiP from 3-icon section to standalone sub-banner 2019-03-21 09:23:59 -04:00
Ben Wheeler
5a32996229 removed unused images added in earlier drafts of educators page 2019-03-21 08:46:50 -04:00
picklesrus
c5bb61c288
Merge pull request #2854 from LLK/develop
Merge develop into release 3-21-2019
2019-03-21 07:49:54 -04:00
apple502j
d50157e447 Update SiegelFamily Endowment Logo 2019-03-21 10:40:04 +09:00
picklesrus
d6bf35324e
Merge pull request #2851 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190320192801
Update scratch-gui to the latest version 🚀
2019-03-20 16:28:00 -04:00
greenkeeper[bot]
26cc75510d chore(package): update scratch-gui to version 0.1.0-prerelease.20190320192801 2019-03-20 19:40:03 +00:00
Paul Kaplan
35aff3592b
Merge pull request #2850 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190320190756
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-20 15:26:31 -04:00
Paul Kaplan
24cb6edcf6
Merge pull request #2846 from LLK/greenkeeper/scratch-parser-5.0.0
Update scratch-parser to the latest version 🚀
2019-03-20 15:26:04 -04:00
greenkeeper[bot]
2c1147195a chore(package): update scratch-gui to version 0.1.0-prerelease.20190320190756
Closes #2848
2019-03-20 19:20:03 +00:00
Paul Kaplan
c653353b53
Merge pull request #2847 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190318205056
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-19 08:36:08 -04:00
Ben Wheeler
5977796822 trying out a 3-icon resources for educators section 2019-03-18 18:05:20 -04:00
greenkeeper[bot]
b740997d9e chore(package): update scratch-gui to version 0.1.0-prerelease.20190318205056
Closes #2843
2019-03-18 21:07:27 +00:00
greenkeeper[bot]
33390aa63c fix(package): update scratch-parser to version 5.0.0 2019-03-18 21:06:36 +00:00
Benjamin Wheeler
ce9d520cf0
Merge pull request #2841 from LLK/release/03-14-2019
[develop] Release 03/14/2019
2019-03-14 14:11:03 -04:00
Benjamin Wheeler
e89a4d5ae9
Merge pull request #2842 from LLK/release/03-14-2019
[master] Release 03/14/2019
2019-03-14 14:08:02 -04:00
Paul Kaplan
d8580f1967
Downgrade to leave out the VM microbit queue 2019-03-14 12:04:07 -04:00
Paul Kaplan
7aae78da3e
Merge pull request #2840 from LLK/develop
Merge develop into release branch for 3/14/2019
2019-03-14 08:56:55 -04:00
Paul Kaplan
73f6bf4de1
Merge pull request #2839 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190314120510
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-14 08:55:25 -04:00
greenkeeper[bot]
d103b81617 chore(package): update scratch-gui to version 0.1.0-prerelease.20190314120510
Closes #2836
2019-03-14 12:20:15 +00:00
Ben Wheeler
815aa31f91 refactored the Resources for Educators section to have icons 2019-03-12 09:57:31 -04:00
Paul Kaplan
1b1c3b95cf
Merge pull request #2835 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190311150203
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-11 13:19:27 -04:00
greenkeeper[bot]
2b737c7b8d chore(package): update scratch-gui to version 0.1.0-prerelease.20190311150203
Closes #2829
2019-03-11 17:13:12 +00:00
Colby Gutierrez-Kraybill
110b2badd3
Merge pull request #2826 from LLK/release/03-07-2019
[develop] Release/03 07 2019
2019-03-07 13:38:33 -05:00
Colby Gutierrez-Kraybill
9f34d2021b
Merge pull request #2825 from LLK/release/03-07-2019
[Master] Release 03/07/2019
2019-03-07 13:38:11 -05:00
Bryce Taylor
699d37e38d
Merge pull request #2819 from BryceLTaylor/Update-Footer-Integration-Tests
Update the integration test for the Scratch Conference link in the fo…
2019-03-07 11:59:31 -05:00
BryceLTaylor
3f120ad830 futureproof test for conference link 2019-03-07 11:41:50 -05:00