richie
|
3775dc6bd1
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
richie
|
463684663a
|
CORE-116 继续完善API接口
|
6 years ago |
richie
|
8707bd9812
|
Merge pull request #34 in DESIGN/design-i18n from ~RICHIE/design-i18n:release/10.0 to release/10.0
* commit 'f04d0983b389de5d7c6e1081486e145669546f9c':
CORE-116 国际化+DataModel相关处理
|
6 years ago |
richie
|
f04d0983b3
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
|
6 years ago |
richie
|
cb13e31b46
|
CORE-116 国际化+DataModel相关处理
|
6 years ago |
richie
|
622088d8ab
|
Merge pull request #31 in DESIGN/design-i18n from ~MATA.LI/design-i18n:release/10.0 to release/10.0
* commit '5c61076fbb26f5c35a9682d8da3f54a1ba1294e5':
REPORT-9953
REPORT-9953
|
6 years ago |
Mata.Li
|
5c61076fbb
|
REPORT-9953
|
6 years ago |
richie
|
7c736742fc
|
Merge pull request #33 in DESIGN/design-i18n from ~RICHIE/design-i18n:release/10.0 to release/10.0
* commit 'c02f4ffae478e9ad98ecc82e6ef80d86fb665b0d':
CORE-116 继续改国际化规范
|
6 years ago |
richie
|
c02f4ffae4
|
CORE-116 继续改国际化规范
|
6 years ago |
Mata.Li
|
36344120f4
|
REPORT-9953
|
6 years ago |
richie
|
4acd2c258e
|
Merge pull request #32 in DESIGN/design-i18n from ~RICHIE/design-i18n:release/10.0 to release/10.0
* commit '2804b004accc55d0817e9f569ddbbfbb605ce072':
继续改改改
继续改改改
继续改改改
CORE-116 继续改国际化,改一点是一点
|
6 years ago |
richie
|
2804b004ac
|
继续改改改
|
6 years ago |
richie
|
1cf0d82f11
|
继续改改改
|
6 years ago |
richie
|
fae43dcf64
|
继续改改改
|
6 years ago |
richie
|
8833e9634d
|
CORE-116 继续改国际化,改一点是一点
|
6 years ago |
Mata.Li
|
2b0b7d6af1
|
REPORT-9953
|
6 years ago |
Mata.Li
|
c891eb2980
|
REPORT-9953
|
6 years ago |
Mata.Li
|
94821ec416
|
REPORT-9953
|
6 years ago |
richie
|
4d6406dd76
|
Merge pull request #30 in DESIGN/design-i18n from ~RICHIE/design-i18n:release/10.0 to release/10.0
* commit '80a6303e2de4c26b967798b428fce945d5483cc9':
CORE-116 智能运维过程中整理下国际化,分离设计器和服务器以及web(注:真吉尔乱)
|
6 years ago |
richie
|
80a6303e2d
|
CORE-116 智能运维过程中整理下国际化,分离设计器和服务器以及web(注:真吉尔乱)
|
6 years ago |
Mata.Li
|
a5200c6cfb
|
Merge pull request #29 in DESIGN/design-i18n from ~MATA.LI/design-i18n:release/10.0 to release/10.0
* commit '1110c72daa42944609fc77984577322b0706a2e7':
REPORT-9377
|
6 years ago |
Mata.Li
|
1110c72daa
|
REPORT-9377
|
6 years ago |
plough
|
b724bb7ab6
|
Merge pull request #28 in DESIGN/design-i18n from ~PLOUGH/10-design-i18n:release/10.0 to release/10.0
* commit '28ceae2544653d3ef42b8f0be252cf04595f0c57':
REPORT-9734 填报页面设置sheet标签页国际化有问题
|
6 years ago |
plough
|
28ceae2544
|
REPORT-9734 填报页面设置sheet标签页国际化有问题
|
6 years ago |
Hzzz
|
bd277ae7e0
|
Merge pull request #27 in DESIGN/design-i18n from ~HZZZ/design-i18n61:release/10.0 to release/10.0
* commit '3be6bae666ebe3aed257f8a2bd72525ea6d4d6d7':
disconnecte
|
6 years ago |
hzzz
|
3be6bae666
|
disconnecte
|
6 years ago |
daniel
|
793aa18121
|
Merge pull request #26 in DESIGN/design-i18n from ~DANIEL/design-i18n:release/10.0 to release/10.0
* commit '7c43f285c82d3172128c5b9222c3a098c6d3e2d8':
move
|
6 years ago |
daniel
|
7c43f285c8
|
move
|
6 years ago |
richie
|
6a29baff54
|
Merge pull request #25 in DESIGN/design-i18n from ~RICHIE/design-i18n:release/10.0 to release/10.0
* commit '0aba88fe967eb318fa9638b963ac828c4f7feb1e':
无JIRA任务 调整源码目录结构符合maven默认配置
|
6 years ago |
richie
|
0aba88fe96
|
无JIRA任务 调整源码目录结构符合maven默认配置
|
6 years ago |
Hzzz
|
8cf312196d
|
Merge pull request #24 in DESIGN/design-i18n from ~HZZZ/design-i18n61:release/10.0 to release/10.0
* commit '4ab5a3486e274b42ecb554b926a175e4b9258667':
.
.
|
6 years ago |
hzzz
|
4ab5a3486e
|
.
|
6 years ago |
hzzz
|
626b922279
|
.
|
6 years ago |
plough
|
c16376279c
|
Merge pull request #23 in DESIGN/design-i18n from ~PLOUGH/10-design-i18n:release/10.0 to release/10.0
* commit '387f787de80666b25a797669f08317678591d370':
无JIRA任务,国际化调整
|
6 years ago |
plough
|
387f787de8
|
无JIRA任务,国际化调整
|
6 years ago |
zack
|
2b5a1d7b19
|
Merge pull request #22 in DESIGN/design-i18n from ~ZACK/design-i18n:release/10.0 to release/10.0
* commit 'dbd65c1f8ca136533862c713228b06169c90baac':
国际化
REPORT-8813 设计器启动增加加载工程的loading
|
6 years ago |
zack
|
dbd65c1f8c
|
国际化
|
6 years ago |
zack
|
24e017af8f
|
REPORT-8813 设计器启动增加加载工程的loading
|
6 years ago |
plough
|
9d05f188bb
|
Merge pull request #21 in DESIGN/design-i18n from ~PLOUGH/10-design-i18n:release/10.0 to release/10.0
* commit '92c141c4af4fb03502d8a6670a22f75ee7505482':
REPORT-8859 【10.0一轮回归】繁体设计器少key=>统一各语言国际化key;排序
|
6 years ago |
plough
|
92c141c4af
|
REPORT-8859 【10.0一轮回归】繁体设计器少key=>统一各语言国际化key;排序
|
6 years ago |
richie
|
93764b66c2
|
修改maven依赖版本
|
6 years ago |
plough
|
b1c7428444
|
Merge pull request #20 in DESIGN/design-i18n from ~PLOUGH/10-design-i18n:feature/10.0 to feature/10.0
* commit 'd5c5905c9681b6484ef8f018ef1bb847531a74ec':
REPORT-7702 - 10.0 清理report.properties中重复以及无用的国际化=> 转移designer-chart用到 的key
|
7 years ago |
plough
|
d5c5905c96
|
REPORT-7702 - 10.0 清理report.properties中重复以及无用的国际化=> 转移designer-chart用到
的key
|
7 years ago |
neil
|
68db5d07bc
|
Merge pull request #19 in DESIGN/design-i18n from ~PLOUGH/10-design-i18n:feature/10.0 to feature/10.0
* commit 'c4abc3bece4e67d4d84013c22144278ed7a6a5d2':
REPORT-7702 - 10.0 清理report.properties中重复以及无用的国际化=> 转移design用到的key
REPORT-7702 - 10.0 清理report.properties中重复以及无用的国际化=> 转移design用到的key
|
7 years ago |
plough
|
c4abc3bece
|
REPORT-7702 - 10.0 清理report.properties中重复以及无用的国际化=> 转移design用到的key
|
7 years ago |
plough
|
ce3b52af7c
|
merge
|
7 years ago |
plough
|
bd2d84fe96
|
REPORT-7702 - 10.0 清理report.properties中重复以及无用的国际化=> 转移design用到的key
|
7 years ago |
superman
|
6a1e4287d9
|
Merge pull request #18 in DESIGN/design-i18n from ~RICHIE/design-i18n:feature/10.0 to feature/10.0
* commit 'c8a7c6de0e1170ca0be716cca8fb803f07e8f272':
无JIRA任务 远程设计登录登出修改(部分)
|
7 years ago |
richie
|
c8a7c6de0e
|
无JIRA任务 远程设计登录登出修改(部分)
|
7 years ago |
superman
|
e86b66c866
|
Merge pull request #17 in DESIGN/design-i18n from ~RICHIE/design-i18n:feature/10.0 to feature/10.0
* commit '0fdde4c01a7d1c60e5d5f428cc58b04ecbe0f38a':
无JIRA任务 远程设计界面配置对应修改(部分)
|
7 years ago |