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 dev-0.3 #536

Merged
merged 80 commits into from
Oct 26, 2018
Merged

Merge dev-0.3 #536

merged 80 commits into from
Oct 26, 2018

Conversation

RichardShan
Copy link
Contributor

No description provided.

RichardShan and others added 30 commits October 16, 2018 16:20
@RichardShan
Merge pull request edp963#497 from shanmengm/dev-0.3
c43cac7 
Dev 0.3
@ruanhan
feature drilldown
9f11a6d
@AndyFong
feat(Display): add Editor or Layers based vertical and horizontal bas…
9a5063c 
…elines while dragging or resizing layers
@AndyFong
Merge pull request edp963#500 from AndyFong/dev-0.3
d6e41f7 
feat(Display): baselines
@ruanhan
drill
2c58ab1
@ruanhan
feature drilldown
970883b
@ruanhan
drill
bebad43
@ruanhan
Merge branch 'dev-0.3.1' of https://github.com/ruanhan1988/davinci in…
0d10375 
…to dev-0.3.1
@ruanhan
Merge pull request edp963#501 from ruanhan/dev-0.3.1
b8fface 
Dev 0.3.1
@ruanhan
feature drillup
1eb3d6d
@ruanhan
Merge pull request edp963#502 from ruanhan/dev-0.3.1
15b5705 
feature drillup
@scottsut
在widgetprops中添加model
822addb
@scottsut
Merge pull request edp963#503 from scottsut/dev-0.3
341358a 
在widgetprops中添加model
@RichardShan
修改Share Dto
c3a71a0
@RichardShan
Merge pull request edp963#504 from shanmengm/dev-0.3
c063a2d 
修改Share Dto
@ruanhan
fix bug drill
0ba5359
@ruanhan
Merge pull request edp963#505 from ruanhan/dev-0.3.1
f7ff272 
fix bug drill
@yuhouchuhe1
地图(temp)
0a79ed9
@yuhouchuhe1
Merge pull request edp963#506 from yuhouchuhe1/dev-0.3
d56d949 
地图(temp)
@scottsut
chart mode wordCloud & waterfall
c86b17e
@scottsut
Merge pull request edp963#507 from scottsut/dev-0.3
34fecdf 
chart mode wordCloud & waterfall
@AndyFong
feat(Widget): add basic Parallel, Sankey, Radar diagrams support
87635d4
@scottsut
map
e21cbb7
@scottsut
Merge pull request edp963#508 from scottsut/dev-0.3
5f44c88 
map
@AndyFong
fix(merge): fix merge conflict from upstream/dev-0.3
e68a183
@AndyFong
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-0.3
795d3f1
@AndyFong
fix(Widget): change city.json import yo geo.json
ee601f7
@AndyFong
fix(Share): fix Display Share SecondaryLayer widget null error
25d98e2
@AndyFong
Merge pull request edp963#509 from AndyFong/dev-0.3
c1a2a7e 
feat(Widget): add basic Parallel, Sankey, Radar diagrams support
@ruanhan
feature drill toolbox
8294700
scottsut and others added 29 commits October 24, 2018 19:11
@scottsut
Merge pull request edp963#519 from scottsut/dev-0.3
2c58b4b 
fix phantomjs render error and authorized login css error
@RichardShan
fix
e04842a 
1. 优化csv上传异常
2. 修改定时发送图片邮件方案
@RichardShan
Merge pull request edp963#520 from shanmengm/dev-0.3
b15fe8d 
fix
@ruanhan
fix schedule minutes
4e97f86
@ruanhan
Merge pull request edp963#521 from ruanhan/dev-0.3.1
40ab871 
fix schedule minutes
@ruanhan
fix
609ff2f
@ruanhan
Merge pull request edp963#522 from ruanhan/dev-0.3.1
b54d466 
fix
@AndyFong
feat(Widget): add Sankey,Radar,Parallel style config and enrich axis …
9166ed1 
…config items
@AndyFong
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-…
8e43f40 
…0.3.1
@AndyFong
Merge pull request edp963#523 from AndyFong/dev-0.3.1
6b58433 
feat(Widget): add Sankey,Radar,Parallel style config and enrich axis config items
@yuhouchuhe1
飞行图
6e8edbb
@yuhouchuhe1
Merge pull request edp963#524 from yuhouchuhe1/dev-0.3
35641c9 
飞行图
@AndyFong
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-…
7cae60c 
…0.3.1
@scottsut
fix
1459a12
@scottsut
fix
4e1b87c
@scottsut
Merge pull request edp963#525 from scottsut/dev-0.3
19c61cd 
Dev 0.3
@AndyFong
fix(Widget): fix parallel multi categories axis label bug
4b970bb
@AndyFong
fix(Widget): remove sankey legend config
7fa3525
@AndyFong
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-…
1632018 
…0.3.1
@yuhouchuhe1
fix
4a70ac5
@yuhouchuhe1
Merge pull request edp963#527 from yuhouchuhe1/dev-0.3
34a610d 
fix
@AndyFong
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-…
f00d6f3 
…0.3.1
@AndyFong
fix(Widget): remove parallel label config and clear chart while prop …
2e5789b 
…smooth updated
@AndyFong
Merge pull request edp963#534 from AndyFong/dev-0.3.1
8c643cf 
fix Widget Sankey and Parallel chart bugs
@yuhouchuhe1
fix
ff0cfd0
@yuhouchuhe1
Merge pull request edp963#535 from yuhouchuhe1/dev-0.3
27d0c00 
fix
@RichardShan
update ui and shell
2f53753
@RichardShan
Merge branch 'dev-0.3'
0f9bc73
@RichardShan
fix
836fb54
@RichardShan RichardShan merged commit a20ff5d into edp963:master Oct 26, 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 @ruanhan @AndyFong @scottsut @yuhouchuhe1