Commit graph

6186 commits

Author SHA1 Message Date
Paul Kaplan
53f72ae153 Bump GUI to fix asset errors 2019-07-03 10:30:08 -04:00
Eric Rosenbaum
f799b6a8f1
Merge pull request #3098 from LLK/hotfix/boost-troubleshooting
[develop] Add troubleshooting item for boost firmware update
2019-07-03 10:14:15 -04:00
Eric Rosenbaum
e6def936a2
Merge pull request #3099 from LLK/hotfix/boost-troubleshooting
[master] Add troubleshooting item for boost firmware update
2019-07-03 10:14:09 -04:00
Ben Wheeler
b044e973ac simplified export of join flow step 2019-07-02 17:53:10 -04:00
Ben Wheeler
67ad5fc383 added tests for password validations 2019-07-02 17:49:29 -04:00
Ben Wheeler
585340d289 removed commented out code from join flow steps 2019-07-02 17:37:56 -04:00
Ben Wheeler
f6d1ba3194 WIP moving join flow validation functions to library 2019-07-02 17:27:44 -04:00
Eric Rosenbaum
f3fcb32188 Add troubleshooting item for boost firmware update 2019-07-02 16:53:41 -04:00
greenkeeper[bot]
1786e2d9f7 chore(package): update react-modal to version 3.8.2 2019-06-30 20:48:54 +00:00
greenkeeper[bot]
d07d4515da chore(package): update google-libphonenumber to version 3.2.3 2019-06-28 14:39:38 +00:00
Paul Kaplan
64fefaedf3
Merge pull request #3090 from LLK/release/2019-06-27
[develop] Release/2019 06 27
2019-06-27 16:55:30 -04:00
Paul Kaplan
eb910ba37b
Merge pull request #3089 from LLK/release/2019-06-27
[Master] Release/2019 06 27
2019-06-27 16:55:20 -04:00
Paul Kaplan
60dea25a7e
Merge pull request #3092 from benjiwheeler/fix-see-all-comments
fix see all comments and load more replies, by passing author username
2019-06-27 11:34:12 -04:00
Ben Wheeler
2602a06fdc fix see all comments and load more replies, by passing author username 2019-06-27 11:29:29 -04:00
Ben Wheeler
7ecbe905f5 cleared up props passed in and out of username step 2019-06-26 14:44:20 -04:00
Ben Wheeler
15ddd0e86c working username step of join flow 2019-06-26 14:44:20 -04:00
Paul Kaplan
2745c3a61f
Merge pull request #3088 from LLK/develop
Merge develop to release 2019 06 27 branch
2019-06-26 14:31:24 -04:00
Paul Kaplan
31254d0d96
Merge pull request #3087 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190626180304
chore(package): update scratch-gui to version 0.1.0-prerelease.201906…
2019-06-26 14:28:10 -04:00
greenkeeper[bot]
7c575a3aee chore(package): update scratch-gui to version 0.1.0-prerelease.20190626180304
Closes #3064
2019-06-26 18:22:15 +00:00
Ben Wheeler
469e9a2626 use html form instead of formik form 2019-06-26 13:50:01 -04:00
Chris Willis-Ford
1061c92e62
Merge pull request #3083 from cwillisf/scratch-desktop-3.4.0
update download links for Scratch Desktop 3.4.0
2019-06-26 10:39:38 -07:00
Benjamin Wheeler
a445c0ccc1
Merge pull request #3081 from benjiwheeler/fix-formik-validation-message
fix passing text to validation message
2019-06-26 11:36:25 -04:00
Bryce Taylor
0fdf92536a
Merge pull request #3084 from BryceLTaylor/Skip-more-flakey-tests
Skip tests that occasionally failed on travis
2019-06-26 11:27:58 -04:00
BryceLTaylor
6fcfee3c30 Skip tests that occasionally failed on travis 2019-06-26 11:16:56 -04:00
Christopher Willis-Ford
904879d9e4 update download links for Scratch Desktop 3.4.0 2019-06-25 23:06:30 -07:00
Benjamin Wheeler
35bcb8b33e
Merge pull request #3079 from benjiwheeler/add-join-test
added test to check that join window shows scratchr2 join flow
2019-06-25 18:23:59 -04:00
Benjamin Wheeler
5b7f8088ea
Merge pull request #3080 from benjiwheeler/move-join-flow-steps
moved join-flow-steps to join flow dir
2019-06-25 18:22:56 -04:00
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