Commit graph

4044 commits

Author SHA1 Message Date
picklesrus
edcc7956e9
Merge pull request #2947 from LLK/master
Merge Master back into develop after 5/2 Release
2019-05-03 10:21:08 -04:00
picklesrus
d3547d94bf
Merge pull request #2944 from LLK/revert-2943-revert-2940-release/05-02-2019
Revert "Revert "[MASTER] Release/05 02 2019""
2019-05-02 17:13:51 -04:00
picklesrus
3c4606ca79
Revert "Revert "[MASTER] Release/05 02 2019"" 2019-05-02 16:57:46 -04:00
chrisgarrity
f3cf28563e
Merge pull request #2943 from LLK/revert-2940-release/05-02-2019
Revert "[MASTER] Release/05 02 2019"
2019-05-02 14:28:40 -04:00
chrisgarrity
9050a5a5d2
Revert "[MASTER] Release/05 02 2019" 2019-05-02 14:28:15 -04:00
chrisgarrity
78f8b5184b
Merge pull request #2941 from LLK/release/05-02-2019
[DEVELOP] Release/05 02 2019
2019-05-02 13:46:12 -04:00
chrisgarrity
4f688a4c18
Merge pull request #2940 from LLK/release/05-02-2019
[MASTER] Release/05 02 2019
2019-05-02 13:33:39 -04:00
chrisgarrity
d22635d3cf
Merge pull request #2939 from LLK/develop
Prepare release branch
2019-05-01 17:45:44 -04:00
chrisgarrity
7bf7834814
Merge pull request #2938 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190501211108
chore(package): update scratch-gui to version 0.1.0-prerelease.201905…
2019-05-01 17:40:29 -04:00
greenkeeper[bot]
6e0b592f55 chore(package): update scratch-gui to version 0.1.0-prerelease.20190501211108
Closes #2931
2019-05-01 21:24:06 +00:00
Eric Rosenbaum
49ec1ed281
Merge pull request #2932 from ericrosenbaum/feature/boost-landing-page
LEGO BOOST extension landing page
2019-05-01 10:32:45 -04:00
Ben Wheeler
9f20cf1de6 Reduce boost image file sizes without loss 2019-04-30 19:22:17 -04:00
Eric Rosenbaum
56077811f5 Add extension chip 2019-04-30 16:03:32 -04:00
Eric Rosenbaum
513bbb43cd Fix headline icon size and position 2019-04-30 15:56:20 -04:00
Eric Rosenbaum
2e4a740127 Add image assets 2019-04-30 15:56:07 -04:00
Eric Rosenbaum
dd5a65fe73 Add starter projects 2019-04-30 15:25:53 -04:00
Eric Rosenbaum
f4f00f5ced Add route for /boost 2019-04-30 15:25:35 -04:00
Eric Rosenbaum
2c5977176b
Merge pull request #2930 from LLK/release/04-25-2019
[Develop] Release 04-25-2019
2019-04-29 15:35:10 -04:00
Eric Rosenbaum
2ad1bb34f4
Merge pull request #2929 from LLK/release/04-25-2019
[Master] Release 04-25-2019
2019-04-29 15:26:06 -04:00
Eric Rosenbaum
4fe23fd4c7 Add images 2019-04-25 15:54:59 -04:00
Eric Rosenbaum
04784df327
Merge pull request #2922 from LLK/ericrosenbaum-update-gui
update GUI
2019-04-24 17:34:04 -04:00
Eric Rosenbaum
11a9363e69
update GUI 2019-04-24 17:30:08 -04:00
Eric Rosenbaum
27de7ef128
Merge pull request #2921 from LLK/develop
prepare release branch
2019-04-24 17:14:43 -04:00
Eric Rosenbaum
69f2d2035f
Merge pull request #2912 from ericrosenbaum/bugfix/go-space-direct
Fix Vernier Go Direct branding
2019-04-23 17:31:33 -04:00
Eric Rosenbaum
882c576a60 Orange background on header 2019-04-23 15:12:58 -04:00
Eric Rosenbaum
a5a725322f Add Boost landing page 2019-04-23 15:01:11 -04:00
Paul Kaplan
f89a11c82c
Merge pull request #2915 from LLK/hotfix/fix-svg-renderer
[develop] Hotfix SVG renderer
2019-04-19 17:58:32 -04:00
Paul Kaplan
458770acfc
Merge pull request #2914 from LLK/hotfix/fix-svg-renderer
[master] Hotfix SVG renderer parsing issue
2019-04-19 17:56:54 -04:00
Paul Kaplan
8c5ae63030
Bump GUI 2019-04-19 17:28:25 -04:00
Paul Kaplan
d39af45caa
Bump GUI version 2019-04-19 16:39:41 -04:00
Paul Kaplan
fbf6e612b6
Bring in svg renderer fix 2019-04-19 15:20:43 -04:00
Karishma Chadha
f627006c49
Merge pull request #2911 from LLK/release/04-18-2019
[Develop] Release 04-18-2019
2019-04-18 16:27:04 -04:00
Karishma Chadha
0a36c0a963
Merge pull request #2910 from LLK/release/04-18-2019
[Master] Release 04-18-2019
2019-04-18 16:26:00 -04:00
Benjamin Wheeler
bfe658748b
Updated to gui release with fixed upload confirm 2019-04-18 12:05:50 -04:00
Eric Rosenbaum
4733976484 Fix Vernier Go Direct branding 2019-04-18 11:53:00 -04:00
Karishma Chadha
dc30e5a847
Merge pull request #2909 from LLK/develop
Prepare release 04-18-2019
2019-04-17 18:36:07 -04:00
Karishma Chadha
a6a0f5138b
Merge pull request #2908 from LLK/update-gui
Pull in latest scratch-gui
2019-04-17 18:32:13 -04:00
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
c6ed033e0c
Merge pull request #2900 from LLK/hotfix/fix-assetId-of-null
Hotfix/fix asset id of null
2019-04-17 10:26:50 -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