scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-11 08:11:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
4278 commits 221 branches 1 tag 505 MiB
Commit graph

4278 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benjamin Wheeler
66df143bbc
Merge pull request #2881 from LLK/hotfix/revert-comments-studios-urls 
[develop] Hotfix/revert comments studios urls
 2019-04-04 17:22:03 -04:00
Ben Wheeler
c3002be4a6 Revert "Merge pull request #2858 from benjiwheeler/studios-for-project-endpoint" 
This reverts commit a3902acfd1, reversing
changes made to 9e7a14cb76.
 2019-04-04 15:04:46 -04:00
Ben Wheeler
8d38d7d4e5 Revert "Merge pull request #2859 from benjiwheeler/comments-for-project-endpoint" 
This reverts commit 07417846a9, reversing
changes made to 32484656ba.
 2019-04-04 15:04:36 -04:00
Ben Wheeler
9b485cd16c Revert "Merge pull request #2871 from benjiwheeler/pass-ownerusername-to-comment-replies-endpoint" 
This reverts commit afe6d6f4a4, reversing
changes made to c00b4fb189.
 2019-04-04 15:04:27 -04:00
Benjamin Wheeler
31acf49d6f
Merge pull request #2879 from LLK/release/04-04-2019 
[develop] Release/04-04-2019
 2019-04-04 12:16:23 -04:00
Benjamin Wheeler
22adcfa0fd
Merge pull request #2878 from LLK/release/04-04-2019 
[master] Release/04-04-2019
 2019-04-04 12:16:07 -04:00
Benjamin Wheeler
057063a8f1
Merge pull request #2877 from LLK/develop 
Merge to Release from develop
 2019-04-04 09:07:45 -04:00
Benjamin Wheeler
ab50e83e73
Merge pull request #2876 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190404100408 
chore(package): update scratch-gui to version 0.1.0-prerelease.201904…
 2019-04-04 09:02:26 -04:00
greenkeeper[bot]
17f9c5a5a5 chore(package): update scratch-gui to version 0.1.0-prerelease.20190404100408 
Closes #2867
 2019-04-04 10:16:36 +00:00
Ben Wheeler
1198b8dee0 reduce size of two credits logos 2019-04-03 17:37:10 -04:00
Benjamin Wheeler
4aa7d394bc
Merge pull request #2852 from apple502j/siegel 
Update SiegelFamily Endowment Logo
 2019-04-03 17:30:56 -04:00
Benjamin Wheeler
afe6d6f4a4
Merge pull request #2871 from benjiwheeler/pass-ownerusername-to-comment-replies-endpoint 
pass ownerUsername in three places it was left out
 2019-04-02 18:39:51 -04:00
Ben Wheeler
f1dfeab399 pass ownerUsername in three places it was left out 2019-04-02 17:25:00 -04:00
Ray Schamp
c00b4fb189
Merge pull request #2870 from LLK/master 
Sync develop to master
 2019-04-02 16:16:04 -04:00
Ray Schamp
a5e1ed5b34
Merge pull request #2869 from LLK/totally-normal-revert 
Revert April Fools
 2019-04-02 16:13:41 -04:00
chrisgarrity
5fbfc55deb
Merge pull request #2865 from chrisgarrity/issue/2665-l10n 
Remove dependency on scratchr2_translations
 2019-04-01 11:33:49 +02:00
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