superman
|
52ac8eaa2a
|
Merge pull request #212 in BA/design from ~SHINE/design:master to master
* commit '364cfb1257b460b764edfd4fe2e69f6b2f1e0bb5':
bug
bug
|
8 years ago |
fr_shine
|
364cfb1257
|
bug
|
8 years ago |
fr_shine
|
5ea7979199
|
bug
|
8 years ago |
superman
|
04e967e515
|
Merge pull request #210 in BA/design from ~NEIL/design:release to master
* commit '973230757a1898070f1f579e0d699b37d71d5bf3': (39 commits)
图标
update
今天要合到master代码,新功能来不及测试了,先回退
bug
rt
update
rt
rt
rt
插件读取
实例化manager对象
表单增加图表类型增加行
图标
update
聚合报表工具栏
聚合报表工具栏
聚合报表图标
npe
预览展示
表单交互统一,漏传了一个文件
...
|
8 years ago |
superman
|
973230757a
|
Merge pull request #208 in BA/design from ~XIAOHU/design:release to release
* commit 'ca0b5b3ac717e565e361fe6373e58f582adee417':
图标
|
8 years ago |
xiaohu
|
ca0b5b3ac7
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~xiaohu/design into release
|
8 years ago |
xiaohu
|
db4e6bfe47
|
图标
|
8 years ago |
superman
|
27af0bb490
|
Merge pull request #203 in BA/design from ~XIAOHU/design:release to release
* commit '69483fcc2fa04533f22bf12667c6c63e2ee64a67':
update
|
8 years ago |
xiaohu
|
69483fcc2f
|
update
|
8 years ago |
superman
|
468b8d5248
|
Merge pull request #198 in BA/design from ~ZHOUPING/design:dev to dev
* commit '6ccd8301703b7f6655ae3b741ce0f9eaf21ab3f5':
今天要合到master代码,新功能来不及测试了,先回退
|
8 years ago |
zhouping
|
6ccd830170
|
今天要合到master代码,新功能来不及测试了,先回退
|
8 years ago |
superman
|
a9b4856552
|
Merge pull request #197 in BA/design from ~SHINE/design:dev to dev
* commit '8e4dc84db1e2f259bc53e7eb6387dcf6c32aa6e4':
bug
|
8 years ago |
fr_shine
|
8e4dc84db1
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~shine/design into dev
|
8 years ago |
fr_shine
|
d0a3e2b95b
|
bug
|
8 years ago |
superman
|
7aff511310
|
Merge pull request #196 in BA/design from ~XIAXIANG/design:dev to dev
* commit 'd77d991667f57ad35070d09936810a21ca66174e':
rt
rt
rt
rt
|
8 years ago |
superman
|
644acf3994
|
Merge pull request #195 in BA/design from ~XIAOHU/design:dev to dev
* commit 'e36eae4227435da75b8268f0bfad886a1203df1c':
update
插件读取
|
8 years ago |
xiaxiang
|
d77d991667
|
rt
|
8 years ago |
xiaohu
|
e36eae4227
|
update
|
8 years ago |
xiaxiang
|
d3fbca4592
|
rt
|
8 years ago |
xiaxiang
|
7a0ee1d555
|
rt
|
8 years ago |
xiaxiang
|
a05e90c642
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaxiang/design into dev
|
8 years ago |
xiaxiang
|
00cc0ec45a
|
rt
|
8 years ago |
xiaohu
|
0d760d0575
|
merge
|
8 years ago |
xiaohu
|
16aa210afb
|
插件读取
|
8 years ago |
superman
|
5b2802fe39
|
Merge pull request #192 in BA/design from ~XIAOHU/design:dev to dev
* commit 'c463d7b279bbf09450708fc5d9c02d63a3b22157':
图标
|
8 years ago |
superman
|
3d6178bf92
|
Merge pull request #194 in BA/design from ~EASON/design:dev to dev
* commit '16934b3535e47fd90c9270203305e8b0ebbfe9cf':
实例化manager对象
|
8 years ago |
eason-skx
|
16934b3535
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~eason/design into dev
|
8 years ago |
xiaohu
|
f9b9d93cf1
|
Merge remote-tracking branch 'basic/dev' into dev
|
8 years ago |
eason-skx
|
58a57de24e
|
实例化manager对象
|
8 years ago |
superman
|
5feb54a58d
|
Merge pull request #193 in BA/design from ~SHINE/design:dev to dev
* commit '2b1d0782e4793a31ddf56c1c33aff8475f36bf75':
表单增加图表类型增加行
|
8 years ago |
fr_shine
|
2b1d0782e4
|
表单增加图表类型增加行
|
8 years ago |
xiaohu
|
c463d7b279
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
xiaohu
|
b67c6b7df6
|
图标
|
8 years ago |
superman
|
16dbf0622f
|
Merge pull request #191 in BA/design from ~XIAOHU/design:dev to dev
* commit '652fc735e7e2594f66f74d5add89fd8eb0b45f79':
update
聚合报表工具栏
聚合报表工具栏
|
8 years ago |
xiaohu
|
652fc735e7
|
update
|
8 years ago |
superman
|
722a9d638c
|
Merge pull request #189 in BA/design from ~NEIL/design:dev to dev
* commit '69ab5a54ce5c1309d31232d13c6d6a11ddb36594':
npe
|
8 years ago |
xiaohu
|
7fbcfc0179
|
聚合报表工具栏
|
8 years ago |
xiaohu
|
ca0548c210
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
xiaohu
|
6f0d0880d2
|
聚合报表工具栏
|
8 years ago |
superman
|
abe0637ab5
|
Merge pull request #190 in BA/design from ~XIAOHU/design:dev to dev
* commit '55b931814d9e3747607a9703dcff2abcf30ff77b':
聚合报表图标
|
8 years ago |
xiaohu
|
55b931814d
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
xiaohu
|
5919a82e42
|
聚合报表图标
|
8 years ago |
neil
|
69ab5a54ce
|
npe
|
8 years ago |
superman
|
eb81cd5d32
|
Merge pull request #187 in BA/design from ~XIAOHU/design:dev to dev
* commit '3fe065eff3657842a1703b995c0b597d30786935':
预览展示
|
8 years ago |
xiaohu
|
3fe065eff3
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
xiaohu
|
c3f6a780d6
|
预览展示
|
8 years ago |
superman
|
dc6adc9ab7
|
Merge pull request #186 in BA/design from ~ZHOUPING/design:dev to dev
* commit 'faab7246067d67e937aa7cce9151cf811f665f34':
表单交互统一,漏传了一个文件
|
8 years ago |
zhouping
|
faab724606
|
表单交互统一,漏传了一个文件
|
8 years ago |
superman
|
2c844afe45
|
Merge pull request #185 in BA/design from ~ZHOUPING/design:dev to dev
* commit '858ee92d4c8904edd5961cb3d83462baa9ea2d47':
表单交互统一 1.图表控件加上编辑层 2.tab组件加上编辑层
|
8 years ago |
zhouping
|
858ee92d4c
|
表单交互统一
1.图表控件加上编辑层
2.tab组件加上编辑层
|
8 years ago |