richie
|
84714b30c1
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
|
richie
|
bec91c7346
|
依赖lib
|
8 years ago |
fangdong sun
|
978320be15
|
更改依赖
|
8 years ago |
|
fangdong sun
|
4ac3681fce
|
更改
|
8 years ago |
superman
|
fa6cc29f2d
|
Merge pull request #270 in BA/design from ~XIAOHU/design:dev to dev
* commit '7ad2fdebb0da378fa297fbaad3d24662b349b58d':
增加接口
|
8 years ago |
Fangjie Hu
|
7ad2fdebb0
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
|
Fangjie Hu
|
02f5d4c34d
|
增加接口
|
8 years ago |
|
superman
|
b31b1e2424
|
Merge pull request #266 in BA/design from ~ZHOUPING/design:dev to dev
* commit '586304609b98436fc34ed0f1f456d4ddd08c061f':
日文设计器默认用MS Mincho字体渲染（之前没有改到设计器本身的字体，补上）
|
8 years ago |
|
superman
|
d076840c7b
|
Merge pull request #268 in BA/design from ~DANIEL/finereport_design:dev to dev
* commit '90fecd965a4394d6da5fd34843e3cc899cd2c6db':
change
|
8 years ago |
|
richie
|
27470ab51b
|
Merge pull request #269 in BA/design from ~DANIEL/finereport_design:master to master
* commit '919b4310754e553b83762ea3bfe5ae28b3d42613':
l
|
8 years ago |
daniel
|
919b431075
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~daniel/finereport_design
|
8 years ago |
|
daniel
|
a62467bdf9
|
l
|
8 years ago |
|
daniel
|
90fecd965a
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev
|
8 years ago |
|
daniel
|
bf9adebb19
|
change
|
8 years ago |
zhouping
|
586304609b
|
日文设计器默认用MS Mincho字体渲染（之前没有改到设计器本身的字体，补上）
|
8 years ago |
neil
|
5aba085a0e
|
Merge pull request #265 in BA/design from ~NEIL/design:release to master
* commit 'a37a903212f2816d2d8da341adfab62d81106373': (57 commits)
冲突
参数面板重写父类中的一些方法（都是绝对布局中原来修改前的方法）
控件校验高级框高度调整
多分支测试--00
更改部分依赖路径
封代码，绝对布局的等距线屏蔽掉参数面板
封代码，绝对布局从工具栏位置屏蔽掉
bug88297:使用升级更新插件的时候，有的jar包概率性删除失败
update
多分支构建测试--05
多分支构建测试--04
改变结构
多分支构建测试 --03
多功能构建测试--04
多分支构建测试--05
多分支构建测试--04
多分支构建测试--03
多分支构建测试--03
多分支构建测试--02
多分支构建测试--02
...
|
8 years ago |
|
neil
|
a37a903212
|
冲突
|
8 years ago |
|
neil
|
b67f09ae9f
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~neil/design
|
8 years ago |
|
superman
|
1e44466413
|
Merge pull request #262 in BA/design from ~ZPC/basic_design:dev to dev
* commit '12144ba8e124c1fe24ac92e650042d6924330fbd':
条件属性
|
8 years ago |
zpc
|
12144ba8e1
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zpc/basic_design into dev
|
8 years ago |
|
zpc
|
602e6d49a5
|
条件属性
条件属性切换形态问题
|
8 years ago |
|
superman
|
8723d4d36b
|
Merge pull request #261 in BA/design from ~ZHOUPING/design:dev to dev
* commit '09bf14f648065df9f7d6a05a47428227fad20e49':
release的修改同步到dev
|
8 years ago |
|
superman
|
0e09b19078
|
Merge pull request #260 in BA/design from ~ZHOUPING/design:release to release
* commit '455166016db1f124decda92ba3570648bbf6a485':
参数面板重写父类中的一些方法（都是绝对布局中原来修改前的方法）
|
8 years ago |
|
zhouping
|
09bf14f648
|
release的修改同步到dev
|
8 years ago |
|
zhouping
|
455166016d
|
参数面板重写父类中的一些方法（都是绝对布局中原来修改前的方法）
|
8 years ago |
|
superman
|
60e0d97cdf
|
Merge pull request #259 in BA/design from ~ZPC/basic_design:dev to dev
* commit '6f92950c99c8e3b73462a71546b6d86f7467cc3e':
设计器bug, 条件属性那边选普通形态, 无法保存公式, 日期等格式.
|
8 years ago |
|
zpc
|
6f92950c99
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zpc/basic_design into dev
|
8 years ago |
|
zpc
|
f3fa01d795
|
设计器bug, 条件属性那边选普通形态, 无法保存公式, 日期等格式.
设计器bug, 条件属性那边选普通形态, 无法保存公式, 日期等格式.
|
8 years ago |
|
superman
|
5635453816
|
Merge pull request #258 in BA/design from ~KERRY/design:release to release
* commit '2703f372f10a9fed2623e2d1bc0311641f2a8723':
控件校验高级框高度调整
|
8 years ago |
kerry
|
2703f372f1
|
控件校验高级框高度调整
|
8 years ago |
|
superman
|
57f05f4469
|
Merge pull request #257 in BA/design from ~XIAOHU/design:dev to dev
* commit 'd4c9d71562ab60012e70bce49f0d00b54d91d497':
新图标矩形图条件属性可设置圆角
|
8 years ago |
|
Fangjie Hu
|
d4c9d71562
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
|
Fangjie Hu
|
d78eb67dd9
|
新图标矩形图条件属性可设置圆角
|
8 years ago |
|
fangdong sun
|
c1a1b8b5dc
|
多分支测试--00
|
8 years ago |
|
superman
|
3d486c66b7
|
Merge pull request #256 in BA/design from ~KERRY/design:dev to dev
* commit '67ce32c438b157dd8c493917d7ea17ddf4b38e36':
按钮控件高级框样式调整
|
8 years ago |
|
fangdong sun
|
b438082c50
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/ba/design into release
|
8 years ago |
|
fangdong sun
|
3a4492b757
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev
|
8 years ago |
|
fangdong sun
|
202e54cb0b
|
更改依赖路径
|
8 years ago |
|
fangdong sun
|
801040bf58
|
更改部分依赖路径
|
8 years ago |
|
fangdong sun
|
59b5e8d6fa
|
更改部分依赖路径
|
8 years ago |
|
kerry
|
67ce32c438
|
按钮控件高级框样式调整
|
8 years ago |
|
neil
|
3630f592ac
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~neil/design
|
8 years ago |
|
superman
|
adaabb5817
|
Merge pull request #255 in BA/design from ~ZHOUPING/design:dev to dev
* commit 'c2187ec556df112cd55eb79bf4ef5ab2f68fb152':
封代码，绝对布局的等距线屏蔽掉参数面板
|
8 years ago |
|
zhouping
|
c2187ec556
|
封代码，绝对布局的等距线屏蔽掉参数面板
|
8 years ago |
|
superman
|
fd6408020e
|
Merge pull request #254 in BA/design from ~ZHOUPING/design:dev to dev
* commit 'bf93c680efda465079e7ef56dd994842fde90904':
封代码，绝对布局从工具栏位置屏蔽掉
|
8 years ago |
|
zhouping
|
bf93c680ef
|
封代码，绝对布局从工具栏位置屏蔽掉
|
8 years ago |
|
superman
|
7c0d5ea12e
|
Merge pull request #253 in BA/design from ~ZHOUPING/design:dev to dev
* commit '518254d0065249829b0dace101933751b8515978':
bug88297:使用升级更新插件的时候，有的jar包概率性删除失败
|
8 years ago |
|
zhouping
|
518254d006
|
bug88297:使用升级更新插件的时候，有的jar包概率性删除失败
|
8 years ago |
|
superman
|
8d3255ec7e
|
Merge pull request #252 in BA/design from ~XIAOHU/design:dev to dev
* commit '488c074690d6f6c517dd49dd66501135b557e84a':
update
改变结构
update
update
update
|
8 years ago |
|
Fangjie Hu
|
488c074690
|
update
|
8 years ago |
