daniel
|
a9b1d18b95
|
Merge http://www.finedevelop.com:2015/scm/ba/design into 9.0
# Conflicts:
# designer_base/src/com/fr/design/locale/designer.properties
# designer_base/src/com/fr/design/locale/designer_en_US.properties
# designer_base/src/com/fr/design/locale/designer_ja_JP.properties
# designer_base/src/com/fr/design/locale/designer_ko_KR.properties
# designer_base/src/com/fr/design/locale/designer_zh_CN.properties
# designer_base/src/com/fr/design/locale/designer_zh_TW.properties
|
7 years ago |
rinoux
|
b851de1e5f
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit '21cf2b783d5f105bf4473853d9f1fabb0daf58f9':
utf8
REPORT-1013 用log4j记录日志.
|
7 years ago |
superman
|
21cf2b783d
|
Merge pull request #999 in BA/design from ~NEIL/design:9.0 to 9.0
* commit 'e2790a4cc8ffb16c10998e2b0343c88c4d70ef19':
utf8
REPORT-1013 用log4j记录日志.
|
7 years ago |
neil
|
e2790a4cc8
|
utf8
|
7 years ago |
neil
|
1aceeba735
|
REPORT-1013 用log4j记录日志.
|
7 years ago |
superman
|
223fd2715a
|
Merge pull request #41 in PF/design from ~LOY/design_pf:9.0 to 9.0
* commit 'eb852ef3cf94526803d7c1ffd0d45b4af1ed8428':
新填报按钮国际化
添加新填报预览按钮
|
7 years ago |
superman
|
15e63fb0e1
|
Merge pull request #998 in BA/design from ~NEIL/design:master to master
* commit 'cae51e136d9281928fa897dbf26c6408f3a98888':
1
1
REPORT-2825 合代码验收bug
|
7 years ago |
neil
|
cae51e136d
|
1
|
7 years ago |
neil
|
48cfd19b21
|
1
|
7 years ago |
neil
|
d155146179
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
7 years ago |
neil
|
1164a17f0c
|
REPORT-2825 合代码验收bug
|
7 years ago |
loy
|
eb852ef3cf
|
新填报按钮国际化
|
7 years ago |
loy
|
c468467562
|
Merge branch 'write' into 9.0
|
7 years ago |
superman
|
21b2255e0a
|
Merge pull request #997 in BA/design from ~NEIL/design:master to master
* commit '357d6c82db8c88ffa07d40169ccf8694fcfe33c6':
REPORT-3281 合代码验收问题, 日文加载失败.
|
7 years ago |
neil
|
357d6c82db
|
REPORT-3281 合代码验收问题, 日文加载失败.
|
7 years ago |
richie
|
ac96717cb3
|
修改拼写错误
|
7 years ago |
superman
|
80ea92e98c
|
Merge pull request #996 in BA/design from ~JU/ba-9.0-design:9.0 to 9.0
* commit 'b2db63a2138b654a3695118cefa1f275bbaf60c4':
PFC-607 插件安装删除更新不重启支持 解决SandboxCollection,不关闭插件就无法GC相关对象的问题。改成了在内部类中只保存一个ID,不引用具体的对象。
|
7 years ago |
juhaoyu
|
b2db63a213
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
juhaoyu
|
19303658da
|
PFC-607 插件安装删除更新不重启支持
解决SandboxCollection,不关闭插件就无法GC相关对象的问题。改成了在内部类中只保存一个ID,不引用具体的对象。
|
7 years ago |
richie
|
cdc5671737
|
拼错了,改进下
|
7 years ago |
richie
|
16cdd1cfb9
|
拼错了,改动
|
7 years ago |
superman
|
ffe3bdd870
|
Merge pull request #994 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'c0db4cda40d8ee0b0e6b1ebe1ee1f70f7a3f7c25':
placeholder改错了
|
7 years ago |
XiaXiang
|
c0db4cda40
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into 9.0
|
7 years ago |
XiaXiang
|
fc07b767bb
|
placeholder改错了
|
7 years ago |
superman
|
e3f5b840b2
|
Merge pull request #991 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'ed95b49e463a51592e29221111ab428e74e72baf':
国际化
加一条分割线
alphafine 选中状态的交互修改
|
7 years ago |
XiaXiang
|
ed95b49e46
|
国际化
|
7 years ago |
XiaXiang
|
1bcd8be952
|
加一条分割线
|
7 years ago |
XiaXiang
|
b097c6033d
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into 9.0
|
7 years ago |
XiaXiang
|
3921acd85e
|
alphafine 选中状态的交互修改
|
7 years ago |
superman
|
4ec7614d80
|
Merge pull request #990 in BA/design from ~NEIL/design:master to master
* commit 'faf7195c9b9070f86f2856a6aff95924d48bcfba':
无JIRA任务, 国际化少了一个
|
7 years ago |
neil
|
faf7195c9b
|
无JIRA任务, 国际化少了一个
|
7 years ago |
superman
|
faf541f65b
|
Merge pull request #988 in BA/design from ~PAUL/design:master to master
* commit 'da2eddc9865e898cfd8c0e3d9dffb7b8551bbe25':
无JIRA任务, build failed
REPORT-3184 设计器安装后默认工作目录的名字
【日语国际化修改】
gis地图切换经纬度后,经纬度面板不现实bug
CQ-9 没有装插件的设计打开带有插件控件的表单时,需要能正确的打开并提示
修改pmd错误(国际化命名)
修改pmd错误(国际化命名)
修改国际化问题
REPORT-2561 大屏-数字时钟插件,属性表左移
REPORT-2561 大屏-数字时钟插件,属性表左移,调整
REPORT-2561 大屏-数字时钟插件,属性表左移
比较版本号
版本比较: 10.0 > 9.0 1.10 > 1.9 1.1.2 > 1.1.1 1.1.1 > 1.1
删除多余类
去掉多余代码
去掉接口代码中instnceof,用泛型代替。
|
7 years ago |
paul
|
da2eddc986
|
Merge branch 'release'
|
7 years ago |
superman
|
4ce1d09e17
|
Merge pull request #987 in BA/design from ~JU/ba-9.0-design:9.0 to 9.0
* commit '103a2b5c61322a47f8794f9fb9051a21261e987e':
PFC-607 插件安装删除更新不重启支持 fix
|
7 years ago |
juhaoyu
|
103a2b5c61
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
juhaoyu
|
ce8a3b1056
|
PFC-607 插件安装删除更新不重启支持
fix
|
7 years ago |
superman
|
f206ca06b8
|
Merge pull request #986 in BA/design from ~JU/ba-9.0-design:9.0 to 9.0
* commit 'a7cae17cae232f151cf345277cf2f42a516571bf':
PFC-607 插件安装删除更新不重启支持 fix
|
7 years ago |
juhaoyu
|
a7cae17cae
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
juhaoyu
|
f67dea4d07
|
PFC-607 插件安装删除更新不重启支持
fix
|
7 years ago |
superman
|
8efb364b86
|
Merge pull request #985 in BA/design from ~JU/ba-9.0-design:9.0 to 9.0
* commit 'dda8a8182643c16c8ad52920e01e7195bfcce565':
PFC-607 插件安装删除更新不重启支持 1、将ClassForName方法放到StableUtils里面 2、xmlreader和writer提供读写Class对象的方法,封装插件相关
PFC-607 插件安装删除更新不重启支持 修改9.0性能插件 所有读写xml的class部分修改为使用通用的GeneralXMLTool,自动判断是否是插件的Class并记录PluginID
|
7 years ago |
juhaoyu
|
dda8a81826
|
PFC-607 插件安装删除更新不重启支持
1、将ClassForName方法放到StableUtils里面
2、xmlreader和writer提供读写Class对象的方法,封装插件相关
|
7 years ago |
juhaoyu
|
a3864c350d
|
PFC-607 插件安装删除更新不重启支持
修改9.0性能插件
所有读写xml的class部分修改为使用通用的GeneralXMLTool,自动判断是否是插件的Class并记录PluginID
|
7 years ago |
loy
|
804c0a03a5
|
Merge remote-tracking branch 'origin/9.0' into write
|
7 years ago |
superman
|
748e1af4ba
|
Merge pull request #984 in BA/design from ~NEIL/design:release to release
* commit 'f86e0ee7b738cd4e851be8058cc9b6ac06c32a19':
无JIRA任务, build failed
|
7 years ago |
neil
|
f86e0ee7b7
|
无JIRA任务, build failed
|
7 years ago |
sunmondong
|
cea22fcf19
|
fix
|
7 years ago |
superman
|
ca2b0fddf4
|
Merge pull request #983 in BA/design from ~KERRY/design:9.0 to 9.0
* commit '1451cbe930609f53bf1e1335d3e2ec1a8056c730':
國際化
REPORT-2354 验收bug修复(主要修改设计器和平台登录同步)
|
7 years ago |
kerry
|
1451cbe930
|
國際化
|
7 years ago |
kerry
|
1cf80b2507
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into 9.0
|
7 years ago |
kerry
|
f869e10dae
|
REPORT-2354 验收bug修复(主要修改设计器和平台登录同步)
|
7 years ago |