neil
|
cffe90f825
|
冲突
|
8 years ago |
superman
|
77a4202019
|
Merge pull request #229 in BA/design from ~ZHOUPING/design:dev to dev
* commit 'b930df76890e627ca4271dea752888d09f7e8361':
修改下instanceof，改成acceptType好一些
国际化
表单绝对布局的基本功能1
|
8 years ago |
zhouping
|
b930df7689
|
修改下instanceof，改成acceptType好一些
|
8 years ago |
|
zhouping
|
0374fd648c
|
国际化
|
8 years ago |
|
zhouping
|
9d7085cd0f
|
表单绝对布局的基本功能1
|
8 years ago |
|
superman
|
3b2e26c749
|
Merge pull request #228 in BA/design from ~EASON/design:master to master
* commit 'a65ce61dd5e4e90829b0fdb283d42466ace21ba6':
方法名
|
8 years ago |
eason-skx
|
a65ce61dd5
|
方法名
|
8 years ago |
|
superman
|
132c76e713
|
Merge pull request #227 in BA/design from ~EASON/design:master to master
* commit 'f85be59351daeb78e9781df5bdba2e70214c5b7e':
空import
exe启动插件被禁用
|
8 years ago |
|
eason-skx
|
f85be59351
|
空import
|
8 years ago |
|
superman
|
e3b3a0ffee
|
Merge pull request #225 in BA/design from ~SHINE/design:master to master
* commit 'd57ab06309f99175a6cdd0589b7d1980e3b953ce':
整理
read plugin
|
8 years ago |
|
eason-skx
|
ede1d0e790
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~eason/design
|
8 years ago |
|
eason-skx
|
272fa2236e
|
exe启动插件被禁用
|
8 years ago |
fr_shine
|
d57ab06309
|
整理
|
8 years ago |
|
superman
|
478cd0ff07
|
Merge pull request #226 in BA/design from ~NEIL/design:master to master
* commit 'ecfdfacebe598468cf68f6fe038c78954e984272':
设计器无法保存文字竖排
|
8 years ago |
|
neil
|
ecfdfacebe
|
设计器无法保存文字竖排
|
8 years ago |
|
fr_shine
|
3b59e40059
|
read plugin
|
8 years ago |
|
superman
|
308b8778e8
|
Merge pull request #224 in BA/design from ~ZPC/basic_design:dev to dev
* commit '181473e663020e1bb4ac35a507a0665cfac749d4':
代码规范
修改一些规范问题
他装了插件后, 可以设置显示或者不显示
装了插件后, 可以设置显示或者不显示
装了插件后, 可以设置显示或者不显示
去掉qq帮助，并在关于软件中显示qq号码，冻结时给提示
|
8 years ago |
zpc
|
181473e663
|
代码规范
代码规范
|
8 years ago |
|
zpc
|
e3be3575ee
|
修改一些规范问题
修改一些规范问题
|
8 years ago |
|
zpc
|
373b724b76
|
他装了插件后, 可以设置显示或者不显示
他装了插件后, 可以设置显示或者不显示
|
8 years ago |
|
zpc
|
fd400ec7b6
|
装了插件后, 可以设置显示或者不显示
装了插件后, 可以设置显示或者不显示
|
8 years ago |
|
zpc
|
7b6df7ae61
|
装了插件后, 可以设置显示或者不显示
装了插件后, 可以设置显示或者不显示
|
8 years ago |
|
zpc
|
0ecf91b36f
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zpc/basic_design into dev
|
8 years ago |
|
zpc
|
a97ae8cc0e
|
去掉qq帮助，并在关于软件中显示qq号码，冻结时给提示
去掉qq帮助，并在关于软件中显示qq号码，冻结时给提示
|
8 years ago |
|
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 |
