Karishma Chadha
9aab911d67
Pull in latest scratch-gui
2019-04-17 18:31:50 -04:00
chrisgarrity
db4c81fbec
Merge pull request #2902 from chrisgarrity/2873-maori-missing
...
Update react-intl to bring in māori locale-data
2019-04-17 15:29:52 -04:00
chrisgarrity
e4aac09f0f
Update react-intl to bring in māori locale-data
2019-04-17 11:43:35 -04:00
Karishma Chadha
29cd4ef5dd
Merge pull request #2901 from LLK/hotfix/fix-assetId-of-null
...
[Develop] Hotfix/fix asset id of null
2019-04-17 10:27:56 -04:00
Karishma Chadha
7f0f1f6035
Update gui version to pull in latest build on hotfix channel.
2019-04-16 16:40:48 -04:00
Karishma Chadha
bec4e95adc
Update scratch-gui to pull in fix for saving assets to asset server before putting them in the backpack
2019-04-16 11:22:09 -04:00
Colby Gutierrez-Kraybill
2ff49da9c2
Merge pull request #2895 from LLK/master
...
Merge pull request #2890 from LLK/release/04-11-2019
2019-04-11 16:00:20 -04:00
Colby Gutierrez-Kraybill
3d2ab486f7
Merge pull request #2891 from LLK/release/04-11-2019
...
[Develop] Release 04/11/2019
2019-04-11 15:59:02 -04:00
Colby Gutierrez-Kraybill
021d9683f6
Merge pull request #2890 from LLK/release/04-11-2019
...
[Master] Release 04 11 2019
2019-04-11 15:44:06 -04:00
Paul Kaplan
9466074d0b
Update GUI to get reverts for storage and render
2019-04-11 11:51:59 -04:00
Paul Kaplan
18f14a1b22
Merge pull request #2889 from LLK/develop
...
Merge develop into the release candidate branch
2019-04-10 16:58:36 -04:00
Paul Kaplan
0a430e2ef9
Merge pull request #2888 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190410204045
...
Update scratch-gui to the latest version 🚀
2019-04-10 16:55:28 -04:00
greenkeeper[bot]
6ee66216ee
chore(package): update scratch-gui to version 0.1.0-prerelease.20190410204045
2019-04-10 20:53:01 +00:00
Paul Kaplan
5db1bcc4c7
Merge pull request #2887 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190410183725
...
Update scratch-gui to the latest version 🚀
2019-04-10 16:30:37 -04:00
greenkeeper[bot]
f59fc3c0df
chore(package): update scratch-gui to version 0.1.0-prerelease.20190410183725
2019-04-10 18:52:24 +00:00
Paul Kaplan
67adfc51ab
Merge pull request #2886 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190410173132
...
chore(package): update scratch-gui to version 0.1.0-prerelease.201904…
2019-04-10 14:41:31 -04:00
greenkeeper[bot]
486ad353a1
chore(package): update scratch-gui to version 0.1.0-prerelease.20190410173132
...
Closes #2884
2019-04-10 18:36:53 +00:00
Eric Rosenbaum
a33f904b17
Merge pull request #2817 from ericrosenbaum/feature/vernier-landing-page
...
Add Vernier Force and Accel extension landing page
2019-04-10 14:15:27 -04:00
Eric Rosenbaum
b8b558c64d
Remove extra blank line
2019-04-10 13:34:29 -04:00
Eric Rosenbaum
05a4c7be06
Rename route to “vernier”
2019-04-10 12:42:53 -04:00
Eric Rosenbaum
209435d95e
Update starter project ids
2019-04-09 15:18:33 -04:00
Benjamin Wheeler
5c890347e5
Merge pull request #2875 from benjiwheeler/reduce-credits-images
...
reduce size of two credits logos
2019-04-09 15:09:50 -04:00
Eric Rosenbaum
c68fb1498d
Add starter project IDs
2019-04-09 14:58:43 -04:00
Eric Rosenbaum
98dbc88708
Update starter project
2019-04-09 14:31:32 -04:00
Colby Gutierrez-Kraybill
c135312754
Merge pull request #2880 from LLK/hotfix/revert-comments-studios-urls
...
[master] Hotfix/revert comments studios urls
2019-04-09 14:26:54 -04:00
Eric Rosenbaum
4f033c47e4
Add starter projects
2019-04-08 18:13:18 -04:00
Eric Rosenbaum
209425ceca
optimize svgs
2019-04-08 16:17:19 -04:00
Eric Rosenbaum
3a0452048d
Add extension chip
2019-04-08 14:45:39 -04:00
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 a3902acfd19e7a14cb76
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 07417846a932484656ba
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 afe6d6f4a4c00b4fb189
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
