plough
|
de3639be2d
|
REPORT-9943 10.0 页面设置的“打印顺序”改名为“分页顺序”
|
6 years ago |
Wim.Zhai
|
35c573e5f2
|
Merge pull request #46 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
针对chart-2724和chart2659的完善和解决
* commit 'a7f18da8e21795eab2fb9071ab13c6f1f7dd7cdf':
改key
|
6 years ago |
Wim.Zhai
|
a7f18da8e2
|
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
|
034fd7595d
|
改key
|
6 years ago |
ju
|
96e5ee37c3
|
Merge pull request #44 in DESIGN/design-i18n from ~PLOUGH/10-design-i18n:release/10.0 to release/10.0
* commit '096f3977f58d3d64961b412a566d980bed75fd0e':
REPORT-10142 【10.0冒烟】设计器参数面板上的控件,鼠标悬浮之后显示有问题=>按钮控件名称
|
6 years ago |
plough
|
096f3977f5
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design-i18n into release/10.0
|
6 years ago |
plough
|
5bb6df3686
|
REPORT-10142 【10.0冒烟】设计器参数面板上的控件,鼠标悬浮之后显示有问题=>按钮控件名称
|
6 years ago |
plough
|
b3f55a9551
|
Merge pull request #42 in DESIGN/design-i18n from ~PLOUGH/10-design-i18n:release/10.0 to release/10.0
* commit '45413d07237d71f85aa1a70ac44251ce9e6bcc05':
REPORT-10142 【10.0冒烟】设计器参数面板上的控件,鼠标悬浮之后显示有问题
|
6 years ago |
plough
|
45413d0723
|
REPORT-10142 【10.0冒烟】设计器参数面板上的控件,鼠标悬浮之后显示有问题
|
6 years ago |
Wim.Zhai
|
1ee5668522
|
Merge pull request #40 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
* commit '9c4cad465bc7825ae1739848ae3118cb20368853':
修改了电话参数处
#i18n
modify design i18n
一点点
加回了原先备份的另三语言的,并进行了同一调整
'change some keys
|
6 years ago |
Wim.Zhai
|
9c4cad465b
|
修改了电话参数处
|
6 years ago |
Wim.Zhai
|
4f5e22b10c
|
#i18n
|
6 years ago |
Wim.Zhai
|
3987030e50
|
modify design i18n
|
6 years ago |
Wim.Zhai
|
f74c6b009b
|
一点点
|
6 years ago |
Wim.Zhai
|
78842453a9
|
加回了原先备份的另三语言的,并进行了同一调整
|
6 years ago |
Wim.Zhai
|
ecddef6bce
|
'change some keys
|
6 years ago |
Mata.Li
|
b36df255fa
|
Merge pull request #36 in DESIGN/design-i18n from ~MATA.LI/design-i18n:release/10.0 to release/10.0
* commit '8fac70d49480be2bc62b40666ff27ae2695eceae':
REPORT-10031
|
6 years ago |
Mata.Li
|
8fac70d494
|
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
|
83f633bedf
|
REPORT-10031
|
6 years ago |
richie
|
d598c5ecd2
|
Merge pull request #35 in DESIGN/design-i18n from ~RICHIE/design-i18n:release/10.0 to release/10.0
* commit '3775dc6bd125a19e6433af7c31d354235ba02aca':
CORE-116 继续完善API接口
|
6 years ago |
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 |