mengao
|
30bae7a43f
|
去掉多余代码
|
8 years ago |
superman
|
1186ad21ae
|
Merge pull request #918 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'aa8fc97a5fa702bca04ae0e0435f2580a9c4e790':
bug fix
bug fix
|
8 years ago |
XiaXiang
|
aa8fc97a5f
|
bug fix
|
8 years ago |
|
XiaXiang
|
fbdcbfdfb6
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into 9.0
|
8 years ago |
|
XiaXiang
|
1ab9909905
|
bug fix
|
8 years ago |
|
superman
|
f311ec8c0f
|
Merge pull request #917 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'd705d50fa21418af0872eed06a6e3dde7cc3b11c':
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix 设置的搜索
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix
alphafine bug fix 设置搜索
alphafine 设置的面板内容搜索
|
8 years ago |
|
XiaXiang
|
d705d50fa2
|
bug fix
|
8 years ago |
|
XiaXiang
|
1d7d09eee6
|
bug fix
|
8 years ago |
|
XiaXiang
|
d6717b9a71
|
bug fix
|
8 years ago |
|
XiaXiang
|
bddc2fff57
|
bug fix
|
8 years ago |
|
XiaXiang
|
a7456326cb
|
bug fix
|
8 years ago |
|
XiaXiang
|
ce9ed87d3e
|
bug fix
|
8 years ago |
|
XiaXiang
|
65f4d551af
|
bug fix
|
8 years ago |
|
XiaXiang
|
6e5e18d88c
|
bug fix
|
8 years ago |
|
mengao
|
db283848a0
|
去掉接口代码中instnceof，用泛型代替。
|
8 years ago |
|
XiaXiang
|
2bac4047dd
|
bug fix
|
8 years ago |
|
XiaXiang
|
160acaec73
|
bug fix 设置的搜索
|
8 years ago |
|
superman
|
d7fc9e748f
|
Merge pull request #25 in PF/design from ~KERRY/design-pf:9.0 to 9.0
* commit '6932d7a125d3a5bfbcd217af32e52aba865c5af6':
REPORT-2354 将平台的插件管理和设计器的插件管理统一起来
|
8 years ago |
|
XiaXiang
|
19ddad4e26
|
bug fix
|
8 years ago |
kerry
|
6932d7a125
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~kerry/design-pf into 9.0
|
8 years ago |
|
kerry
|
3a18665323
|
REPORT-2354 将平台的插件管理和设计器的插件管理统一起来
|
8 years ago |
|
XiaXiang
|
ec31aa0179
|
bug fix
|
8 years ago |
|
XiaXiang
|
2cbd735902
|
bug fix
|
8 years ago |
|
XiaXiang
|
4317084856
|
bug fix
|
8 years ago |
|
XiaXiang
|
ee98544836
|
bug fix
|
8 years ago |
|
XiaXiang
|
7bcb2b0261
|
bug fix
|
8 years ago |
|
XiaXiang
|
59eea922d3
|
bug fix
|
8 years ago |
|
XiaXiang
|
ca1f33b363
|
bug fix
|
8 years ago |
|
XiaXiang
|
28c21627b5
|
alphafine bug fix 设置搜索
|
8 years ago |
|
superman
|
a87f3f336c
|
Merge pull request #24 in PF/design from ~JU/co-pf-9.0-design:9.0 to 9.0
* commit '2461248e116f5c7782f407d19cdf4878a74bdc50':
规范代码，允许通过GeneralContext注册插件监听
|
8 years ago |
juhaoyu
|
2461248e11
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
8 years ago |
|
juhaoyu
|
89a2d4d08b
|
规范代码，允许通过GeneralContext注册插件监听
|
8 years ago |
|
superman
|
208590f622
|
Merge pull request #23 in PF/design from ~JU/co-pf-9.0-design:9.0 to 9.0
* commit 'ec45d8457d3c897bb2a17f81f0a97883ee338a69':
1、修复已发现的问题 2、菜单监听相关插件变动，自动修改菜单内容
|
8 years ago |
|
juhaoyu
|
ec45d8457d
|
1、修复已发现的问题
2、菜单监听相关插件变动，自动修改菜单内容
|
8 years ago |
|
XiaXiang
|
cd0e098e43
|
alphafine 设置的面板内容搜索
|
8 years ago |
|
superman
|
1b9dce3bc9
|
Merge pull request #22 in PF/design from ~JU/co-pf-9.0-design:9.0 to 9.0
* commit 'b2bc24b9ff94d6dd7da52123d73a69992fccda6c':
merge
merge chart : ba-9.0 => pf-9.0
|
8 years ago |
|
juhaoyu
|
b2bc24b9ff
|
merge
|
8 years ago |
|
superman
|
86fa8414b7
|
Merge pull request #915 in BA/design from ~NEIL/design:release to release
* commit '6774ed2d4f107734b3dbf9bf9dea3fab6851bd8c':
无JIRA任务， 论坛消息屏蔽
|
8 years ago |
|
superman
|
b191a4c69d
|
Merge pull request #916 in BA/design from ~NEIL/design:master to master
* commit '3c0d59b5e406b716f04975bace0cf8860796c81e':
无JIRA任务， 合代码漏了一个.
|
8 years ago |
neil
|
6774ed2d4f
|
无JIRA任务， 论坛消息屏蔽
|
8 years ago |
|
neil
|
3c0d59b5e4
|
无JIRA任务， 合代码漏了一个.
|
8 years ago |
|
superman
|
cb417b9f3d
|
Merge pull request #914 in BA/design from ~PAUL/design:master to master
* commit '96ef39063d5e1fd95392a7228cd446c3e5a504fb':
Signed-off-by: unknown <李晓丽>
无JIRA任务， 屏蔽论坛消息 Patch到release.
【国际化修改】修改部分翻译 庄奇 syoki 20170523
UNDEF-715 统计客户BUG的时候需要正确的区分release版本和stable版本
REPORT-2675 部分国际化key找不到，加载顺序问题
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
去掉之前接口冗余操作
表单支持背景接口
REPORT-2644 master国际化问题
增加限制，不允许添加同分组名的插件
|
8 years ago |
paul
|
96ef39063d
|
Merge branch 'release'
# Conflicts:
# designer_base/src/com/fr/design/locale/designer_ja_JP.properties
# designer_base/src/com/fr/design/locale/designer_zh_TW.properties
|
8 years ago |
|
superman
|
225ec2de75
|
Merge pull request #913 in BA/design from ~NEIL/design:dev to dev
* commit '59180e23e36ffbfd7978d686b2d31678f66d0f7e':
无JIRA任务， 国际化合并
|
8 years ago |
|
neil
|
59180e23e3
|
无JIRA任务， 国际化合并
|
8 years ago |
|
superman
|
998828b838
|
Merge pull request #912 in BA/design from ~LILY/design:release to release
* commit 'f5a863610c05f20100e8e4e661d7989b9de483dc':
Signed-off-by: unknown <李晓丽>
|
8 years ago |
unknown
|
f5a863610c
|
Signed-off-by: unknown <李晓丽>
|
8 years ago |
ju
|
588fd729a2
|
Merging in latest from upstream (PF/design:refs/heads/9.0)
* commit '100c9bd37e6f27a31c47602324aa05aa98b60835':
REPORT-2354 将平台的插件管理和设计器的插件管理统一起来(暂时先传，用来调试)
|
8 years ago |
|
superman
|
100c9bd37e
|
Merge pull request #21 in PF/design from ~KERRY/design-pf:9.0 to 9.0
* commit '6a32a6de245fff05d92b3fa77e64fd15ac47fe27':
REPORT-2354 将平台的插件管理和设计器的插件管理统一起来(暂时先传，用来调试)
|
8 years ago |
|
kerry
|
6a32a6de24
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~kerry/design-pf into 9.0
|
8 years ago |
