Maksim
|
6bf4cd13d8
|
处理冲突
|
5 years ago |
Maksim
|
15dd910b14
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~maksim/design-i18n into feature/10.0
Conflicts:
design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
|
5 years ago |
Hades
|
0f0e98418a
|
Merge pull request #381 in DESIGN/design-i18n from ~HADES/design-i18n:feature/10.0 to feature/10.0
* commit '6a3d945fc9be7aee509af149e0f75a06da813275':
REPORT-27109 国际化
|
5 years ago |
hades
|
6a3d945fc9
|
REPORT-27109 国际化
|
5 years ago |
neil
|
be6a640b31
|
Merge pull request #379 in DESIGN/design-i18n from ~NEIL/design-i18n:feature/10.0 to feature/10.0
* commit 'ed7023b7d5de35b4819a435d93a935618b53d398':
无jira任务, 同步国际化文件
|
5 years ago |
neil
|
ed7023b7d5
|
无jira任务, 同步国际化文件
|
5 years ago |
Maksim
|
f765a0a5bb
|
英文国际化
|
5 years ago |
Maksim
|
adc6e25639
|
Merge pull request #371 in DESIGN/design-i18n from ~MAKSIM/design-i18n:feature/10.0 to feature/10.0
* commit '76e212de724be3bfb509f6ddb3a7bd44c60af935':
国际化文件修改
远程设计兼容及服务检测
|
5 years ago |
Maksim
|
76e212de72
|
解决冲突
|
5 years ago |
Maksim
|
2230d51081
|
国际化文件修改
|
5 years ago |
Hades
|
77f45f1021
|
Merge pull request #364 in DESIGN/design-i18n from ~HADES/design-i18n:feature/10.0 to feature/10.0
* commit 'df258c86d5033d8e8fd841e054621a32a9d85516':
REPORT-17834 国际化
|
5 years ago |
Hades
|
df258c86d5
|
REPORT-17834 国际化
|
5 years ago |
Maksim
|
4b809cf234
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
Maksim
|
fd1c66699e
|
远程设计兼容及服务检测
|
5 years ago |
Bjorn
|
91ac471b83
|
Merge pull request #354 in DESIGN/design-i18n from ~BJORN/design-i18n:feature/10.0 to feature/10.0
* commit '656a06e52fa56385c3dc19e939839123343c54e1':
CHART-11090 地图模糊匹配国际化
|
5 years ago |
白岳
|
656a06e52f
|
CHART-11090 地图模糊匹配国际化
|
5 years ago |
neil
|
517c236b01
|
Merge pull request #293 in DESIGN/design-i18n from ~BRYANT/design-i18n:feature/10.0 to feature/10.0
* commit '51dd8dd7b092bc142e3e32062762d466ee96810a':
REPORT-22636 提示信息修改
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
51dd8dd7b0
|
REPORT-22636 提示信息修改
|
5 years ago |
Bryant
|
555aaf3e77
|
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
0adb2d0848
|
Merge pull request #291 in DESIGN/design-i18n from ~BRYANT/design-i18n:feature/10.0 to feature/10.0
* commit '46aeac0670b2faacafe2ae58ac5069b72832db39':
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
46aeac0670
|
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
efeaa6d46e
|
Merge pull request #289 in DESIGN/design-i18n from ~BRYANT/design-i18n:feature/10.0 to feature/10.0
* commit '70a6d8e9cc5550727da6b11dc84671874e7ecffc':
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
70a6d8e9cc
|
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
f0ce277af4
|
Merge pull request #288 in DESIGN/design-i18n from ~BRYANT/design-i18n:feature/10.0 to feature/10.0
* commit 'b5983f958f02757199fca7c026577045ecdc97c3':
KERNEL-418 更新升级重构
KERNEL-418 更新升级重构
KERNEL-418 更新升级重构
KERNEL-418 更新升级重构
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
b5983f958f
|
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
f40f6df845
|
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
c95d1453ae
|
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
f0ac4d2202
|
KERNEL-418 更新升级重构
|
5 years ago |
Bryant
|
554cd7689f
|
KERNEL-418 更新升级重构
|
5 years ago |
Hugh.C
|
159fe7ad3c
|
Merge pull request #287 in DESIGN/design-i18n from ~HUGH.C/design-i18n:feature/10.0 to feature/10.0
* commit 'f4d906bdee591181bfec1193c3610db581f3b308':
REPORT-21689 添加国际化文件
|
5 years ago |
Hugh.C
|
f4d906bdee
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/design-i18n into feature/10.0
|
5 years ago |
Hugh.C
|
481bdca7b7
|
REPORT-21689 添加国际化文件
|
5 years ago |
zheng
|
670c2e7c6a
|
Merge pull request #286 in DESIGN/design-i18n from ~ZHENG/design-i18n:feature/10.0 to feature/10.0
* commit '27c81956798e12e5f7e629bcc4f5b3f434ee5e53':
CHART-4027 数据筛选界面 {}为空时,不显示该{}
|
5 years ago |
shine
|
27c8195679
|
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/design-i18n into feature/10.0
|
5 years ago |
shine
|
7789db0d36
|
CHART-4027 数据筛选界面 {}为空时,不显示该{}
|
5 years ago |
zheng
|
36ddf69ac4
|
Merge pull request #285 in DESIGN/design-i18n from ~ZHENG/design-i18n:feature/10.0 to feature/10.0
* commit 'f4a846b326ffcad0ab108533a250b22847f4a7f5':
CHART-10225 属性兼容:大数据相关
|
5 years ago |
shine
|
f4a846b326
|
CHART-10225 属性兼容:大数据相关
|
5 years ago |
Bjorn
|
cc104a0809
|
Merge pull request #283 in DESIGN/design-i18n from ~BJORN/design-i18n:feature/10.0 to feature/10.0
* commit '2cfbe291006c34b83592d4db5bafb162389ee4ed':
CHART-10603 国际化命名修改
CHART-10603 国际化修改
|
5 years ago |
白岳
|
2cfbe29100
|
CHART-10603 国际化命名修改
|
5 years ago |
白岳
|
86e74c9507
|
CHART-10603 国际化修改
|
5 years ago |
Lucian.Chen
|
8b61a75dff
|
Merge pull request #282 in DESIGN/design-i18n from ~LUCIAN.CHEN/design-i18n:feature/10.0 to feature/10.0
* commit '38601726b4f8c8a803f5eca3b297f0570034ff37':
REPORT-20549 远程设计改进(设计权限加上角色)
|
5 years ago |
author
|
38601726b4
|
REPORT-20549 远程设计改进(设计权限加上角色)
|
5 years ago |
vito
|
a4467b7515
|
Merge pull request #281 in DESIGN/design-i18n from ~VITO/design-i18n:feature/10.0 to feature/10.0
* commit '70d9e38391aec08222c5458054ea87b4ae7f5722':
REPORT-19945 设计器启动优化
|
5 years ago |
vito
|
70d9e38391
|
REPORT-19945 设计器启动优化
|
5 years ago |
zheng
|
ff64fa7621
|
Merge pull request #280 in DESIGN/design-i18n from ~ZHENG/design-i18n:feature/10.0 to feature/10.0
* commit '4607b8773b103c6437d5e61c321160c95ba40d55':
CHART-10225 兼容属性的配置界面 国际化
|
5 years ago |
zheng
|
4607b8773b
|
CHART-10225 兼容属性的配置界面 国际化
|
5 years ago |
Hugh.C
|
7b938bd5c6
|
Merge pull request #276 in DESIGN/design-i18n from ~HUGH.C/design-i18n:feature/10.0 to feature/10.0
* commit '46f9b69eabff2e1830cc25f996fafec447dd4f22':
REPORT-20981 模板版本管理减少磁盘占用(远程没有更新jar时,提示相应信息)
|
5 years ago |
Hugh.C
|
46f9b69eab
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/design-i18n into feature/10.0
|
5 years ago |
Hugh.C
|
678c8fbfab
|
REPORT-20981 模板版本管理减少磁盘占用(远程没有更新jar时,提示相应信息)
|
5 years ago |
Hugh.C
|
040b424646
|
Merge pull request #272 in DESIGN/design-i18n from ~HUGH.C/design-i18n:feature/10.0 to feature/10.0
* commit '9824f1318ccfa66dd06063ebea1621968a7e5ac2':
REPORT-20981 补上其他语言的国际化key
REPORT-20981 模板版本管理减少磁盘占用
|
5 years ago |