picklesrus
13f3285b8e
Merge pull request #3151 from LLK/release/2019-07-18
...
[Develop] Release 2019-07-18
2019-07-18 16:12:42 -04:00
picklesrus
23fe3677ae
Merge pull request #3150 from LLK/release/2019-07-18
...
[Master] Release 2019-07-18
2019-07-18 15:47:25 -04:00
picklesrus
2e7f2c3d6a
Merge pull request #3155 from picklesrus/update-renderer-version
...
Update gui with revert of scratch-svg-renderer version and scratch-paint version.
2019-07-18 14:55:47 -04:00
picklesrus
d52b65f6f8
Update gui version with revert of PR from scratch-svg-renderer
2019-07-18 14:43:20 -04:00
Benjamin Wheeler
5a175bc1af
Merge pull request #3133 from benjiwheeler/retry-join-flow-format-validation
...
Format validation; redo of PR 3116
2019-07-18 12:45:53 -04:00
greenkeeper[bot]
71dfb050d5
chore(package): update lockfile package-lock.json
2019-07-18 13:00:01 +00:00
greenkeeper[bot]
9dbd789b86
chore(package): update url-loader to version 2.1.0
2019-07-18 12:59:56 +00:00
picklesrus
cae62e8d72
Merge pull request #3149 from LLK/develop
...
Merge develop into release branch 2019-07-18
2019-07-17 18:45:15 -04:00
picklesrus
afc75f301c
Merge pull request #3148 from picklesrus/update-gui-version-7-18
...
Bump gui version for release. 2019-07-18.
2019-07-17 18:34:42 -04:00
picklesrus
7ca9c4bd69
Bump gui version for release. 2019-07-18.
2019-07-17 18:22:38 -04:00
picklesrus
15f52f926c
Merge pull request #3147 from picklesrus/update-package-lock
...
update package lock to fix the build
2019-07-17 17:43:04 -04:00
picklesrus
4084a16826
update package lock to fix the build
2019-07-17 17:31:06 -04:00
BryceLTaylor
d8738c9a67
Update package-lock
2019-07-17 16:21:53 -04:00
BryceLTaylor
7f6a316224
remove enzyme since we don't use it yet
2019-07-17 16:20:11 -04:00
BryceLTaylor
126f3a34b2
Updeate integration test README
2019-07-17 15:59:34 -04:00
BryceLTaylor
b63d64d03e
Run Jest tests alongside Tap tests
2019-07-17 15:33:01 -04:00
BryceLTaylor
c56f488b33
Add Jest, Enzyme, and sample tests
2019-07-17 15:27:13 -04:00
BryceLTaylor
4a963dbfaa
remove tap tests from non-legacy folders
2019-07-17 15:12:55 -04:00
BryceLTaylor
dd6b7ba4e2
Move tap tests into legacy folders
2019-07-17 14:56:48 -04:00
Ben Wheeler
c8800d8663
After rebasing on develop, reintroduce changes
2019-07-17 12:58:50 -04:00
Ben Wheeler
faa37ae270
rename row-relative to row-with-tooltip
2019-07-17 12:52:42 -04:00
Ben Wheeler
911ecc8516
Format validation; redo of PR 3116
2019-07-17 12:52:42 -04:00
Benjamin Wheeler
62f30c7a8b
Merge pull request #3138 from benjiwheeler/join-flow-improve-css
...
Improve formatting of join flow title, description, next step button
2019-07-17 00:02:05 -04:00
Ben Wheeler
681e7d9a74
move next step font size to next-step-button.scss
2019-07-17 00:00:31 -04:00
Benjamin Wheeler
9df814846f
Merge pull request #3096 from LLK/greenkeeper/react-modal-3.8.2
...
Update react-modal to the latest version 🚀
2019-07-16 23:52:22 -04:00
Benjamin Wheeler
88b3ea6698
Merge pull request #3140 from benjiwheeler/margin-collapse-use-padding-instead
...
use padding to avoid margin collapse; drop approach that used `overflow: auto`
2019-07-16 15:29:17 -04:00
Ben Wheeler
a85ad87028
Improve formatting of join flow title, description, next step button
2019-07-15 17:29:09 -04:00
Ray Schamp
5e868575c6
Merge pull request #3137 from LLK/hotfix/remove-makefile
...
Move Makefile into package.json, remove Docker config
2019-07-15 16:54:08 -04:00
Ben Wheeler
27cb6199b5
use padding rather than margin to avoid margin collapse; drop overflow clear approach
2019-07-15 16:07:39 -04:00
Benjamin Wheeler
96a1b89ccb
Merge pull request #3117 from benjiwheeler/join-flow-use-css
...
Format join flow using ModalTitle, ModalInnerContent, NextStepButton components
2019-07-15 12:50:25 -04:00
Ray Schamp
cccb908221
Remove remaining references to Docker
2019-07-15 10:55:56 -04:00
Andrew Sliwinski
4483b6d5a2
Merge pull request #2918 from LLK/greenkeeper/lodash.range-3.2.0
...
Update lodash.range to the latest version 🚀
2019-07-15 10:23:06 -04:00
Ray Schamp
065b808815
Fix lint script
2019-07-15 10:10:52 -04:00
Ray Schamp
7e284ba6db
Fix deploy scripts
2019-07-15 10:03:43 -04:00
Ben Wheeler
2773495878
Format join flow using ModalTitle, ModalInnerContent, NextStepButton components
2019-07-15 09:58:41 -04:00
Benjamin Wheeler
92430584dc
Merge pull request #3121 from benjiwheeler/formik-select
...
introduce formik select component
2019-07-15 09:52:17 -04:00
Ray Schamp
6be82960f0
Fix tap scripts
2019-07-15 09:52:17 -04:00
Benjamin Wheeler
141112aa3c
Merge pull request #3135 from benjiwheeler/package-lock-libphonenumber
...
update package-lock.json with newer google-libphonenumber
2019-07-15 09:50:47 -04:00
Ray Schamp
3e6982ff9d
Move remaining Makefile entries to package.json
...
Remove Docker since it wasn’t really being used.
2019-07-15 09:24:47 -04:00
Ben Wheeler
862bc8000f
fix add-to-studio modal height, gradient interference
2019-07-15 06:27:13 -04:00
Ben Wheeler
0cdb5a8740
update package-lock.json with newer google-libphonenumber
2019-07-15 05:50:47 -04:00
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
