neil
fa3d81d76d
冲突
6 years ago
yaoh.wu
d60dff07eb
Merge pull request #435 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
...
* commit '688e96673df662477f51ce9a5f2bfd22c6ad9de5':
无JIRA任务,使历史颜色存储最大值生效
REPORT-11037 最近使用颜色只存不透明颜色
6 years ago
yaoh.wu
688e96673d
无JIRA任务,使历史颜色存储最大值生效
6 years ago
yaoh.wu
ba2efd53f7
REPORT-11037 最近使用颜色只存不透明颜色
6 years ago
Mata.Li
cff7287522
Merge pull request #434 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
...
* commit 'b5d8f969fee69c9acde0e2f5fe6217d7d039f044':
REPORT-10935 & REPORT-10921
6 years ago
Mata.Li
b5d8f969fe
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
6 years ago
Mata.Li
dd11cb5bef
REPORT-10935 & REPORT-10921
6 years ago
Harrison
6fbf1ad85f
Merge pull request #431 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
...
* commit '20d00c1d243e6b30bf6761e8ca9d6d69847e5475':
REPORT-11000【10.0冒烟】插件安装的国际化问题
REPORT-11000【10.0冒烟】插件的国际化问题
6 years ago
Harrison
20d00c1d24
REPORT-11000【10.0冒烟】插件安装的国际化问题
6 years ago
zheng
cfde3de36d
Merge pull request #430 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
...
* commit '3f0ec5157ce604e9b532a370d6b1d3763b313d5a':
CHART-2893 910
6 years ago
Harrison
a1818d5dd3
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
6 years ago
neil
964ed8fc90
Merge pull request #429 in DESIGN/design from ~NEIL/design-10:release/10.0 to release/10.0
...
* commit '40c3d11dbdc683053512eec882039b93bc314823':
REPORT-10882【10.0冒烟】填报属性设置界面,自定义提交和数据校验无法设置
6 years ago
Harrison
6231077cdf
REPORT-11000【10.0冒烟】插件的国际化问题
6 years ago
neil
40c3d11dbd
REPORT-10882【10.0冒烟】填报属性设置界面,自定义提交和数据校验无法设置
6 years ago
zheng
3f0ec5157c
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
6 years ago
zheng
b4d54d6348
CHART-2893 910
6 years ago
loy
543b4bc435
Merge pull request #427 in DESIGN/design from ~LOY/design:release/10.0 to release/10.0
...
* commit 'afdbedeebb0d25c81454a817607f44cc9573afc1':
REPORT-10988 修复保存配置用法问题
6 years ago
loy
afdbedeebb
REPORT-10988 修复保存配置用法问题
6 years ago
Wim.Zhai
5e5fe9d2ce
Merge pull request #425 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
...
CHART-2868 对照FR9调整仅调整了汉语翻译。“分类”“线型”很热门(...有多处值相同的国际化键)
* commit '9f86dfdfcef9b0b08ea49dbb90c15ba714614bcc':
CHART-2868 change translate
6 years ago
Wim.Zhai
9f86dfdfce
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/Xdesign into release/10.0
6 years ago
Wim.Zhai
53ca4998df
CHART-2868 change translate
6 years ago
Mata.Li
72a595e500
Merge pull request #424 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
...
* commit '3a5616b58d266a65dd024526a76841e1885ba89e':
REPORT-10921 & REPORT-10935
6 years ago
Mata.Li
3a5616b58d
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
6 years ago
Mata.Li
ab37c26503
REPORT-10921 & REPORT-10935
6 years ago
Harrison
c8db70cf47
Merge pull request #421 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
...
* commit 'cd4957215668b8799fbccdfebf451372a2338886':
REPORT-10914 【10.0插件冒烟】插件国际化
6 years ago
Harrison
cd49572156
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
6 years ago
Harrison
d318f602f5
REPORT-10914 【10.0插件冒烟】插件国际化
6 years ago
Harrison
5663b404b3
Merge pull request #420 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
...
* commit 'fd664ebb9b9006db4f78dadcd4469daebb315ebf':
REPORT-10965 [10.0冒烟]添加控件js事件,右键操作国际化问题
6 years ago
yaoh.wu
ecfd4fd8a4
Merge pull request #419 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
...
* commit '4e6d4a2855ea9d4d6d036289998944e211f7a3a1':
REPORT-10833 聚合报表设计界面问题
6 years ago
Harrison
fd664ebb9b
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/design into release/10.0
6 years ago
Harrison
21acd863e9
REPORT-10965 [10.0冒烟]添加控件js事件,右键操作国际化问题
6 years ago
yaoh.wu
4e6d4a2855
REPORT-10833 聚合报表设计界面问题
6 years ago
Harrison
39853700d2
Merge pull request #416 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
...
* commit 'f26e08f95300d06523e2e98274dbd86ec4b25b18':
REPORT-10923【10.0冒烟】单元格元素汇总下各选项的国际化问题 REPORT-10924【10.0冒烟】单元格元素》高级》结果集筛选选项中的国际化问题 REPORT-10920【10.0冒烟】表单中添加Tab块,右侧面板的国际化问题
6 years ago
Wim.Zhai
e1322f2dae
Merge pull request #418 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
...
CHART-2868 createTableLayoutPane4Chart()的参数也用到了国际化。修改了几处两次使用i8nText方法的地方
* commit '047acda40768dd72215b74573f469d09203e5e61':
change unused modify
CHART-2876 Debug on i18n
right or wrong?
6 years ago
Wim.Zhai
047acda407
change unused modify
6 years ago
Mata.Li
fd42272fc1
Merge pull request #412 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
...
* commit 'ffccd6859973bb21c0f9d2a9c63f1e0b68569ee4':
REPORT-10886
6 years ago
Wim.Zhai
01f6304538
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/Xdesign into release/10.0
6 years ago
zheng
f870f5d6b5
Merge pull request #413 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
...
* commit '05227ce3d2951da4bde286a0feee34f15c5958b6':
CHART-2802 图表接口 可以没有数据配置面板&&类型面板可以加组件
6 years ago
Harrison
f26e08f953
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
6 years ago
Harrison
7afb74076d
REPORT-10923【10.0冒烟】单元格元素汇总下各选项的国际化问题
...
REPORT-10924【10.0冒烟】单元格元素》高级》结果集筛选选项中的国际化问题
REPORT-10920【10.0冒烟】表单中添加Tab块,右侧面板的国际化问题
6 years ago
Wim.Zhai
8e545d846a
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/Xdesign into release/10.0
6 years ago
Wim.Zhai
edbc6fb09f
CHART-2876 Debug on i18n
6 years ago
zheng
05227ce3d2
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
6 years ago
zheng
63c78fb7e7
CHART-2802 图表接口 可以没有数据配置面板&&类型面板可以加组件
6 years ago
zheng
24dc0b6f2a
Merge pull request #411 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
...
* commit 'ad60c51a7e046cbb3fc32c8ec4706ffe1bb5eb63':
CHART-2802 大屏插件 接口扩展
6 years ago
Mata.Li
ffccd68599
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
6 years ago
Mata.Li
6c002a62f6
REPORT-10886
6 years ago
Wim.Zhai
a6dc527755
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/Xdesign into release/10.0
6 years ago
Wim.Zhai
197d80ac34
right or wrong?
6 years ago
zheng
ad60c51a7e
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
6 years ago