Commit graph

4386 commits

Author SHA1 Message Date
picklesrus
1f9bc2a044
Merge pull request #3072 from LLK/picklesrus-patch-3
Put GUI version back to what it was originally for this release.
2019-06-21 12:51:11 -04:00
picklesrus
0506df192b
Put GUI version back to what it was originally.
Essentially undo edffa47f65 since it wasn't the cause of any problems.
2019-06-21 12:37:14 -04:00
picklesrus
f347cdc4aa
Merge pull request #3071 from LLK/hotfix/acw-2019-20-06
[Master] Hotfix for Africa Code Week resources
2019-06-21 11:20:04 -04:00
Ray Schamp
371604db9e Update scratch-gui to hotfixed version
Includes new tutorials and sprite library updates for ACW
2019-06-20 17:55:11 -04:00
Ben Wheeler
43d1f23b44 pass owner username to comment endpoints 2019-06-20 15:06:24 -04:00
chrisgarrity
d93df78065
Merge pull request #3067 from chrisgarrity/update-makefile
update makefile for new tap
2019-06-20 14:57:29 -04:00
Chris Garrity
d903fbe6bf update makefile for new tap
Add options anywhere we run tap to make it work as it did previously
2019-06-20 14:48:53 -04:00
Chris Garrity
bd2ef64d63 Add Boost and Vernier landing pages to the transifex configuration 2019-06-20 13:57:34 -04:00
picklesrus
edffa47f65
Update gui version to take out e16n changes 2019-06-20 11:59:24 -04:00
Ray Schamp
94c7bb827a
Merge pull request #3025 from BryceLTaylor/Skip-Flakey-Tests
Skip flakey tests
2019-06-19 21:48:04 -04:00
Eric Rosenbaum
44a61ae2e6
Merge pull request #3061 from LLK/develop
Update release branch to include develop
2019-06-19 18:43:28 -04:00
Eric Rosenbaum
554d0d1563
Merge pull request #3060 from LLK/ericrosenbaum-patch-1
Update GUI
2019-06-19 18:35:06 -04:00
Eric Rosenbaum
12aab66d1c
Update GUI 2019-06-19 18:34:41 -04:00
BryceLTaylor
6c21431162 Update the other smoke tests to not use new test report 2019-06-19 15:50:05 -04:00
Christopher Willis-Ford
2b0ba34cee update scratch-gui for e16n features 2019-06-18 23:51:46 -07:00
Karishma Chadha
657fff21e8
Merge pull request #3056 from LLK/revert-3055-update-scratch-gui
Revert "Pull in latest scratch-gui"
2019-06-18 23:52:39 -04:00
Karishma Chadha
d239979926
Revert "Pull in latest scratch-gui" 2019-06-18 23:51:53 -04:00
Karishma Chadha
d3b0203349
Merge pull request #3055 from LLK/update-scratch-gui
Pull in latest scratch-gui
2019-06-18 23:06:59 -04:00
Karishma Chadha
e338be2bfb
Pull in latest scratch-gui 2019-06-18 23:06:23 -04:00
Ben Wheeler
3375d6d3d5 introduced stub components for new scratch3 join modal 2019-06-18 16:50:27 -04:00
chrisgarrity
344e21fd6c
Merge pull request #3049 from LLK/release/2019-06-13
[Develop] Release 2019-06-13
2019-06-13 14:08:52 -04:00
chrisgarrity
e9baded797
Merge pull request #3048 from LLK/release/2019-06-13
[Master] Release 2019-06-13
2019-06-13 13:44:19 -04:00
chrisgarrity
64926995d2
Merge pull request #3046 from LLK/develop
Update release branch with the latest gui (from develop)
2019-06-12 17:26:39 -04:00
chrisgarrity
e11110e890
Merge pull request #3045 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190612160757
Update scratch-gui to the latest version 🚀
2019-06-12 17:16:04 -04:00
greenkeeper[bot]
419de4d8da chore(package): update scratch-gui to version 0.1.0-prerelease.20190612160757 2019-06-12 16:21:28 +00:00
picklesrus
051b904c2e
Merge pull request #3042 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190610172350
Update scratch-gui to the latest version 🚀
2019-06-10 16:55:16 -04:00
greenkeeper[bot]
c2686024ff chore(package): update scratch-gui to version 0.1.0-prerelease.20190610172350 2019-06-10 17:36:42 +00:00
Paul Kaplan
73bd77aac1
Merge pull request #3039 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190610133056
Update scratch-gui to the latest version 🚀
2019-06-10 11:46:40 -04:00
greenkeeper[bot]
15d5fbb152 chore(package): update scratch-gui to version 0.1.0-prerelease.20190610133056 2019-06-10 13:57:52 +00:00
BryceLTaylor
9643396ee4 Add tap.plan back into test-my-stuff integration test. 2019-06-06 17:34:20 -04:00
Karishma Chadha
b59d46be1c
Merge pull request #3037 from LLK/release/2019-06-06
[Develop] Release 2019-06-06
2019-06-06 15:03:56 -04:00
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