Commit graph

1548 commits

Author SHA1 Message Date
DD Liu
b4120e2428 Merge branch 'develop' into updateTap 2019-08-07 10:18:34 -04:00
DD Liu
66ef8799eb
Merge branch 'develop' into cssLoader 2019-08-07 10:16:18 -04:00
DD Liu
75eda6d1e7
Merge pull request #884 from LLK/greenkeeper/style-loader-1.0.0
Update style-loader to the latest version 🚀
2019-08-07 09:52:40 -04:00
DD Liu
f166290667
Merge pull request #893 from fsih/updateEslintPluginImport
Update eslint plugin import
2019-08-07 09:52:02 -04:00
DD Liu
491d1d2ed5
Merge pull request #892 from fsih/updateSvgUrlLoader
Update svg url loader
2019-08-07 09:51:39 -04:00
DD Liu
79a383a024
Merge pull request #890 from fsih/updateUrlLoader
update url loader
2019-08-07 09:51:14 -04:00
DD Liu
2b69b44e8e
Merge pull request #889 from fsih/canvasPrebuilt
Downgrade canvas prebuilt version. This fixes unit tests locally
2019-08-06 17:51:55 -04:00
DD Liu
67553caa87 update url loader 2019-08-06 17:50:19 -04:00
DD Liu
4de9370c45 Update tap version 2019-08-06 17:49:36 -04:00
DD Liu
7be20b59a1 Update svg url loader 2019-08-06 17:48:26 -04:00
DD Liu
6254f96bb2 Update eslint plugin import 2019-08-06 17:47:18 -04:00
DD Liu
4a575d381f Update css loader version 2019-08-06 17:45:45 -04:00
DD Liu
05dac3d83a Downgrade canvas prebuilt version. This fixes unit tests locally 2019-08-06 17:41:46 -04:00
DD Liu
8b68f9fa34
Merge pull request #877 from fsih/ymlUpdate
Update travis.yml to use jobs
2019-08-06 17:34:18 -04:00
DD Liu
551ee8e319
Merge pull request #888 from fsih/addNpmIgnore
Add npm ignore that leaves dist in the npm package
2019-08-06 17:33:33 -04:00
DD Liu
7d597faac6 Add npm ignore that leaves dist in the npm package 2019-08-06 16:57:25 -04:00
DD Liu
30136bd5aa
Merge pull request #887 from LLK/revert-880-rollForward
Roll back "Roll updated deps back forward"
2019-08-06 14:16:05 -04:00
DD Liu
60b3c50f61
Revert "Roll updated deps back forward" 2019-08-06 12:16:28 -04:00
greenkeeper[bot]
93e48bce68 chore(package): update css-loader to version 3.2.0 2019-08-06 15:00:57 +00:00
greenkeeper[bot]
c62fdd7a8e chore(package): update style-loader to version 1.0.0 2019-08-06 13:12:41 +00:00
DD Liu
0b94b93ae3
Merge pull request #880 from fsih/rollForward
Roll updated deps back forward
2019-08-02 14:45:06 -04:00
DD Liu
3417d1f9cb Merge branch 'develop' into rollForward 2019-08-02 14:37:33 -04:00
DD Liu
f16b672bfe Remove redundant lines 2019-08-02 14:29:05 -04:00
DD Liu
6a6e43f1cb Merge branch 'develop' into ymlUpdate 2019-08-02 14:27:44 -04:00
DD Liu
ac8327bbb7
Merge pull request #882 from fsih/changeInstallOrder
Test installing canvas after installing and updating others
2019-08-01 15:55:34 -04:00
DD Liu
bc974fcead remove needing sudo 2019-08-01 15:24:11 -04:00
DD Liu
5178e28a7f Test installing canvas after installing and updating others 2019-08-01 15:17:45 -04:00
DD Liu
2ef52f6f2d
Merge pull request #881 from fsih/addNoSave
Add no save and move back to node 8
2019-08-01 15:00:48 -04:00
DD Liu
4e2e58bacd Add no save and move back to node 8 2019-08-01 14:59:09 -04:00
DD Liu
7006138635 Roll updated deps back forward 2019-07-31 17:11:47 -04:00
DD Liu
b20bcfd46f Revert yml to node 6 2019-07-31 16:05:37 -04:00
DD Liu
2ec9be80a9 Test revert canvas prebuilt 2019-07-31 15:34:57 -04:00
DD Liu
dc95edd1e6 Test revert eslint-plugin-import 2019-07-31 15:16:08 -04:00
DD Liu
7280ffd451 Revert tap update more 2019-07-31 15:09:45 -04:00
DD Liu
4ecaa72911 Test revert tap update 2019-07-31 14:58:54 -04:00
DD Liu
4ae4926b10 Test revert url-loader update 2019-07-31 14:31:05 -04:00
DD Liu
262f186a42 Test revert svg url loader 2019-07-31 14:02:07 -04:00
DD Liu
e4a7c2f4f1 Test revert react-intl update 2019-07-31 13:51:44 -04:00
DD Liu
3e08fa5500 Test revert css loader update 2019-07-31 13:41:20 -04:00
DD Liu
608b470100 update react redux 2019-07-31 13:18:11 -04:00
DD Liu
156227e9e8 update react-dom 2019-07-31 12:20:59 -04:00
DD Liu
8416d1a9db Merge branch 'develop' into ymlUpdate 2019-07-31 11:08:01 -04:00
DD Liu
1342511a12
use the same version of canvas as canvas-prebuilt (#878) 2019-07-31 11:04:27 -04:00
DD Liu
6a12888472 Merge branch 'develop' of github.com:LLK/scratch-paint into ymlUpdate 2019-07-31 11:00:41 -04:00
DD Liu
505d39ae81 try to fix jobs 2019-07-30 21:47:40 -04:00
DD Liu
8c7d0da5db use jobs 2019-07-30 19:13:32 -04:00
DD Liu
0c0910a8d5 match canvas version with canvas-prebuilt 2019-07-30 18:29:24 -04:00
DD Liu
5ba709cf76 remove some stuff I don't think we need 2019-07-30 18:22:38 -04:00
DD Liu
09e1e95b26 Try to use addons instead of sudo 2019-07-30 10:25:57 -04:00
DD Liu
585ba2acda
Downgrade canvas prebuilt because 2.0 isn't working and breaks unit tests (#876) 2019-07-30 10:20:27 -04:00