 Alex.Sung
|
6e4c458396
|
Merge pull request #364 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '0223d79b55fa335105cbb1066df5d0d85dc0b73d':
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
0223d79b55
|
规范国际化文件及国际化定义。
|
6 years ago |
Wim.Zhai
|
3636b3a607
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit '4060b26396d6d0fa7152bf552dac8b23ec135a03':
规范国际化
规范国际化
|
6 years ago |
|
Alex.Sung
|
4060b26396
|
Merge pull request #362 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '76a4ed42f21a301b475c49431ebbdda5533eecbc':
规范国际化
规范国际化
|
6 years ago |
|
alex.sung
|
76a4ed42f2
|
规范国际化
|
6 years ago |
|
alex.sung
|
31bc3ce387
|
规范国际化
|
6 years ago |
|
Wim.Zhai
|
8881704171
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design into release/10.0
|
6 years ago |
|
Wim.Zhai
|
f8f07e570f
|
on 0810
|
6 years ago |
 yaoh.wu
|
5c3b197361
|
Merge pull request #361 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit 'f88ee1d68af3541715a63680b86d4debf9af159a':
REPORT-6700 远程权限验收问题
|
6 years ago |
|
yaoh.wu
|
f88ee1d68a
|
REPORT-6700 远程权限验收问题
|
6 years ago |
 Qinghui.Liu
|
2ec1c2e88b
|
Merge pull request #353 in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '0d8ec51c4912ef4f653b192998cf9de814fc32c5':
修复10.0中旧仪表盘系列设置项显示缺失
|
6 years ago |
 Harrison
|
848b385584
|
Merge pull request #360 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '675d94369bacf0d23e1ab10535e81cbbc6913183':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
675d94369b
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
|
6 years ago |
|
Harrison
|
660d5c9dfa
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
279e2cb88d
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java
# designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java
# designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java
# designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
# designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java
# designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java
# designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
|
6 years ago |
 Jinbokai
|
e1c9dda03b
|
Merge pull request #359 in DESIGN/design from ~JINBOKAI/design:release/10.0 to release/10.0
* commit '87454555966b81d10414db17e568da60169ee683':
删除拼接字符 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
添加过滤器
删除无用
ForbidType.java edited online with Bitbucket
designer-realize中i18nTextArray()替换为i18nText()方法
添加过滤器，禁止访问指定资源
|
6 years ago |
|
Harrison
|
cabdf27ef9
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Jinbokai
|
8745455596
|
删除拼接字符
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
|
Jinbokai
|
ba776db43a
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java
|
6 years ago |
|
Jinbokai
|
836eb7b463
|
格式化
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
|
Jinbokai
|
ef7ae78fd0
|
格式化
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
|
Jinbokai
|
d2a54a881f
|
格式化
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
|
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 |
