yaoh.wu
|
d3f9566a31
|
找回处理冲突过程中丢失的代码
|
7 years ago |
yaoh.wu
|
6c9bdc2be0
|
处理冲突
|
7 years ago |
superman
|
a257352c90
|
Merge pull request #1043 in BA/design from ~MOMEAK/design9.0:9.0 to 9.0
* commit 'db9ca2ee21f62fadab9aed9c861e848a9d8847b0':
REPORT-2897 9.0设计器修改 修改命名
REPORT-2897 9.0设计器修改 视觉优化
rm button group border
hzzzz
REPORT-2897 9.0设计器修改 视觉优化
hzzzzzzzzzz
REPORT-2897 9.0设计器修改 视觉优化
|
7 years ago |
yaoh.wu
|
9341ae0461
|
REPORT-3348 公式组件边界对其
|
7 years ago |
yaoh.wu
|
deaed5b5ec
|
REPORT-3348 card layout隐藏时不再显示空白面板
|
7 years ago |
hzzz
|
d643211335
|
icon err
|
7 years ago |
superman
|
e82cc1ce35
|
Merge pull request #1045 in BA/design from ~KERRY/design:9.0 to 9.0
* commit '7ad698b5713be6980c7cd242bce12b0f0fa0043f':
REPORT-3293 9.0设计器控件设置重画 删除重复类
|
7 years ago |
kerry
|
7ad698b571
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into 9.0
|
7 years ago |
kerry
|
3d12621f62
|
REPORT-3293 9.0设计器控件设置重画 删除重复类
|
7 years ago |
MoMeak
|
db9ca2ee21
|
REPORT-2897 9.0设计器修改
修改命名
|
7 years ago |
hzzz
|
94d82828ae
|
update icon
|
7 years ago |
yaoh.wu
|
aaa3608235
|
回退一些可能冲突的格式化修改
|
7 years ago |
yaoh.wu
|
c08fa9a58b
|
国际化冲突
|
7 years ago |
yaoh.wu
|
51f89068c4
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit '72c8a02c11a486138be98e0a9fcfc956bc6d5305': (36 commits)
merge
代码修改
REPORT-3293 9.0设计器控件设置重画
REPORT-3163 合作开发9.0设计器=>聚合报表=》代码规范
REPORT-3163 合作开发9.0设计器=>聚合报表=》点击报表块内的单元格时,替换控件设置tab页
REPORT-3163 合作开发9.0设计器=>聚合报表=》去掉无用import
REPORT-3163 合作开发9.0设计器=>聚合报表=》国际化;边距调整
REPORT-3163 合作开发9.0设计器=>聚合报表=》控件名称面板
REPORT-3163 合作开发9.0设计器=>聚合报表=》坐标尺寸
tree background
代码上传
解决冲突
解决冲突
REPORT-3293 9.0设计器控件设置重画
REPORT-2897 9.0设计器修改 去掉空格,放个空的uilabel做对齐
fix
REPORT-2897 9.0设计器修改 视觉微调
REPORT-2897 9.0设计器修改 去掉空格,放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 去掉空格,放个空的uilabel做对齐
REPORT-3410
...
|
7 years ago |
MoMeak
|
880077452f
|
'conflict'
|
7 years ago |
MoMeak
|
94b990083a
|
REPORT-2897 9.0设计器修改
视觉优化
|
7 years ago |
yaoh.wu
|
51dceb315f
|
REPORT-3348 国际化,table layout对齐
|
7 years ago |
MoMeak
|
77d5a69f3b
|
Merge remote-tracking branch 'origin/hzzz' into 9.0
|
7 years ago |
hzzz
|
b0dd758675
|
rm button group border
|
7 years ago |
juhaoyu
|
357ba1a65d
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
MoMeak
|
10ba03b831
|
Merge remote-tracking branch 'origin/hzzz' into 9.0
|
7 years ago |
hzzz
|
576032b7a5
|
hzzzz
|
7 years ago |
superman
|
72c8a02c11
|
Merge pull request #1039 in BA/design from ~HZZZ/design:design to 9.0
* commit '3348beae9a980733cf0e5557693736aed5f10367':
merge
tree background
fix
REPORT-3410
|
7 years ago |
superman
|
b17dacf401
|
Merge pull request #1040 in BA/design from ~KERRY/design:9.0 to 9.0
* commit 'd61fb93edddf4a086acb365017fef1c9a5b27d6b':
代码修改
REPORT-3293 9.0设计器控件设置重画
代码上传
解决冲突
解决冲突
REPORT-3293 9.0设计器控件设置重画
|
7 years ago |
hzzz
|
3348beae9a
|
merge
|
7 years ago |
MoMeak
|
afb94a8468
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
MoMeak
|
161a93c244
|
REPORT-2897 9.0设计器修改
视觉优化
|
7 years ago |
hzzz
|
d876761141
|
merge
|
7 years ago |
kerry
|
d61fb93edd
|
代码修改
|
7 years ago |
kerry
|
c7644c0dc4
|
REPORT-3293 9.0设计器控件设置重画
|
7 years ago |
hzzz
|
2150be4841
|
hzzzzzzzzzz
|
7 years ago |
superman
|
237a0b4fe2
|
Merge pull request #1042 in BA/design from ~PLOUGH/design:9.0 to 9.0
* commit '55a8361b01b41febfbcee8d7b8b1c0b7dded9a21':
REPORT-3163 合作开发9.0设计器=>聚合报表=》代码规范
REPORT-3163 合作开发9.0设计器=>聚合报表=》点击报表块内的单元格时,替换控件设置tab页
REPORT-3163 合作开发9.0设计器=>聚合报表=》去掉无用import
REPORT-3163 合作开发9.0设计器=>聚合报表=》国际化;边距调整
REPORT-3163 合作开发9.0设计器=>聚合报表=》控件名称面板
REPORT-3163 合作开发9.0设计器=>聚合报表=》坐标尺寸
|
7 years ago |
plough
|
55a8361b01
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》代码规范
|
7 years ago |
yaoh.wu
|
35ce0a2ad0
|
REPORT-3348 富文本,图片,斜线,子报表面板修改;公式,文本编辑器拆分
|
7 years ago |
yaoh.wu
|
2e96d8303c
|
REPORT-3348 可扩展性触发保存
|
7 years ago |
yaoh.wu
|
fb6f0d20c4
|
REPORT-3348 自定义值公式输入框触发保存
|
7 years ago |
yaoh.wu
|
8ccc9e0696
|
REPORT-3348 结果集筛选 公式输入框触发保存
|
7 years ago |
yaoh.wu
|
7289f93467
|
REPORT-3348
动态参数注入触发保存,高级设置排列顺序触发保存,结果集筛选触发保存
|
7 years ago |
plough
|
bdd70c5bfd
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》点击报表块内的单元格时,替换控件设置tab页
|
7 years ago |
plough
|
c6acdb681d
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》去掉无用import
|
7 years ago |
plough
|
cca91e4f59
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》国际化;边距调整
|
7 years ago |
plough
|
c987fc5cd2
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》控件名称面板
|
7 years ago |
plough
|
69a6fea2fe
|
REPORT-3163 合作开发9.0设计器=>聚合报表=》坐标尺寸
|
7 years ago |
MoMeak
|
28a41ef8af
|
REPORT-2897 9.0设计器修改
视觉优化
|
7 years ago |
hzzz
|
6d57f673f7
|
tree background
|
7 years ago |
kerry
|
df65a17ef8
|
代码上传
|
7 years ago |
kerry
|
48fa3b74ba
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit 'd48d3ec615d148c0e15f48bf50c9a09fc8ffddf1':
REPORT-2897 9.0设计器修改 去掉空格,放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 视觉微调
REPORT-2897 9.0设计器修改 去掉空格,放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 去掉空格,放个空的uilabel做对齐
REPORT-2897 9.0设计器修改 视觉优化
|
7 years ago |
kerry
|
fdd52d598d
|
解决冲突
|
7 years ago |
juhaoyu
|
4f91354d78
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
kerry
|
2bbe2d14fa
|
解决冲突
|
7 years ago |