Skip to content

merge with upstream #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Oct 8, 2017
Merged

merge with upstream #1

merged 25 commits into from
Oct 8, 2017

Conversation

vanhoavn
Copy link
Owner

@vanhoavn vanhoavn commented Oct 8, 2017

No description provided.

yyx990803 and others added 25 commits August 5, 2017 02:19
* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение
* keep path of source file in source map

* fix #943, regex should consider path or file name includes dot

* use path.extname rather than regex

* add sourceRoot option for SourceMapGenerator
* add -webkit-keyframes in test

* add scope id if keyframes has prefix

* add @-webkit-keyframes in test
* [CN] Added "Loading a global settings file"

* Typo
* feat(template-compiler): add compilerDirectives option

* docs(en): add compilerDirectives option

* docs(en): add compilerModules option

* docs(ja): translate options

* docs: updates
* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка
* Synced recent updates from en.

* [zh-cn] finished translation of recent updates

* [zh-cn] http -> https

* [zh-cn] fixed some syntax and format
* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS
* [zh-cn] sync recent updates from #db54537 to #c39ba70

* [zh-cn] synced recent updates (#db54537 to #c39ba70)

* [zh-cn] fixed some details
@vanhoavn vanhoavn merged commit d7b0c80 into vanhoavn:master Oct 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.