DD Liu
|
fc67c74ee6
|
Merge pull request #3120 from LLK/develop
Merge develop
|
2019-07-10 21:54:52 -04:00 |
|
DD Liu
|
7306f4ada8
|
Merge pull request #3118 from LLK/updateGuiDep
Update gui dep
|
2019-07-10 21:52:40 -04:00 |
|
Ben Wheeler
|
dd7a57d866
|
handle join flow state for tracking, advancing current step
|
2019-07-10 21:49:04 -04:00 |
|
DD Liu
|
2a84a4d592
|
Update gui dep
|
2019-07-10 21:45:46 -04:00 |
|
Benjamin Wheeler
|
75df65ec52
|
Merge pull request #3116 from benjiwheeler/format-validation
Format and position validation error messages in join flow
|
2019-07-10 15:43:01 -04:00 |
|
Ben Wheeler
|
d4c59522bd
|
comment explaining row relative style for validations
|
2019-07-10 13:57:52 -04:00 |
|
Ben Wheeler
|
c85214815b
|
position/format validations in join flow
|
2019-07-10 13:56:04 -04:00 |
|
Ben Wheeler
|
ed5ff981c1
|
Support for formatting and positioning validation error messages
|
2019-07-10 13:48:31 -04:00 |
|
Benjamin Wheeler
|
8130ec06ad
|
Merge pull request #3113 from benjiwheeler/modal-inner-content
add ModalInnerContent component, use it in modals
|
2019-07-10 11:48:32 -04:00 |
|
Ben Wheeler
|
171d5854ff
|
prevent modal-inner-content margins from unexpectedly collapsing with parent
|
2019-07-09 23:50:11 -04:00 |
|
Ben Wheeler
|
3a685e38fb
|
add ModalInnerContent component, use it in modals
|
2019-07-09 22:20:59 -04:00 |
|
Benjamin Wheeler
|
f800faba14
|
Merge pull request #3107 from benjiwheeler/modal-title
created ModalTitle component
|
2019-07-09 19:56:23 -04:00 |
|
Ben Wheeler
|
57d9ab6511
|
Add classname prop to modal title
|
2019-07-09 19:42:16 -04:00 |
|
BryceLTaylor
|
a92abd4910
|
Use npm exclusively (not make) to run tests
|
2019-07-09 14:49:44 -04:00 |
|
Ben Wheeler
|
f02d41f8b5
|
created ModalTitle component
|
2019-07-08 17:42:05 -04:00 |
|
Paul Kaplan
|
adf5a5838e
|
Merge pull request #3102 from LLK/hotfix/2019-07-02
[Develop] Hotfix for asset saving errors
|
2019-07-08 13:05:30 -04:00 |
|
Paul Kaplan
|
22b488bf9d
|
Merge pull request #3101 from LLK/hotfix/2019-07-02
[Master] Hotfix for asset saving errors
|
2019-07-08 13:04:43 -04:00 |
|
Benjamin Wheeler
|
30a17719c6
|
Merge pull request #3086 from benjiwheeler/simplify-join-flow-step
use html form instead of formik form
|
2019-07-08 11:49:05 -04:00 |
|
Benjamin Wheeler
|
526417f94e
|
Merge pull request #3082 from benjiwheeler/join-flow-username-working
working username step of join flow
|
2019-07-08 11:48:00 -04:00 |
|
Ben Wheeler
|
a0618b5b4c
|
removed unused css classname, added TODO re: 'hide username' text
|
2019-07-08 11:47:14 -04:00 |
|
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 |
|