Alex.Sung
|
8c1f2a48f7
|
Merge pull request #358 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '77073f89c6c0539c90c45167198675f52e96a8bb':
提交国际化
规范国际化文件及国际化定义。
|
6 years ago |
alex.sung
|
77073f89c6
|
提交国际化
|
6 years ago |
alex.sung
|
ada2a879a3
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java
# designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java
# designer-realize/src/main/java/com/fr/design/condition/PagePane.java
# designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java
# designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
# designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java
|
6 years ago |
alex.sung
|
c61e82c9e5
|
规范国际化文件及国际化定义。
|
6 years ago |
Jinbokai
|
c085d77d45
|
格式化
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
Jinbokai
|
fce857fd1d
|
格式化
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
Jinbokai
|
33b1f6a02d
|
格式化
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
Jinbokai
|
d9e4f33212
|
添加过滤器
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
文件过滤注册
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
Jinbokai
|
d5ce1a88a5
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# designer-base/src/main/java/com/fr/start/server/ForbidType.java
|
6 years ago |
Wim.Zhai
|
5c0af8aaff
|
Merge pull request #355 in DESIGN/design from ~WIM.ZHAI/design:release/10.0 to release/10.0
* commit '320e5b0e5325f6d7f31ce28b3704d9910bad486f':
modify on 0809
modify on 0809
modify on 0808
|
6 years ago |
Jinbokai
|
6d32858b90
|
删除无用
|
6 years ago |
Jinbokai
|
8fead967af
|
ForbidType.java edited online with Bitbucket
|
6 years ago |
Jinbokai
|
6b0c7f506d
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java
# designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java
|
6 years ago |
Wim.Zhai
|
320e5b0e53
|
emmm
|
6 years ago |
Jinbokai
|
2f42710132
|
designer-realize中i18nTextArray()替换为i18nText()方法
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
Harrison
|
31b16a7973
|
Merge pull request #356 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '1b0c8adf709d56828a1502630cf7640275e51cd7':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Harrison
|
1b0c8adf70
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Harrison
|
2fd2f725ef
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
yaoh.wu
|
e023a43196
|
Merge pull request #352 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit '08d50e01bac8317003ce7aa3fa15db5a01bd184b':
REPORT-10511 远程设计权限全选和未选问题
|
6 years ago |
Harrison
|
f8b5be2ea9
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Wim.Zhai
|
e9e3cc7f50
|
modify on 0809
|
6 years ago |
Wim.Zhai
|
5347b8072a
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design into release/10.0
|
6 years ago |
Wim.Zhai
|
e2db16bc5f
|
modify on 0809
|
6 years ago |
Alex.Sung
|
3bd7c77546
|
Merge pull request #354 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit 'b102e130de166f738ac7dff1e381ff97bc06fb88':
规范国际化
规范国际化文件及国际化定义。
|
6 years ago |
alex.sung
|
b102e130de
|
规范国际化
|
6 years ago |
Qinghui.Liu
|
0d8ec51c49
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Qinghui.Liu
|
9ce0acde72
|
修复10.0中旧仪表盘系列设置项显示缺失
Signed-off-by: Qinghui.Liu <Qinghui.Liu@fanruan.com>
|
6 years ago |
yaoh.wu
|
08d50e01ba
|
REPORT-10511 远程设计权限全选和未选问题
|
6 years ago |
Wim.Zhai
|
69c9cd0dc4
|
modify on 0809 designer-chart
|
6 years ago |
alex.sung
|
8092b2ab02
|
规范国际化文件及国际化定义。
|
6 years ago |
Jinbokai
|
eefb46b0ab
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Alex.Sung
|
e6d89d5638
|
Merge pull request #350 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '1332d5c8a24a9c53f28027e053f5c4d8f770b4ec':
规范国际化
|
6 years ago |
alex.sung
|
1332d5c8a2
|
规范国际化
|
6 years ago |
Harrison
|
18c66dc72b
|
Merge pull request #349 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '14b3e2f1de5797e8cc5facfa5225627805e7ba94':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Wim.Zhai
|
f4a1fa118b
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design into release/10.0
|
6 years ago |
Wim.Zhai
|
d6a35a2b78
|
modify on 0808
|
6 years ago |
Harrison
|
14b3e2f1de
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
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 |