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 |
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
|
0e09b19078
|
Merge pull request #260 in BA/design from ~ZHOUPING/design:release to release
* commit '455166016db1f124decda92ba3570648bbf6a485':
参数面板重写父类中的一些方法（都是绝对布局中原来修改前的方法）
|
8 years ago |
zhouping
|
455166016d
|
参数面板重写父类中的一些方法（都是绝对布局中原来修改前的方法）
|
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 |
fangdong sun
|
c1a1b8b5dc
|
多分支测试--00
|
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
|
202e54cb0b
|
更改依赖路径
|
8 years ago |
|
fangdong sun
|
59b5e8d6fa
|
更改部分依赖路径
|
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 |
|
fangdong sun
|
948f7a349a
|
多分支构建测试--05
|
8 years ago |
|
fangdong sun
|
8dc887960d
|
多分支构建测试--04
|
8 years ago |
|
Fangjie Hu
|
92ea24eab3
|
改变结构
|
8 years ago |
|
fangdong sun
|
916b706e88
|
多分支构建测试 --03
|
8 years ago |
|
fangdong sun
|
d07401997f
|
多功能构建测试--04
|
8 years ago |
|
fangdong sun
|
a518e63848
|
多分支构建测试--04
|
8 years ago |
|
fangdong sun
|
e9e960a2b1
|
多分支构建测试--05
|
8 years ago |
|
fangdong sun
|
715485799e
|
多分支构建测试--04
|
8 years ago |
|
fangdong sun
|
da624db69e
|
多分支构建测试--03
|
8 years ago |
|
fangdong sun
|
578ee8eb39
|
多分支构建测试--03
|
8 years ago |
|
fangdong sun
|
02d62d990a
|
多分支构建测试--03
|
8 years ago |
|
fangdong sun
|
e865f12868
|
多分支构建测试--02
|
8 years ago |
|
fangdong sun
|
a2eccf5c2c
|
多分支构建测试--02
|
8 years ago |
|
fangdong sun
|
0b5d39e265
|
多分支构建测试--02
|
8 years ago |
|
fangdong sun
|
39895bb1e6
|
多分支构建测试--01
|
8 years ago |
|
fangdong sun
|
3dc93670c3
|
多分支构建测试--01
|
8 years ago |
|
fangdong sun
|
1580d643a4
|
多分支构建测试--01
|
8 years ago |
|
fangdong sun
|
6b48ce010d
|
build.gradle多分支构建测试 --01
|
8 years ago |
|
fangdong sun
|
a056261075
|
build.gradle多分支构建测试--01
|
8 years ago |
|
fangdong sun
|
fc8c4d7c79
|
build.gradle多分支构建测试--01
|
8 years ago |
|
fangdong sun
|
7e6ee95b53
|
build.gradle更改为多分支构建
|
8 years ago |
|
fangdong sun
|
98f8533262
|
build.gradle更改为多分支构建
|
8 years ago |
|
fangdong sun
|
1bcd90f3fe
|
build.gradle更改为多分支构建
|
8 years ago |
|
Fangjie Hu
|
242c290cd2
|
update
|
8 years ago |
|
Fangjie Hu
|
77f45d7acc
|
update
|
8 years ago |
|
Fangjie Hu
|
5f1a9b9b5c
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
|
Fangjie Hu
|
f1136842ad
|
update
|
8 years ago |
