 Mata.Li
|
0351d1299d
|
REPORT-10171
|
6 years ago |
 Harrison
|
ac17bd1ece
|
Merge remote-tracking branch 'origin/release/10.0' into release/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
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
|
6 years ago |
|
Harrison
|
4e320ea4ab
|
REPORT-10785 report包下的一百多个国际化规范下
|
6 years ago |
|
Mata.Li
|
709448429f
|
Merge pull request #101 in DESIGN/design-i18n from ~MATA.LI/design-i18n:release/10.0 to release/10.0
* commit 'f21010b1e375f96242858ac6840352168e490671':
REPORT-10562 & REPORT-10763
REPORT-10562 & REPORT-10763
|
6 years ago |
|
Mata.Li
|
f21010b1e3
|
REPORT-10562 & REPORT-10763
|
6 years ago |
 Alex.Sung
|
cc54ff689b
|
Merge pull request #98 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:feature/10.0 to feature/10.0
REPORT-6453 alphafine整合小帆
* commit 'b5f8da76a8efbb12e5457e1d5a1c7a4fc4663581':
规范国际化定义
规范国际化文件及国际化定义。
|
6 years ago |
|
Mata.Li
|
1ce4a9d948
|
REPORT-10562 & REPORT-10763
|
6 years ago |
|
alex.sung
|
b5f8da76a8
|
规范国际化定义
|
6 years ago |
|
alex.sung
|
7a59424fe2
|
解决冲突
|
6 years ago |
zack
|
27d86c2116
|
Merge pull request #100 in DESIGN/design-i18n from ~ZACK/design-i18n:feature/10.0 to feature/10.0
* commit '3c1388664975af5f0b7c5a4c46567f25c92d1668':
REPORT-10384 设计器预览启动假死问题
|
6 years ago |
zack
|
3c13886649
|
REPORT-10384 设计器预览启动假死问题
|
6 years ago |
|
alex.sung
|
012c4a567b
|
规范国际化文件及国际化定义。
|
6 years ago |
ju
|
424dd75abe
|
Merge pull request #97 in DESIGN/design-i18n from ~JU/design-i18n:release/10.0 to release/10.0
* commit 'aaf39efdc611f072f173a95e05eac6aa945a6d6c':
无JIRA任务 所有的代码间依赖全写成 10.0，对jar的依赖全写成#{branch}
|
6 years ago |
|
ju
|
aaf39efdc6
|
无JIRA任务 所有的代码间依赖全写成 10.0，对jar的依赖全写成#{branch}
|
6 years ago |
Wim.Zhai
|
62f3858ef9
|
Merge pull request #95 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
修改翻译：“上下渐变”to“渐变” 新增定义：“不等弧度玫瑰图”
* commit '62bf09cb8ce6e20b1c8dbe308cf169e803f9131b':
d0818
|
6 years ago |
|
ju
|
bab6ae7992
|
Merge pull request #96 in DESIGN/design-i18n from ~JU/design-i18n:feature/10.0 to feature/10.0
* commit '539acfc0adf2b50ce0832ab601a570aa26a3ff17':
无JIRA任务 只有最外层的jar依赖需要分支信息，其他不用
|
6 years ago |
|
ju
|
539acfc0ad
|
无JIRA任务 只有最外层的jar依赖需要分支信息，其他不用
|
6 years ago |
|
Wim.Zhai
|
62bf09cb8c
|
d0818
|
6 years ago |
|
ju
|
cae3555fd3
|
Merge pull request #94 in DESIGN/design-i18n from release/10.0 to feature/10.0
* commit 'bea7ecb92c58b5168f493183d657f42666a8f96f': (48 commits)
无JIRA任务 修改pom版本号规则
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
drill map
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
edit keys
d0814
fine0814
规范国际化文件及国际化定义。
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
规范国际化文件及国际化定义。
add top value
规范国际化文件及国际化定义。
规范国际化文件及国际化定义。
d0813
规范国际化文件及国际化定义。
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 |
 richie
