 Harrison
|
9247feecc8
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
kerry
|
96751a289d
|
Merge pull request #348 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'bb9f5b673186e409fedc8e2a51cfcd484ae25490':
REPORT-10429 更新jar后，访问tab模板报错
|
6 years ago |
|
kerry
|
bb9f5b6731
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
6 years ago |
|
kerry
|
c9e1080697
|
REPORT-10429 更新jar后，访问tab模板报错
|
6 years ago |
Wim.Zhai
|
eef3cd6f56
|
Merge pull request #347 in DESIGN/design from ~WIM.ZHAI/design:release/10.0 to release/10.0
针对CHART-2753发现的bug。在design-i18n-chart新增了些key定义（可能是原先以为engine-chart里有，就没有保留，但事后发现engine处的key无法被design处代码获得）
* commit '3d81dc7d7eeb07a09d5902f369c151510a105c70':
modify for 2753
change0807:
|
6 years ago |
 richie
|
73481babe9
|
Merge pull request #346 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '66cc111ee4a08a82ef37d275dfb0e593b6cf1f58':
REPORT-10449 插件国际化
|
6 years ago |
|
Wim.Zhai
|
3d81dc7d7e
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design into release/10.0
|
6 years ago |
|
Wim.Zhai
|
dc7cca5cde
|
modify for 2753
|
6 years ago |
ju
|
72b5c0adc6
|
Merge pull request #345 in DESIGN/design from ~JU/design:10.0 to 10.0
* commit '24939bf44ab421791b0fd4f392cdd72803512e2c':
无JIRA任务 master屏蔽国际化区分
|
6 years ago |
richie
|
66cc111ee4
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
richie
|
1a6a195ee3
|
REPORT-10449 插件国际化
|
6 years ago |
|
ju
|
24939bf44a
|
无JIRA任务 master屏蔽国际化区分
|
6 years ago |
|
ju
|
b9dd5b4d10
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
ju
|
03464c856f
|
无JIRA任务 master国际化先屏蔽模块区分
|
6 years ago |
 Alex.Sung
|
0021f251fe
|
Merge pull request #344 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
* commit '98cd7779b8a7a6bd0b891c76c73a0c86ff78ed29':
继续提交国际化
|
6 years ago |
|
3dot141
|
863d4723ee
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
alex.sung
|
98cd7779b8
|
继续提交国际化
|
6 years ago |
 Jinbokai
|
c77c10b850
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
Wim.Zhai
|
1f7ed8188e
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design into release/10.0
|
6 years ago |
|
Wim.Zhai
|
aa9656a219
|
change0807:
|
6 years ago |
|
Alex.Sung
|
b1e50778b5
|
Merge pull request #343 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
继续补充国际化
* commit '5e916c814f939d4b3228190fffcfeb05d97e84df':
继续提交国际化。
|
6 years ago |
|
alex.sung
|
5e916c814f
|
继续提交国际化。
|
6 years ago |
|
ju
|
6354f1233f
|
Merge pull request #340 in DESIGN/design from release/10.0 to 10.0
* commit '7f511cd6d2900d112f180d11639810552806b02e': (21 commits)
根据国际化规范，修改不合理地方。
.
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
.
.
CORE-116 国际化拆分设计器、服务器和web
规范国际化文件及国际化定义。
无JIRA任务 打包
debug
debug
无JIRA任务 代码质量
无JIRA任务 本来就是默认路径时起不来
无JIRA任务 本来就是默认路径时起不来
相应调整
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10419 部分准备工作，删除
重构调整
'CHART-2705'
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
found and correct the bug
...
|
6 years ago |
|
ju
|
7f511cd6d2
|
Merge pull request #342 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit 'be156957c73f0d04909549b677bf62987907f315':
无JIRA任务 本来就是默认路径时起不来
|
6 years ago |
|
ju
|
be156957c7
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
ju
|
682f89a31f
|
无JIRA任务 冲突
|
6 years ago |
|
ju
|
a89ce8d7d4
|
Merge pull request #327 in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '3164fee6722e4fc29b199a00d6181cedc79f029a':
'CHART-2705'
|
6 years ago |
|
ju
|
8f2190e687
|
Merge pull request #337 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '97d8a2f8690e65b98b3cf7e3dc2c147c71fb6527':
CORE-116 国际化拆分设计器、服务器和web
|
6 years ago |
|
ju
|
b0984a27a9
|
Merge pull request #338 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0
* commit '9423a5feb413f77efc79b68c0f17006a9a93f5ba':
.
.
.
|
6 years ago |
|
ju
|
76d2ec0f42
|
Merge pull request #336 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
* commit 'b79fe1f925d8c3c1f8bd2c9fd7031e6f415ba4ab':
根据国际化规范，修改不合理地方。
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
b79fe1f925
|
根据国际化规范，修改不合理地方。
|
6 years ago |
|
Harrison
|
b5f27c145c
|
Merge pull request #339 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '4add75355b913f6daa58455dee108050d4822f9b':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
ju
|
2092bbcdd5
|
Merge pull request #334 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '6920ab1240d8a54c337b581424e0812567de409c':
无JIRA任务 打包
无JIRA任务 代码质量
无JIRA任务 本来就是默认路径时起不来
无JIRA任务 本来就是默认路径时起不来
|
6 years ago |
hzzz
|
9423a5feb4
|
.
|
6 years ago |
|
3dot141
|
4add75355b
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
hzzz
|
a5097256d2
|
.
|
6 years ago |
|
hzzz
|
d901af1d2b
|
.
|
6 years ago |
|
richie
|
97d8a2f869
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
richie
|
3317c4604f
|
CORE-116 国际化拆分设计器、服务器和web
|
6 years ago |
|
Jinbokai
|
af8b7f8a11
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
alex.sung
|
f76d3fd984
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
alex.sung
|
796e3e5a19
|
规范国际化文件及国际化定义。
|
6 years ago |
|
ju
|
6920ab1240
|
无JIRA任务 打包
|
6 years ago |
|
ju
|
e59813b8f0
|
Merge pull request #335 in DESIGN/design from ~WIM.ZHAI/design:release/10.0 to release/10.0
* commit '2841506dfb9862b2e1376bfa89b4a57df8d04e3e':
debug
debug
|
6 years ago |
|
ju
|
834b7b55ee
|
无JIRA任务 打包
|
6 years ago |
|
Jinbokai
|
d8c39fbdff
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
Wim.Zhai
|
2841506dfb
|
debug
|
6 years ago |
|
Wim.Zhai
|
c21c61b140
|
debug
|
6 years ago |
|
ju
|
5cedf5c7b9
|
无JIRA任务 代码质量
|
6 years ago |
|
ju
|
c9579cbb9b
|
无JIRA任务 本来就是默认路径时起不来
|
6 years ago |
