Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge renovation #13214

Merged
merged 191 commits into from
May 28, 2020
Merged

Merge renovation #13214

merged 191 commits into from
May 28, 2020

Conversation

churkin
Copy link
Contributor

@churkin churkin commented May 26, 2020

No description provided.

roman-simionov and others added 30 commits December 16, 2019 19:10
@roman-simionov
preact button
ec5a4b7
@roman-simionov
add generator
6db39c2
@roman-simionov
pull 20_1 into preact-button
284d874
Template
63033d0
@roman-simionov
add generation to build task
de04e8b
@roman-simionov
get generator from npm
226f9b9
@roman-simionov
update generator
b204a19
@MaximKudriavtsev
Add the elementAttr property
ed161c5
@MaximKudriavtsev
Add the type property
e60a29f
@roman-simionov
skip known errors
67af5b1
@roman-simionov
Merge branch '20_1' of https://github.com/DevExpress/DevExtreme into …
2d736c1 
…preact-button
@roman-simionov
update generator
e3b22b1
@roman-simionov
update elementAttr
b8916b4
@roman-simionov
change type for elementAttr
b56e7ee
@roman-simionov
remove test-list, test-button-group
3e6b04d
@roman-simionov
fix test-button jQuery wrapper
68ca1be
@roman-simionov
fix memory leaks tests
53c4248
@roman-simionov
Merge branch '20_1' of https://github.com/DevExpress/DevExtreme into …
706313c 
…preact-button
@roman-simionov
elements on refresh test increase timeout
f927a53
@MaximKudriavtsev
Update Button
d8bfd14
@MaximKudriavtsev
Resolve conflicts
cea8437
@roman-simionov
move declarations/component-declaration from js
df2c2ec
@roman-simionov
increase tick in elementsOnRefresh test
7af6a69
@roman-simionov
update generator
e51e90b
@roman-simionov
Rollback elementsOnRefresh and refix
5ed7d81
@roman-simionov
Merge branch '20_1' of https://github.com/DevExpress/DevExtreme into …
969ac29 
…preact-button
@roman-simionov
Merge branch '20_1' of https://github.com/DevExpress/DevExtreme into …
99226b6 
…preact-button
@roman-simionov
Update devextreme-internal-tools
2f01820
@roman-simionov
Revert "move declarations/component-declaration from js"
b68d97d 
This reverts commit df2c2ec.
@roman-simionov
add babel-plugin-transform-object-assign, remove unused packages
e55d659
@churkin churkin dismissed stale reviews from pavelgruba and MaximKudriavtsev via 1050bdd May 27, 2020 18:31
San4es
San4es reviewed May 28, 2020
View reviewed changes
.lintstagedrc Outdated Show resolved Hide resolved
playground/vue/package-lock.json Outdated Show resolved Hide resolved
San4es
San4es previously approved these changes May 28, 2020
View reviewed changes
Copy link
Contributor

@San4es San4es left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@churkin churkin merged commit e700e5e into DevExpress:20_2 May 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@San4es San4es San4es approved these changes

@DokaRus DokaRus DokaRus approved these changes

@MaximKudriavtsev MaximKudriavtsev MaximKudriavtsev approved these changes

@LazyLahtak LazyLahtak LazyLahtak approved these changes

@MikeVitik MikeVitik Awaiting requested review from MikeVitik

@nightskylark nightskylark Awaiting requested review from nightskylark

@pavelgruba pavelgruba Awaiting requested review from pavelgruba

@babich-a babich-a Awaiting requested review from babich-a

Assignees

@churkin churkin

Labels
renovation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.