scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-26 17:16:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
4380 commits 217 branches 1 tag 472 MiB
Commit graph

4380 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benjamin Wheeler
a848a0f60e
Merge pull request #3094 from LLK/greenkeeper/google-libphonenumber-3.2.3 
Update google-libphonenumber to the latest version 🚀
 2019-07-14 16:39:09 -04:00
Ben Wheeler
9084fb8bfd use existing select css 2019-07-12 14:43:22 -04:00
Ray Schamp
3c76849077 Merge branch 'Remove-Make-From-Tests' of https://github.com/BryceLTaylor/scratch-www into remove-makefile 2019-07-12 13:52:12 -04:00
Ben Wheeler
658cb1d61e specify PropTypes format of formik-select options 2019-07-12 13:32:21 -04:00
Ray Schamp
21edd33fc7
Merge pull request #3134 from LLK/hotfix/upgrade-dependencies 
Upgrade file-loader, url-loader and async packages, add package-lock.json
 2019-07-12 13:31:52 -04:00
Ray Schamp
5a6fb64d4a Upgrade async to v3 2019-07-12 13:09:09 -04:00
Ben Wheeler
3d0da891a9 introduce formik select component 2019-07-12 12:47:02 -04:00
Ray Schamp
03e6a49b44 Update for async v2 
async.auto / async.waterfall now take the callback as the last argument in functions with dependencies.

Async is modularized so eachLimit can be required specifically
 2019-07-12 11:44:52 -04:00
Benjamin Wheeler
07419526cd
Merge pull request #3119 from benjiwheeler/join-flow-advance-step 
handle join flow state for tracking, advancing current step
 2019-07-12 11:42:57 -04:00
Benjamin Wheeler
b30382e6fc
Merge pull request #3132 from benjiwheeler/retry-join-flow-modal-inner-content 
add ModalInnerContent component, use it in modals
 2019-07-12 11:37:25 -04:00
Ray Schamp
287b2de09d Downgrade async 2019-07-12 10:45:03 -04:00
Ray Schamp
2b558efb1d Add package-lock 2019-07-12 10:13:28 -04:00
Ray Schamp
cdd8752c8c Merge branch 'greenkeeper/async-3.1.0' of github.com:LLK/scratch-www into upgrade-dependencies 2019-07-12 10:06:33 -04:00
Ray Schamp
cc606ee461 Merge branch 'greenkeeper/file-loader-4.0.0' of github.com:LLK/scratch-www into upgrade-dependencies 
# Conflicts:
#	package.json
 2019-07-12 10:06:18 -04:00
Ray Schamp
86c9cfe455 Merge branch 'greenkeeper/url-loader-2.0.1' of github.com:LLK/scratch-www into upgrade-dependencies 
# Conflicts:
#	package.json
 2019-07-12 10:05:14 -04:00
Ben Wheeler
a1ed49084f add ModalInnerContent component, use it in modals 2019-07-11 16:10:33 -04:00
DD Liu
6485c7405e
Merge pull request #3122 from LLK/release/2019-07-11 
[Master] Release/2019 07 11
 2019-07-11 11:34:50 -04:00
DD Liu
e704cda0fa
Merge pull request #3123 from LLK/release/2019-07-11 
[Develop] Release/2019 07 11
 2019-07-11 11:34:31 -04:00
Benjamin Wheeler
c3e7b108e6
Merge pull request #3127 from LLK/revert-3113-modal-inner-content 
Revert "add ModalInnerContent component, use it in modals"
 2019-07-11 11:06:33 -04:00
Benjamin Wheeler
86261ec1ef
Revert "add ModalInnerContent component, use it in modals" 2019-07-11 11:06:02 -04:00
Benjamin Wheeler
37a5c8330c
Merge pull request #3126 from LLK/revert-3116-format-validation 
Revert 3116 format validation
 2019-07-11 10:59:28 -04:00
Benjamin Wheeler
7854857d75
Revert "Format and position validation error messages in join flow" 2019-07-11 10:58:28 -04:00
Benjamin Wheeler
4cdab756aa
Merge pull request #3125 from LLK/revert-3116-format-validation 
Revert "Format and position validation error messages in join flow"
 2019-07-11 10:55:45 -04:00
Benjamin Wheeler
5214eeda6e
Revert "Format and position validation error messages in join flow" 2019-07-11 10:54:17 -04:00
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