paul
|
30f17ef98a
|
Merge branch 'release'
# Conflicts:
# designer_base/src/com/fr/design/locale/designer_en_US.properties
# designer_base/src/com/fr/design/locale/designer_ja_JP.properties
# designer_base/src/com/fr/design/locale/designer_ko_KR.properties
# designer_base/src/com/fr/design/locale/designer_zh_CN.properties
# designer_base/src/com/fr/design/locale/designer_zh_TW.properties
|
8 years ago |
superman
|
27865540b0
|
Merge pull request #702 in BA/design from ~ZHOUPING/design:release to release
* commit '4f599cdfa6c618e88f51b18a73b6e8bcf0941a78':
REPORT-1940 表单从绝对布局切换到自适应,预览空白 pmd
REPORT-1940 表单从绝对布局切换到自适应,预览空白
|
8 years ago |
zhouping
|
4f599cdfa6
|
REPORT-1940 表单从绝对布局切换到自适应,预览空白
pmd
|
8 years ago |
zhouping
|
05b6fd9f85
|
REPORT-1940 表单从绝对布局切换到自适应,预览空白
|
8 years ago |
superman
|
15ec099c08
|
Merge pull request #700 in BA/design from ~YAOH.WU/design:dev to dev
* commit '40104a6c169564330f2c505aa4200d38287f30a0':
REPORT-637
|
8 years ago |
yaoh.wu
|
40104a6c16
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design into dev
merge
|
8 years ago |
superman
|
11d623d0bb
|
Merge pull request #699 in BA/design from ~PLOUGH/design:dev to dev
* commit '6e778ee7ac7e9c3bb4f9f0cbe2dbdbad16902b60':
REPORT-1266 插件更新升级提示, 改成"插件版本过低, 存在API不兼容, 请联系开发者升级插件"
|
8 years ago |
yaoh.wu
|
b3a402d3e4
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design into dev
|
8 years ago |
yaoh.wu
|
ccb995b9a9
|
REPORT-637
|
8 years ago |
plough
|
6e778ee7ac
|
merge
|
8 years ago |
plough
|
30aaf866f7
|
REPORT-1266 插件更新升级提示, 改成"插件版本过低, 存在API不兼容, 请联系开发者升级插件"
|
8 years ago |
superman
|
da10e06b0b
|
Merge pull request #697 in BA/design from ~JU/1-ba-design:dev to dev
* commit 'fbbc2ccd91470d035f1e30f8cba3938a11c33b19':
提示升级
|
8 years ago |
superman
|
1796e36144
|
Merge pull request #698 in BA/design from ~JU/design1111:release to release
* commit 'c6a96cc457ee95cf1cb21519677571047c425589':
提示用户升级插件
|
8 years ago |
juhaoyu
|
c6a96cc457
|
提示用户升级插件
|
8 years ago |
juhaoyu
|
fbbc2ccd91
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
juhaoyu
|
c34133b1c7
|
提示升级
|
8 years ago |
superman
|
8bf3202a80
|
Merge pull request #695 in BA/design from ~PLOUGH/design:release to release
* commit '28317954b67b74739ef2dea1375071a0f5b6651c':
无JIRA任务。新增国际化key
|
8 years ago |
superman
|
f66d05cdda
|
Merge pull request #694 in BA/design from ~YAOH.WU/design:dev to dev
* commit 'e0d3641ec564ece430e20eecf4b5f2e82f2e946a':
无jira任务,添加之前漏加的国际化key
|
8 years ago |
plough
|
28317954b6
|
无JIRA任务。新增国际化key
|
8 years ago |
yaoh.wu
|
e0d3641ec5
|
无jira任务 添加之前漏加的国际化key
|
8 years ago |
superman
|
9f50dc440b
|
Merge pull request #689 in BA/design from ~PLOUGH/design:dev to dev
* commit 'e779d331b78b56bae7e8f859063865564b530df6':
无JIRA任务,新增key
无JIRA任务,新增key
调整 SiteCenter 取值方式
处理 PMD 问题
REPORT-1178 英文国际化——23/23
REPORT-1178 英文国际化——22/23,新增key
REPORT-1178 英文国际化——21/23,新增key
REPORT-1178 英文国际化——20/23
REPORT-1178 英文国际化——19/23
REPORT-1178 英文国际化——17/23,新增key
REPORT-1178 英文国际化——16/23
|
8 years ago |
yaoh.wu
|
8466a90f38
|
无jira任务,添加之前漏加的国际化key
|
8 years ago |
plough
|
e779d331b7
|
无JIRA任务,新增key
|
8 years ago |
plough
|
22e0c9219d
|
merge
|
8 years ago |
plough
|
8da78dc629
|
无JIRA任务,新增key
|
8 years ago |
superman
|
3e1b08990a
|
Merge pull request #693 in BA/design from ~YAOH.WU/design:dev to dev
* commit 'd38c4fdc1da30b1867bb4d4e472b332e1153bb5c':
无jira任务 调整代码
无jira任务 调整代码
无jira任务 调整代码
无jira任务 调整代码
REPORT-1227
REPORT-934
|
8 years ago |
plough
|
27bbc3df55
|
解决冲突
|
8 years ago |
plough
|
23b833b9d5
|
调整 SiteCenter 取值方式
|
8 years ago |
yaoh.wu
|
d38c4fdc1d
|
无jira任务 调整代码
|
8 years ago |
yaoh.wu
|
b61dc6bad0
|
无jira任务 调整代码
|
8 years ago |
superman
|
6f84d5c214
|
Merge pull request #690 in BA/design from ~PLOUGH/design:release to release
* commit 'ef938eb4f355e9f70d4a71e622be07b95995aef4':
修改配置文件
无JIRA任务。国际化
无JIRA任务。国际化key
|
8 years ago |
yaoh.wu
|
1c60170b14
|
resolve conflicts
|
8 years ago |
superman
|
02179b3aa3
|
Merge pull request #687 in BA/design from ~ZHOUPING/design:dev to dev
* commit '5dcbc23681651c49f56e22284c097f82b61c29d8':
REPORT-1814 表单tab块的改良bug pmd
REPORT-1814 表单tab块的改良bug tab交互改良,页签可以移动
|
8 years ago |
superman
|
e6d4f22bd8
|
Merge pull request #691 in BA/design from ~ZHENG/design:release to release
* commit 'e91765d4046665442b2006eab3e8513d0dc1d8ec':
股价图属性配置问题
|
8 years ago |
plough
|
ef938eb4f3
|
修改配置文件
|
8 years ago |
fr_shine
|
e91765d404
|
股价图属性配置问题
|
8 years ago |
plough
|
c1f8641e89
|
合并冲突
|
8 years ago |
plough
|
30ac27a511
|
无JIRA任务。国际化
|
8 years ago |
plough
|
0d4e8bb5d1
|
处理 PMD 问题
|
8 years ago |
plough
|
b83ef1f714
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
8 years ago |
plough
|
f2a4d48749
|
REPORT-1178 英文国际化——23/23
|
8 years ago |
yaohwu
|
0128e4ea40
|
无jira任务 调整代码
|
8 years ago |
zhouping
|
5dcbc23681
|
REPORT-1814 表单tab块的改良bug
pmd
|
8 years ago |
zhouping
|
b0d98eaf8c
|
REPORT-1814 表单tab块的改良bug
tab交互改良,页签可以移动
|
8 years ago |
yaohwu
|
5eef84ba74
|
无jira任务 调整代码
|
8 years ago |
yaohwu
|
d3cda65cde
|
REPORT-1227
|
8 years ago |
plough
|
d74bbdd501
|
REPORT-1178 英文国际化——22/23,新增key
|
8 years ago |
plough
|
05292f2e1a
|
REPORT-1178 英文国际化——21/23,新增key
|
8 years ago |
plough
|
2f82bc4768
|
REPORT-1178 英文国际化——20/23
|
8 years ago |
plough
|
a0e072b585
|
REPORT-1178 英文国际化——19/23
|
8 years ago |