Commit graph

4709 commits

Author SHA1 Message Date
Ben Wheeler
42721a3d6f fix passing text to validation message 2019-06-25 18:14:09 -04:00
picklesrus
2e52f462d0
Merge pull request #3063 from LLK/release/2019-06-20
[Develop] Release 2019-06-20
2019-06-25 17:56:17 -04:00
Ben Wheeler
2fbaf4af8e moved join-flow-steps to join flow dir 2019-06-25 17:41:12 -04:00
Ben Wheeler
a6db76b822 added test to check that join window shows scratchr2 join flow 2019-06-25 17:34:25 -04:00
Benjamin Wheeler
b12694fc12
Merge pull request #3077 from benjiwheeler/join-flow-step
introduce join-flow-step, next-step-button
2019-06-25 17:15:03 -04:00
Benjamin Wheeler
249d2b2525
Merge pull request #3076 from benjiwheeler/join-flow-formik-input
added initial formik input component, form validation message component
2019-06-25 17:13:51 -04:00
Ben Wheeler
c6fc3621d4 added initial formik input component, form validation message component 2019-06-25 17:06:57 -04:00
Ben Wheeler
3ecefebeb4 introduce join-flow-step, next-step-button 2019-06-25 17:03:35 -04:00
Benjamin Wheeler
1eb9d1bf8f
Merge pull request #3075 from benjiwheeler/join-steps-stub
added formik dependency, join flow steps using it
2019-06-25 11:01:38 -04:00
Ben Wheeler
a5bb0bddc3 Rename ExampleStep as UsernameStep, clean up props 2019-06-25 09:40:35 -04:00
greenkeeper[bot]
0df8d034f2 chore(package): update url-loader to version 2.0.1
Closes #3032
2019-06-25 11:28:43 +00:00
Eric Rosenbaum
242a7e7514
Merge pull request #3062 from LLK/release/2019-06-20
[Master] Release 2019-06-20
2019-06-24 15:25:46 -04:00
Benjamin Wheeler
e25f0b82fe
Merge pull request #3069 from benjiwheeler/pass-ownerusername-to-comment-endpoints
pass owner username and token to comment endpoints
2019-06-24 15:21:46 -04:00
Eric Rosenbaum
37cf9276a7
Merge branch 'master' into release/2019-06-20 2019-06-24 15:09:58 -04:00
chrisgarrity
eca0f97d1e
Merge pull request #3066 from chrisgarrity/update-tx-config
Add Boost and Vernier landing pages to the transifex configuration
2019-06-24 14:59:10 -04:00
Ben Wheeler
69164a5f53 added formik dependency, join flow steps using it 2019-06-24 13:35:01 -04:00
Benjamin Wheeler
c09fd1d5bc
Merge pull request #3074 from benjiwheeler/add-join-flow-component
stub for join-flow component within modal
2019-06-24 13:23:31 -04:00
Benjamin Wheeler
7d34dfdf34
Merge pull request #3073 from benjiwheeler/refactor-form-validation-css
Moved validation message css from card to own file
2019-06-24 13:23:08 -04:00
Ben Wheeler
0b69eef56d removed unnecessary redux connect 2019-06-24 11:36:18 -04:00
Ben Wheeler
0468c19665 stub for join-flow component within modal 2019-06-24 11:31:16 -04:00
Ben Wheeler
037f1c66d7 Moved validation message css from card to own file 2019-06-24 11:23:32 -04:00
Benjamin Wheeler
1684c67abf
Merge pull request #3054 from benjiwheeler/join-flow-modal-stub
introduce stub components for new scratch3 join modal
2019-06-24 10:09:23 -04:00
greenkeeper[bot]
dc30aac2c5 chore(package): update async to version 3.1.0
Closes #3016
2019-06-23 05:35:43 +00:00
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