hzzz
|
55e792cedb
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into release/10.0
|
6 years ago |
hzzz
|
f65a025b55
|
REPORT-10489【客户升级10.0】工作目录切换位远程后,第一次预览数据集进度框一直显示
|
6 years ago |
richie
|
8a1396bb53
|
Merge pull request #379 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '66ee1e7028eab11c2c6dd34f9f31ef85ab29549c':
提交错了一个类,删掉
无JIRA任务 修改pom版本号规则
|
6 years ago |
kerry
|
dca7961ccb
|
Merge pull request #378 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'f198e57634b24c52f4701028c4dd78d131718dff':
DEC-3945 插件管理页面脚本的国际化独立到scripts里面去
|
6 years ago |
richie
|
66ee1e7028
|
提交错了一个类,删掉
|
6 years ago |
richie
|
db4ced49cb
|
无JIRA任务 修改pom版本号规则
|
6 years ago |
kerry
|
f198e57634
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
6 years ago |
kerry
|
57aa1021eb
|
DEC-3945 插件管理页面脚本的国际化独立到scripts里面去
|
6 years ago |
Harrison
|
d077e23761
|
Merge pull request #377 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'e340cfa40abe825e62ba833c9a70957ed917675b':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Harrison
|
e340cfa40a
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
plough
|
cf7fda058e
|
Merge pull request #376 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit '96daa20cc6b6d3995cff6d80660e981bbc4e888b':
无JIRA任务,调整代码
|
6 years ago |
Wim.Zhai
|
e4c88f4b48
|
Merge pull request #373 in DESIGN/design from ~WIM.ZHAI/design:release/10.0 to release/10.0
* commit '514f78cc2fa9380588d5781c93733a5090723de9':
d0814
fine0814
|
6 years ago |
Harrison
|
3c2bb8176c
|
Merge pull request #375 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'f3c6eed55d8f52b5dd92b8d7bcc2ff263435fa9d':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
plough
|
96daa20cc6
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into release/10.0
|
6 years ago |
plough
|
9b007c9664
|
无JIRA任务,调整代码
|
6 years ago |
neil
|
db3527ffba
|
Merge pull request #374 in DESIGN/design from ~NEIL/design-10:release/10.0 to release/10.0
* commit '6a1eb30af055e14e6299962dffcac408797260d2':
DEC-3905 数据集获取异常拦截一下, 阻止抛到最外层.
|
6 years ago |
Harrison
|
f3c6eed55d
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
neil
|
6a1eb30af0
|
DEC-3905 数据集获取异常拦截一下, 阻止抛到最外层.
|
6 years ago |
Wim.Zhai
|
514f78cc2f
|
d0814
|
6 years ago |
Wim.Zhai
|
20cc8d1ab4
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design into release/10.0
|
6 years ago |
Wim.Zhai
|
0fb5c5c6c1
|
fine0814
|
6 years ago |
Alex.Sung
|
1f36d11298
|
Merge pull request #372 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '1e2ea5b62a096a2c51b2ea6e0a65f7c75c240a79':
规范国际化文件及国际化定义。
|
6 years ago |
plough
|
cdba003737
|
Merge pull request #366 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit '87af02ba02f9a86a1f44c8c86e47853049ec3c8b':
REPORT-10045 重构 UIListControlPane 和 JListControlPane => 调整代码,修复一个bug
REPORT-10045 重构 UIListControlPane 和 JListControlPane
REPORT-10045 重构 UIListControlPane 和 JListControlPane(部分)
|
6 years ago |
alex.sung
|
1e2ea5b62a
|
规范国际化文件及国际化定义。
|
6 years ago |
plough
|
87af02ba02
|
REPORT-10045 重构 UIListControlPane 和 JListControlPane => 调整代码,修复一个bug
|
6 years ago |
Harrison
|
8da0073db0
|
Merge pull request #371 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'bf85380f96596ead095371b652ce3bd88f96c283':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Harrison
|
bf85380f96
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Harrison
|
b0ad001f69
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
vito
|
74d0d4269e
|
Merge pull request #370 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit '5a8669993d40efab2c2b0bb3e9fd9ef0b19285b0':
REPORT-9518 启动动画界面偶尔字体显示异常
|
6 years ago |
vito
|
5a8669993d
|
REPORT-9518 启动动画界面偶尔字体显示异常
|
6 years ago |
Wim.Zhai
|
b5e298bd47
|
Merge pull request #368 in DESIGN/design from ~WIM.ZHAI/design:release/10.0 to release/10.0
* commit '9a5fddc60288145212da2be05361af1f4470b131':
d0813
on 0810
|
6 years ago |
Alex.Sung
|
c4ea4538e1
|
Merge pull request #369 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '3511eae0c878c26ff6620ff1596140fcbdb143e3':
规范国际化文件及国际化定义。
|
6 years ago |
alex.sung
|
3511eae0c8
|
规范国际化文件及国际化定义。
|
6 years ago |
Wim.Zhai
|
9a5fddc602
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit 'ea6a542b67018250d8f771b27ff839811ace9cee':
规范国际化文件及国际化定义。
|
6 years ago |
Alex.Sung
|
ea6a542b67
|
Merge pull request #367 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '0f96d3ff04013e58185eaa15920953bc66fc148d':
规范国际化文件及国际化定义。
|
6 years ago |
alex.sung
|
0f96d3ff04
|
规范国际化文件及国际化定义。
|
6 years ago |
plough
|
c987190ce9
|
merge
|
6 years ago |
plough
|
3b4dad290e
|
REPORT-10045 重构 UIListControlPane 和 JListControlPane
|
6 years ago |
Wim.Zhai
|
3bacfa4a59
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design into release/10.0
|
6 years ago |
Wim.Zhai
|
f7e303ccb2
|
d0813
|
6 years ago |
Wim.Zhai
|
83bddd6297
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit 'c5d390966676a4f93cc9cd620a1bf6cb9a066c55':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
规范国际化文件及国际化定义。
|
6 years ago |
alex.sung
|
2ecf936f69
|
规范国际化文件及国际化定义。
|
6 years ago |
plough
|
fab281b2b2
|
REPORT-10045 重构 UIListControlPane 和 JListControlPane(部分)
|
6 years ago |
Harrison
|
c5d3909666
|
Merge pull request #365 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'c6d6424a3faabdd989a3f140ad3cc688abe29470':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Harrison
|
c6d6424a3f
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Harrison
|
fb60bbac0e
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Harrison
|
8658b0407c
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Harrison
|
964d0778a6
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Harrison
|
2279f5d7ce
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
|
6 years ago |
Harrison
|
6a0bfcad01
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |