richie
|
708729ffb1
|
Merge remote-tracking branch 'origin/release/10.0' 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
# 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
|
2124f8ed80
|
REPORT-10914 【10.0插件冒烟】插件国际化
|
6 years ago |
Harrison
|
c956766149
|
Merge pull request #115 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit '6b7e0e657ee1a637b380c91cadb4aee37b5e9a0d':
REPORT-10965 [10.0冒烟]添加控件js事件,右键操作国际化问题
|
6 years ago |
Harrison
|
6b7e0e657e
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/design-i18n into release/10.0
|
6 years ago |
Harrison
|
bbb33c1f66
|
REPORT-10965 [10.0冒烟]添加控件js事件,右键操作国际化问题
|
6 years ago |
Harrison
|
f8d7798f82
|
Merge pull request #112 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit '9b6444cdf58cd05e0ea55a6cd9f88fe158d0a0fc':
REPORT-10923【10.0冒烟】单元格元素汇总下各选项的国际化问题 REPORT-10924【10.0冒烟】单元格元素》高级》结果集筛选选项中的国际化问题 REPORT-10920【10.0冒烟】表单中添加Tab块,右侧面板的国际化问题
REPORT-10871【10.0冒烟】设计器中各面板下的国际化问题
|
6 years ago |
Wim.Zhai
|
da34af29ed
|
Merge pull request #114 in DESIGN/design-i18n from ~WIM.ZHAI/xdesign-i18n:release/10.0 to release/10.0
将createTableLayoutPane4Chart()使用的国际化换成当前最新的。修改了几处中文命名。
* commit 'b787a4f80d4c2fc78826033f34ada5c3661afb65':
CHART-2876
|
6 years ago |
Mata.Li
|
0e645488be
|
Merge pull request #111 in DESIGN/design-i18n from ~MATA.LI/design-i18n:release/10.0 to release/10.0
* commit '3c2962893c2cc03f32f072d62658af90f4873785':
REPORT-10886
|
6 years ago |
Harrison
|
9b6444cdf5
|
REPORT-10923【10.0冒烟】单元格元素汇总下各选项的国际化问题
REPORT-10924【10.0冒烟】单元格元素》高级》结果集筛选选项中的国际化问题
REPORT-10920【10.0冒烟】表单中添加Tab块,右侧面板的国际化问题
|
6 years ago |
Wim.Zhai
|
b787a4f80d
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/Xdesign-i18n into release/10.0
|
6 years ago |
Wim.Zhai
|
3a9601bea1
|
CHART-2876
|
6 years ago |
yaoh.wu
|
a4be3570b7
|
Merge pull request #113 in DESIGN/design-i18n from ~YAOH.WU/design-i18n:feature/10.0 to feature/10.0
* commit 'cb0e65f9e7764b32d2822cae9c7cf38ee82094fb':
REPORT-10689 远程设计新建删除和重命名
|
6 years ago |
yaoh.wu
|
cb0e65f9e7
|
REPORT-10689 远程设计新建删除和重命名
|
6 years ago |
Harrison
|
297dfdb005
|
REPORT-10871【10.0冒烟】设计器中各面板下的国际化问题
|
6 years ago |
Harrison
|
d5544b1720
|
Merge pull request #110 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit 'e80f1511e2bbb3397b3c3f1bdc66f3919b15acc5':
REPORT-10762 国际化相关问题
|
6 years ago |
Mata.Li
|
3c2962893c
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/design-i18n into release/10.0
|
6 years ago |
Mata.Li
|
edacbb4c14
|
REPORT-10886
|
6 years ago |
Harrison
|
e80f1511e2
|
REPORT-10762 国际化相关问题
|
6 years ago |
Harrison
|
875f27eb48
|
Merge pull request #106 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit 'cc91009446c00b2050755954482c55ae947a326a':
REPORT-10821 模板填报属性有2个智能提交
|
6 years ago |
richie
|
dfc72128b0
|
Merge remote-tracking branch 'origin/release/10.0' 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
# 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
|
cc91009446
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Harrison
|
a5b7118a3c
|
REPORT-10821 模板填报属性有2个智能提交
|
6 years ago |
Harrison
|
24c7b47943
|
Merge pull request #104 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit 'cfb2d23f4f74ff7808d14edb2968608c3a4a1e6b':
REPORT-10785 report包下的一百多个国际化规范下
|
6 years ago |
Mata.Li
|
cc50927936
|
Merge pull request #105 in DESIGN/design-i18n from ~MATA.LI/design-i18n:feature/10.0 to feature/10.0
* commit 'f1b58b0ea25ff62092d92050ec535b7cf0c28a20':
REPORT-10562
|
6 years ago |
Mata.Li
|
f1b58b0ea2
|
REPORT-10562
|
6 years ago |
Harrison
|
cfb2d23f4f
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Harrison
|
b168c959e3
|
REPORT-10785 report包下的一百多个国际化规范下
|
6 years ago |
Harrison
|
349c3e44ee
|
Merge pull request #103 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit 'f80501c5a2b5500d2cfa96b61ea89fb14a819927':
REPORT-10785 report包下的一百多个国际化规范下 改错了,修复下
REPORT-10785 report包下的一百多个国际化规范下 分出 core-server / core-web
REPORT-10785 report包下的一百多个国际化规范下
|
6 years ago |
Harrison
|
f80501c5a2
|
REPORT-10785 report包下的一百多个国际化规范下
改错了,修复下
|
6 years ago |
Harrison
|
7ef6fec696
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Harrison
|
303f404eea
|
REPORT-10785 report包下的一百多个国际化规范下
分出 core-server / core-web
|
6 years ago |
Mata.Li
|
4d0c59db3b
|
Merge pull request #102 in DESIGN/design-i18n from ~MATA.LI/design-i18n:release/10.0 to release/10.0
* commit 'be82e28281eb6fdfc309b2d9023a3781e0385d3a':
REPORT-10171
|
6 years ago |
Mata.Li
|
be82e28281
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/design-i18n into release/10.0
|
6 years ago |
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 |