superman
|
abf05001a6
|
Merge pull request #217 in BA/design from ~RICHIE/design:master to master
* commit 'eff1fe04a853f2a5de9af876f52345d7dd996cb9':
执行
|
8 years ago |
superman
|
b1fd2d6cc6
|
Merge pull request #218 in BA/design from ~RICHIE/design:dev to dev
* commit '66d133546cc02b000b5bafb1744ce8c918e294a2':
执行
|
8 years ago |
richie
|
66d133546c
|
执行
|
8 years ago |
richie
|
eff1fe04a8
|
执行
|
8 years ago |
superman
|
2e2304584c
|
Merge pull request #216 in BA/design from ~ZHOUPING/design:dev to dev
* commit '59561f9950d8276aeb0d761129385e1353b92aa6':
表单交互统一测试bug修改 1.从toolbarbtn上拖下tab布局后当前的选中对象并非顶层布局 2.tab布局顶层布局的名字修改为tablayout 3.支持tab布局的嵌套后正确显示编辑层
|
8 years ago |
zhouping
|
59561f9950
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zhouping/design into dev
|
8 years ago |
zhouping
|
3f4465ff1d
|
表单交互统一测试bug修改
1.从toolbarbtn上拖下tab布局后当前的选中对象并非顶层布局
2.tab布局顶层布局的名字修改为tablayout
3.支持tab布局的嵌套后正确显示编辑层
|
8 years ago |
superman
|
9164fdc9b4
|
Merge pull request #215 in BA/design from ~NEIL/design:dev to dev
* commit '0555774776602906ca7a2034ade35173abd8c50f':
有自定义按钮后, web属性工具栏设置保存不上.
|
8 years ago |
neil
|
0555774776
|
有自定义按钮后, web属性工具栏设置保存不上.
|
8 years ago |
richie
|
bf58b020aa
|
Merge pull request #213 in BA/design from ~RICHIE/design:master to master
* commit 'ee5c5ee1a2a965de26f5bbd0e7ebffcdf274475c':
sonar配置
|
8 years ago |
richie
|
ff555c0a97
|
Merge pull request #214 in BA/design from ~RICHIE/design:dev to dev
* commit '56b0f337f5814c672ba564847b13f0bb5476611e':
sonar配置
|
8 years ago |
richie
|
ee5c5ee1a2
|
sonar配置
|
8 years ago |
richie
|
56b0f337f5
|
sonar配置
|
8 years ago |
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
|
72a7fd44c0
|
Merge pull request #211 in BA/design from ~SHINE/design:dev to dev
* commit '10288639cdb08277eab0421fbb313601ead7d160':
bug
|
8 years ago |
fr_shine
|
10288639cd
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~shine/design into dev
|
8 years ago |
fr_shine
|
7163190d0b
|
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
|
aaae50c258
|
Merge pull request #207 in BA/design from ~XIAOHU/design:dev to dev
* commit 'e405d66a766565330811388f1eb3645bd101e59d':
圖標
|
8 years ago |
xiaohu
|
e405d66a76
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
xiaohu
|
eb4f5cfd22
|
圖標
|
8 years ago |
superman
|
3c4f8c88ad
|
Merge pull request #206 in BA/design from ~KERRY/design:dev to dev
* commit 'cf9bc90531395a6b0fc896ec64ad99e0808a51b1':
modified: ../columnrow/ColumnRowPane.java
modified: ../columnrow/ColumnRowPane.java
new file: FillBugSpinner.java
|
8 years ago |
kerry
|
cf9bc90531
|
modified: ../columnrow/ColumnRowPane.java
|
8 years ago |
kerry
|
bd157e87ca
|
modified: ../columnrow/ColumnRowPane.java
|
8 years ago |
kerry
|
00a8d1f477
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~kerry/design into dev
|
8 years ago |
kerry
|
2c7bd711c7
|
new file: FillBugSpinner.java
|
8 years ago |
superman
|
27af0bb490
|
Merge pull request #203 in BA/design from ~XIAOHU/design:release to release
* commit '69483fcc2fa04533f22bf12667c6c63e2ee64a67':
update
|
8 years ago |
superman
|
f0ce1fb08a
|
Merge pull request #204 in BA/design from ~XIAOHU/design:dev to dev
* commit '6b64af1c3bbd8ab7e69bf9196a1a9a3f4ba92db5':
update
超链顺序
|
8 years ago |
xiaohu
|
69483fcc2f
|
update
|
8 years ago |
xiaohu
|
6b64af1c3b
|
update
|
8 years ago |
xiaohu
|
2d1e52a9de
|
超链顺序
|
8 years ago |
superman
|
d1295f9c6b
|
Merge pull request #200 in BA/design from ~ZHOUPING/design:dev to dev
* commit 'dff8443a0c8ca8f6df4e98999a768945fd487a5e':
之前因为周三合master回退的,发布后再重新上传一下
|
8 years ago |
zhouping
|
dff8443a0c
|
之前因为周三合master回退的,发布后再重新上传一下
|
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 |