BryceLTaylor
|
cf96ad7aa8
|
Skip integration tests that go to external sites
|
2019-06-03 16:27:34 -04:00 |
|
Benjamin Wheeler
|
4fe1bd907e
|
Merge pull request #2925 from benjiwheeler/retry-studios-for-project-endpoint
change studios for project API request to use admin status, owner status and token
|
2019-06-03 14:24:34 -04:00 |
|
Benjamin Wheeler
|
2cbe9b16a7
|
Merge pull request #2987 from benjiwheeler/update-react-modal
update react-modal
|
2019-05-31 11:38:52 -04:00 |
|
Colby Gutierrez-Kraybill
|
2e0cce647a
|
Merge pull request #3021 from LLK/release/2019-05-29
[Develop] Release/2019-05-29
|
2019-05-30 17:19:50 -04:00 |
|
Ben Wheeler
|
d32dc86508
|
updated to correct scratch-gui release
|
2019-05-30 14:24:56 -04:00 |
|
Ben Wheeler
|
b2a22c6a11
|
update gui version with 4 reversions
|
2019-05-30 13:02:20 -04:00 |
|
Colby Gutierrez-Kraybill
|
687336dee8
|
Merge pull request #3020 from LLK/develop
[RELEASE] 2019-05-29
|
2019-05-29 17:29:01 -04:00 |
|
Colby Gutierrez-Kraybill
|
fc1e8e590c
|
Merge pull request #3019 from colbygk/release/2019-05-29
[RELEASE] Update scratch-gui
|
2019-05-29 17:08:29 -04:00 |
|
Colby Gutierrez-Kraybill
|
e788d2d77b
|
Update scratch-gui
|
2019-05-29 16:50:55 -04:00 |
|
Ben Wheeler
|
9ae9177ae5
|
added tests
|
2019-05-29 15:34:05 -04:00 |
|
Ben Wheeler
|
1b995908a2
|
update react-modal
|
2019-05-29 15:29:52 -04:00 |
|
Benjamin Wheeler
|
c16cb25df9
|
Merge pull request #3014 from benjiwheeler/fix-safari-remix-credit
set min-height of remix credit to max-content
|
2019-05-29 14:43:11 -04:00 |
|
Benjamin Wheeler
|
0524b21b4e
|
Merge pull request #3012 from benjiwheeler/fix-firefox-instructions
fix firefox instructions height overflow issue
|
2019-05-29 11:48:14 -04:00 |
|
Ben Wheeler
|
975a9c9645
|
omit token if null or falsy
|
2019-05-28 15:11:21 -04:00 |
|
Ben Wheeler
|
5a24e9d7d6
|
change studios for project API request to use admin status, owner status and token
|
2019-05-28 15:11:21 -04:00 |
|
Ben Wheeler
|
4f7791032c
|
set min-height of remix credit to max-content
|
2019-05-25 10:08:39 -04:00 |
|
Ben Wheeler
|
6d8441dd03
|
fix firefox instructions height overflow issue
|
2019-05-25 09:37:54 -04:00 |
|
Benjamin Wheeler
|
308af1eeda
|
Merge pull request #3009 from LLK/hotfix/update-scratch-desktop
[Develop] Hotfix: update scratch-desktop link #3008
|
2019-05-23 18:54:29 -04:00 |
|
Benjamin Wheeler
|
2fc3a3041e
|
Merge pull request #3008 from LLK/hotfix/update-scratch-desktop
[Master] Hotfix: update scratch-desktop link
|
2019-05-23 18:54:23 -04:00 |
|
Ben Wheeler
|
036af16d58
|
updated scratch-desktop link
|
2019-05-23 18:44:19 -04:00 |
|
Benjamin Wheeler
|
2fb6d67a0e
|
Merge pull request #3004 from LLK/release/05-23-2019
[Develop] Release/05-23-2019
|
2019-05-23 14:48:13 -04:00 |
|
Benjamin Wheeler
|
df9e290126
|
Merge pull request #3003 from LLK/release/05-23-2019
[Master] Release/05-23-2019
|
2019-05-23 14:47:52 -04:00 |
|
Benjamin Wheeler
|
3894dcb2d6
|
Merge pull request #3006 from LLK/develop
Update release branch to include educators image fix
|
2019-05-23 08:29:46 -04:00 |
|
Andrew Sliwinski
|
a214565b18
|
Merge pull request #3005 from benjiwheeler/fix-educators-link
added missing slash to images link, to fix intermittent CDN issue
|
2019-05-23 08:18:45 -04:00 |
|
Ben Wheeler
|
ba3c564801
|
added missing slash to start of images link, to fix intermittent CDN issue
|
2019-05-23 06:37:50 -04:00 |
|
Benjamin Wheeler
|
69d05f591d
|
Merge pull request #3000 from LLK/develop
update gui to pull in render, scratch-svg-renderer changes
|
2019-05-22 21:18:27 -04:00 |
|
Benjamin Wheeler
|
cf0b125b8e
|
Merge pull request #2999 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190522232752
Update scratch-gui to the latest version 🚀
|
2019-05-22 21:16:15 -04:00 |
|
greenkeeper[bot]
|
a258208c2f
|
chore(package): update scratch-gui to version 0.1.0-prerelease.20190522232752
|
2019-05-23 00:02:51 +00:00 |
|
Benjamin Wheeler
|
9e0dee34af
|
Merge pull request #2998 from LLK/develop
merge develop to release
|
2019-05-22 16:19:28 -04:00 |
|
Benjamin Wheeler
|
3e2be09ae7
|
Merge branch 'release/05-23-2019' into develop
|
2019-05-22 16:18:10 -04:00 |
|
Benjamin Wheeler
|
90cd99f435
|
Merge pull request #2997 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190522193014
chore(package): update scratch-gui to version 0.1.0-prerelease.201905…
|
2019-05-22 16:02:49 -04:00 |
|
greenkeeper[bot]
|
b2dfe404bb
|
chore(package): update scratch-gui to version 0.1.0-prerelease.20190522193014
Closes #2995
|
2019-05-22 19:43:34 +00:00 |
|
Benjamin Wheeler
|
bde167c0a9
|
Merge pull request #2994 from benjiwheeler/project-notes-last
fix last instructions notes and credits alignment
|
2019-05-22 14:29:48 -04:00 |
|
Benjamin Wheeler
|
d20efcb74b
|
Merge pull request #2966 from benjiwheeler/search-escape-fix
make search urls use consistent encoding
|
2019-05-22 12:35:47 -04:00 |
|
Ben Wheeler
|
c40422606f
|
fix last instructions notes and credits alignment
|
2019-05-22 12:30:05 -04:00 |
|
Benjamin Wheeler
|
1af1eec9c0
|
Merge pull request #2973 from benjiwheeler/align-remix-credit
fix alignment of remix credit avatar, text
|
2019-05-22 10:21:18 -04:00 |
|
Ben Wheeler
|
69eca8ed49
|
defined player-header and redefined player-height to make project notes correct height
|
2019-05-21 23:37:10 -04:00 |
|
Ben Wheeler
|
67c30868be
|
moved test_search into smoke-testing directory so it will run
|
2019-05-21 22:43:41 -04:00 |
|
Bryce Taylor
|
59ff5968eb
|
Merge pull request #2982 from LLK/my-stuff-integration-update
Make Add to studio test in test-my-stuff integration test look in shared projects
|
2019-05-21 11:57:07 -04:00 |
|
Ben Wheeler
|
1cb4bb5f7e
|
adjust instructions column padding-top
|
2019-05-21 00:22:37 -04:00 |
|
Eric Rosenbaum
|
39d3dcd1e3
|
Merge pull request #2989 from LLK/hotfix/do-not-load-speech2text
[Master] do not load speech2text
|
2019-05-20 17:09:50 -04:00 |
|
Eric Rosenbaum
|
77765756ef
|
update scratch-gui to existing hotfix branch
|
2019-05-20 14:28:05 -04:00 |
|
Eric Rosenbaum
|
b57a9a11cc
|
update scratch-gui
|
2019-05-20 13:54:27 -04:00 |
|
picklesrus
|
30ea515901
|
Merge pull request #2981 from LLK/release/05-16-2019
[Develop]Release/05 16 2019
|
2019-05-16 16:12:57 -04:00 |
|
picklesrus
|
bda2c70725
|
Merge pull request #2980 from LLK/release/05-16-2019
[Master]Release/05 16 2019
|
2019-05-16 15:22:38 -04:00 |
|
chrisgarrity
|
623adb716b
|
Merge pull request #2984 from chrisgarrity/rapanui-fixes
Rapanui fixes
|
2019-05-16 13:49:17 -04:00 |
|
Chris Garrity
|
da231ccf6a
|
update gui
get fixes for rapa nui:
* music extension instrument block
* hide (long) labels on paint editor buttons
|
2019-05-16 13:41:01 -04:00 |
|
BryceLTaylor
|
8d4f387093
|
Make Add to studio test in test-my-stuff integration test look in shared projects
|
2019-05-16 11:45:29 -04:00 |
|
Paul Kaplan
|
02419f9d18
|
Merge pull request #2979 from LLK/develop
Update release branch to bring in last weeks unreleased changes
|
2019-05-16 08:56:29 -04:00 |
|
Paul Kaplan
|
109549fd8f
|
Merge pull request #2957 from LLK/release/05-08-2019
[DEVELOP] Release 05/08/2019
|
2019-05-16 08:54:35 -04:00 |
|