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 from dev-0.3 #498

Merged
merged 76 commits into from
Oct 16, 2018
Merged

Merge from dev-0.3 #498

merged 76 commits into from
Oct 16, 2018

Conversation

RichardShan
Copy link
Contributor

No description provided.

AndyFong and others added 30 commits September 19, 2018 11:17
@AndyFong
feat(Filter): add operator support
40bb8dd
@AndyFong
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-0.3
3ff2eb6
@AndyFong
chore(node_modules): Localize react-dragglable react-resizable react-…
7a4fa46 
…grid-layout
@AndyFong
fix(libs): add libs localization README and fix localization errors
0031ca9
@AndyFong
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-0.3
9fb1c04
@AndyFong
Merge pull request edp963#463 from AndyFong/dev-0.3
d8ea3a8 
node_modules libs localization
@RichardShan
fix bug
4463817 
修改Sql模板数据库别名、子查询报错问题
@RichardShan
Merge pull request edp963#464 from shanmengm/dev-0.3
b03c3b3 
fix bug
@AndyFong
fix(Display): remove chart LayerItem title
b3a5931
@AndyFong
feat(Display): remove slide gridDistance param config
21b4e69
@RichardShan
Modify some configurations
1814313
@RichardShan
Merge pull request edp963#465 from shanmengm/dev-0.3
322e16c 
Modify some configurations
@RichardShan
getData接口支持limit
86224d4
@RichardShan
Merge pull request edp963#466 from shanmengm/dev-0.3
8ae7057 
getData接口支持limit
@yuhouchuhe1
支持收藏Project；优化
dec92cb
@yuhouchuhe1
Merge pull request edp963#468 from yuhouchuhe1/dev-0.3
485208c 
支持收藏Project；优化
@yuhouchuhe1
支持Maintainer时，能在当前团队下新建团队；fix bug；优化样式
d7f938a
@yuhouchuhe1
Merge pull request edp963#469 from yuhouchuhe1/dev-0.3
7532f64 
支持Maintainer时，能在当前团队下新建团队；fix bug；优化样式
@AndyFong
feat(Display): add tooltip when layer dragging and resizing, WIP: dra…
ab0142c 
…gging and resizing baselines
@yuhouchuhe1
我的组织->提示我创建的组织
5512b89
@yuhouchuhe1
Merge pull request edp963#470 from yuhouchuhe1/dev-0.3
eb94e1c 
我的组织->提示我创建的组织
@AndyFong
fix(Dashboard): remove filter and linkage config modal close confirm …
c4f01bf 
…and make modal maskClosable `false`
@AndyFong
fix(Dashoard): remove all exist linkages after linkage config saved
16dbe66
@AndyFong
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-0.3
171e9cf
@yuhouchuhe1
新建View时，Schema 树点击表名和点击箭头效果一致
d68c7b8
@yuhouchuhe1
Merge pull request edp963#471 from yuhouchuhe1/dev-0.3
e8ddfe5 
新建View时，Schema 树点击表名和点击箭头效果一致
@AndyFong
fix(FilterConfig): fix filter save bugs
da9682b
@AndyFong
Merge pull request edp963#472 from AndyFong/dev-0.3
fc19bc9 
fix bugs and WIP: optimize display slide edit
@ruanhan
fix
a8f920c
@ruanhan
Merge pull request edp963#473 from ruanhan/dev-0.3-fixuser
553d4a4 
fix
RichardShan and others added 29 commits October 12, 2018 11:51
@RichardShan
Merge pull request edp963#483 from shanmengm/dev-0.3
ba5ef17 
fix bug
@yuhouchuhe1
fix bug
b7aa0fc
@yuhouchuhe1
Merge pull request edp963#487 from yuhouchuhe1/dev-0.3
6ab7f8d 
fix bug
@RichardShan
fix bug
0afda6d
@yuhouchuhe1
Widget 视图驱动支持饼图
7cb3f86
@yuhouchuhe1
Merge pull request edp963#490 from yuhouchuhe1/dev-0.3
d8969cc 
Widget 视图驱动支持饼图
@AndyFong
chore(git): update .gitignore file
bb719d5
@AndyFong
chore(libs): localize react-draggable in libs with ts/tsx support
1166581
@AndyFong
chore(libs): localize react-resizable in libs with ts/tsx support
b004801
@AndyFong
chore(libs): localize react-grid-layout in libs with es5 build files
a2b869b
@AndyFong
feat(Display): WIP: horizontal&vertical baselines, update file import…
595f8b5 
… path, add some ts types
@AndyFong
fix(Display): fix selector currentSelectedLayers error
267332a
@scottsut
fix
55f2193
@scottsut
Merge pull request edp963#491 from scottsut/dev-0.3
3711499 
fix
@yuhouchuhe1
widget编辑器 视图驱动模式支持漏斗图
bcc1c75
@yuhouchuhe1
Merge pull request edp963#492 from yuhouchuhe1/dev-0.3
1076434 
widget编辑器 视图驱动模式支持漏斗图
@AndyFong
Merge pull request edp963#493 from AndyFong/dev-0.3
d105aac 
localization node_modules libs
@yuhouchuhe1
fix
3701f23
@yuhouchuhe1
Merge pull request edp963#494 from yuhouchuhe1/dev-0.3
5780571 
fix
@scottsut
fix
c3f5fce
@scottsut
Merge pull request edp963#495 from scottsut/dev-0.3
f2f6424 
fix
@scottsut
fix
e9d3e96
@scottsut
Merge pull request edp963#496 from scottsut/dev-0.3
bfd2ad6 
fix
@RichardShan
fix bug
e65914b
@RichardShan
update ui、start shell
47dabb6
@RichardShan
Merge branch 'dev-0.3' of https://github.com/shanmengm/davinci into d…
f42a0d1 
…ev-0.3
@RichardShan
fix
eefc6fb
@RichardShan
Merge branch 'dev-0.3'
51e0b72
@RichardShan
assembly beta.2
9ccd761
@RichardShan RichardShan merged commit a53d43d into edp963:master Oct 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RichardShan @AndyFong @yuhouchuhe1 @ruanhan @scottsut