Commit graph

4355 commits

Author SHA1 Message Date
Karishma Chadha
2cd7e6b739
Merge pull request #3036 from LLK/release/2019-06-06
[Master] Release 2019-06-06
2019-06-06 15:02:20 -04:00
Karishma Chadha
28db4457fb
Merge pull request #3035 from LLK/develop
Update release branch to include develop
2019-06-05 22:48:07 -04:00
Karishma Chadha
5d7f44dea2
Merge pull request #3034 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190605185254
chore(package): update scratch-gui to version 0.1.0-prerelease.201906…
2019-06-05 22:04:19 -04:00
greenkeeper[bot]
f5c16181a7 chore(package): update scratch-gui to version 0.1.0-prerelease.20190605185254
Closes #3033
2019-06-05 19:05:04 +00:00
Paul Kaplan
c97a296fb7
Merge pull request #3031 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190605144936
Update scratch-gui to the latest version 🚀
2019-06-05 14:04:01 -04:00
greenkeeper[bot]
772ab75b12 chore(package): update scratch-gui to version 0.1.0-prerelease.20190605144936 2019-06-05 15:09:39 +00:00
Paul Kaplan
919a7a09b7
Merge pull request #3029 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190604202002
Update scratch-gui to the latest version 🚀
2019-06-05 10:44:58 -04:00
Benjamin Wheeler
f6845a2bc7
Merge pull request #3024 from benjiwheeler/remove-footer-tests
in (unused) Cypress test file, removed all footer link tests for external sites
2019-06-05 10:29:05 -04:00
greenkeeper[bot]
6ba308fc66 chore(package): update file-loader to version 4.0.0 2019-06-05 13:04:30 +00:00
greenkeeper[bot]
7673bf9086 chore(package): update scratch-gui to version 0.1.0-prerelease.20190604202002 2019-06-04 20:41:19 +00:00
BryceLTaylor
d251ee6e8b fix linting error 2019-06-03 17:12:59 -04:00
BryceLTaylor
55901b479d Make test_search integration tests default to scratch.ly instead of localhost
Everything else points at scratch.ly so if you provide no root url these tests inexplicably failed
2019-06-03 16:27:34 -04:00
BryceLTaylor
92790c2f9d Skip failing test in test-my-stuff integration test 2019-06-03 16:27:34 -04:00
BryceLTaylor
49de9b99ed Add waitUntilGone function to integration tests
Make sure the loading screen is not present when loading the project page
2019-06-03 16:27:34 -04:00
BryceLTaylor
352237f59a Update findByXpath selenium helper function 2019-06-03 16:27:34 -04:00
BryceLTaylor
55756f93bd Update tap to the most recent version 2019-06-03 16:27:34 -04:00
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
Ben Wheeler
54d4c020f3 removed all footer link tests for external sites 2019-05-31 11:30:39 -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
Colby Gutierrez-Kraybill
b390e1c072
Merge pull request #3022 from LLK/release/2019-05-29
[Master] Release/2019-05-29
2019-05-30 17:07:33 -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