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
plough
6724144f67
Merge pull request #417 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
...
* commit '77e0be8ffe5eb1b4dd6bbf94f02924651599180a':
REPORT-10704 & REPORT-10864 支持缩放打印=>设计器部分;本地打印设置的打印机列表中增加“无”选项
6 years ago
yaoh.wu
1a13e4e778
Merge pull request #415 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
...
* commit 'a9954614cd87b85ff12053fdf5cddb6474f106b0':
REPORT-10689 远程设计新建删除和重命名
6 years ago
Wim.Zhai
047acda407
change unused modify
6 years ago
plough
77e0be8ffe
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
6 years ago
plough
71c4097b0f
REPORT-10704 & REPORT-10864 支持缩放打印=>设计器部分;本地打印设置的打印机列表中增加“无”选项
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
yaoh.wu
a9954614cd
REPORT-10689 远程设计新建删除和重命名
6 years ago
yaoh.wu
869fb69161
Merge pull request #414 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
...
* commit '3752c38f176805e9c3c4defed6b3b5310b7a7a7a':
REPORT-10689 远程设计新建删除和重命名
6 years ago
yaoh.wu
3752c38f17
REPORT-10689 远程设计新建删除和重命名
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
neil
41fdd03aa1
Merge pull request #410 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
...
* commit 'ed5cb1fa6ca42bca4ebc688aeb96ff589a0ed53f':
CORE-123 pack的打包依赖以及其他错误修改
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
zheng
76c2166ef5
CHART-2802 大屏插件 接口扩展
6 years ago
richie
ed5cb1fa6c
CORE-123 pack的打包依赖以及其他错误修改
6 years ago
Mata.Li
c48e0674a6
Merge pull request #409 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
...
* commit '03aefbf682563382b0a3a68047de4ff526904a23':
REPORT-10881
6 years ago
Mata.Li
03aefbf682
REPORT-10881
6 years ago
Harrison
8f4ac2c077
Merge pull request #408 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
...
* commit '4abf42fbff35978f9d0898e563248a6f2945c7ce':
REPORT-10821 模板填报属性有2个智能提交
6 years ago
richie
908c0f800f
Merge remote-tracking branch 'origin/release/10.0' into feature/10.0
...
# Conflicts:
# designer-base/pom.xml
# designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
# designer-base/src/main/java/com/fr/start/ServerStarter.java
6 years ago
Harrison
4abf42fbff
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
6 years ago
Harrison
653f4a4276
REPORT-10821 模板填报属性有2个智能提交
6 years ago
Harrison
e600937167
Merge pull request #405 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
...
* commit 'b3d91e85688eec34e8c20f5ee9ca0abcc2302d52':
REPORT-10785 report包下的一百多个国际化规范下
6 years ago
Mata.Li
273afa6762
Merge pull request #406 in DESIGN/design from ~MATA.LI/designfeature10:feature/10.0 to feature/10.0
...
* commit '433d15906cd0be33c9dea6da825633549bc6ee4d':
REPORT-10562
6 years ago
Mata.Li
8241db5760
Merge pull request #407 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
...
* commit 'd93e7ae57a2394c96115a396fb5426c989862c23':
REPORT-10847
6 years ago
Mata.Li
d93e7ae57a
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
6 years ago
Mata.Li
338137ced4
REPORT-10847
6 years ago
Mata.Li
a557a6a3da
Merge pull request #404 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
...
* commit '9ecc2d669138a3e91127a6920aad717848f3bae9':
无JRA任务 插件内置在release取消
6 years ago
Mata.Li
433d15906c
REPORT-10562
6 years ago
Harrison
b3d91e8568
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
6 years ago
Harrison
81c0c33369
REPORT-10785 report包下的一百多个国际化规范下
6 years ago
Mata.Li
9ecc2d6691
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
6 years ago
Mata.Li
906961c8b5
无JRA任务 插件内置在release取消
6 years ago
Alex.Sung
2d9e2f6c82
Merge pull request #403 in DESIGN/design from ~ALEX.SUNG/design:feature/10.0 to feature/10.0
...
REPORT-6453 alphafine整合小帆
* commit 'cb32d0b3ec1137dd5d1470cc580003f0291388bb':
提升代码质量
6 years ago
Harrison
1b5ba9c12b
Merge pull request #401 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
...
* commit '2a3080183965dac1bce5f61d07f01d3387440e2f':
REPORT-10785 report包下的一百多个国际化规范下 改错了,修复下
REPORT-10785 report包下的一百多个国际化规范下 分出 core-server / core-web
REPORT-10785 report包下的一百多个国际化规范下
6 years ago
alex.sung
cb32d0b3ec
提升代码质量
6 years ago
plough
d810b6a3ad
Merge pull request #402 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
...
* commit 'c51d7d034c27e0a5ca5153b39c745cee7d62172a':
REPORT-10490 【客户升级10.0】远程连接断开后,提示框显示空白=>整理代码
REPORT-10490 【客户升级10.0】远程连接断开后,提示框显示空白
6 years ago
plough
c51d7d034c
REPORT-10490 【客户升级10.0】远程连接断开后,提示框显示空白=>整理代码
6 years ago