|
bea7ecb92c
|
Merge pull request #93 in DESIGN/design-i18n from ~RICHIE/design-i18n:release/10.0 to release/10.0
* commit 'a7de9176e174fdd2c278061dc0ab74dde9bdece5':
无JIRA任务 修改pom版本号规则
|
6 years ago |
richie
|
a7de9176e1
|
无JIRA任务 修改pom版本号规则
|
6 years ago |
|
Harrison
|
f06ed56b88
|
Merge pull request #92 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit 'ecaa5395b2e2a24567816dea1976725c21cb18d8':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
ecaa5395b2
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
Harrison
|
a4effccdfd
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Wim.Zhai
|
94087fc76e
|
Merge pull request #91 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
修改一处value
* commit '1cee9e19f9f0e6bb849d97b5bf546637f2bbd168':
drill map
|
6 years ago |
|
Wim.Zhai
|
1cee9e19f9
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design-i18n into release/10.0
|
6 years ago |
|
Wim.Zhai
|
265cf33ec4
|
drill map
|
6 years ago |
|
Harrison
|
ad705ba8ab
|
Merge pull request #90 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit 'fd3800a98a1a1c0c35269892a9345a07fc1ba94c':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
fd3800a98a
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
d3808bd918
|
Merge remote-tracking branch 'origin/release/10.0' into release/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
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
|
6 years ago |
|
Wim.Zhai
|
f364dcefa4
|
Merge pull request #88 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
* commit '8cd051e683b65773c0bde05563a683352190c8a1':
edit keys
d0814
fine0814
|
6 years ago |
|
Harrison
|
a2fec5bcf4
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Wim.Zhai
|
8cd051e683
|
edit keys
|
6 years ago |
|
Wim.Zhai
|
fa3784528b
|
d0814
|
6 years ago |
|
Wim.Zhai
|
6d743c7461
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design-i18n into release/10.0
|
6 years ago |
|
Wim.Zhai
|
f274ae87e9
|
fine0814
|
6 years ago |
|
Alex.Sung
|
7874c1c722
|
Merge pull request #87 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit 'c67d2c100a32c4d017809cebe67edd7c05c1c24b':
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
c67d2c100a
|
规范国际化文件及国际化定义。
|
6 years ago |
|
Harrison
|
c102b03913
|
Merge pull request #86 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit '37d0a18d921f253ac38383ffb17d1f298f100f3f':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
37d0a18d92
|
Merge remote-tracking branch 'origin/release/10.0' into release/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
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
|
6 years ago |
|
Harrison
|
7b53f4612a
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Wim.Zhai
|
b9c3d4a443
|
Merge pull request #84 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
* commit '8671e05795f9a366657b988f47bb646cca10c1be':
add top value
d0813
d0810
|
6 years ago |
|
Alex.Sung
|
a5a40fc707
|
Merge pull request #85 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit 'ab2ca78afb53193094a0f7fdfd851212490697b7':
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
ab2ca78afb
|
规范国际化文件及国际化定义。
|
6 years ago |
|
Harrison
|
958751eae7
|
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 |
|
Wim.Zhai
|
8671e05795
|
add top value
|
6 years ago |
|
Wim.Zhai
|
70566caa39
|
Merging in latest from upstream (DESIGN/design-i18n:refs/heads/release/10.0)
* commit 'a2b8b3711b2e91fd9380bb65f951b7faf8708614':
规范国际化文件及国际化定义。
规范国际化文件及国际化定义。
规范国际化文件及国际化定义。
|
6 years ago |
|
Alex.Sung
|
a2b8b3711b
|
Merge pull request #83 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit 'c145f1e6040f75e7c4692a4ece11ac632168bf7e':
规范国际化文件及国际化定义。
规范国际化文件及国际化定义。
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
c145f1e604
|
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
313eed1030
|
规范国际化文件及国际化定义。
|
6 years ago |
