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 |
|
kerry
|
e574304306
|
REPORT-2354 将平台的插件管理和设计器的插件管理统一起来(暂时先传，用来调试)
|
8 years ago |
|
superman
|
d16e56c7af
|
Merge pull request #910 in BA/design from ~NEIL/design:release to release
* commit '105af44f3db48e773f8f1fab9aa8d466f107bb2d':
无JIRA任务， 屏蔽论坛消息 Patch到release.
|
8 years ago |
|
neil
|
105af44f3d
|
无JIRA任务， 屏蔽论坛消息 Patch到release.
|
8 years ago |
sunmondong
|
dbae3fa420
|
fix
|
8 years ago |
|
sunmondong
|
0e15a58aa2
|
适配aspectJ路径
|
8 years ago |
|
juhaoyu
|
eca6b16c62
|
merge chart : ba-9.0 => pf-9.0
|
8 years ago |
|
sunmondong
|
c14cb88218
|
fix
|
8 years ago |
|
ju
|
0929e76412
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit 'f905d03d0e35146c784348f65715e202b8b23355': (41 commits)
aspectJ编译
bug fix
bug fix
rt
alphafine 广告
alphafine 广告弹框
bug fix
bug fix
alphafine 广告弹窗
PMD
PMD
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
PMD
局部变量不行..还是改回去吧
...
|
8 years ago |
|
superman
|
3c3fd8818f
|
Merge pull request #20 in PF/design from ~KERRY/design-pf:9.0 to 9.0
* commit 'e09e9399167bb19ff0987ba42f64215e6d29de84':
REPORT-2354 兼容传统插件商城
|
8 years ago |
|
kerry
|
e09e939916
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~kerry/design-pf into 9.0
|
8 years ago |
|
kerry
|
8bc49176fa
|
REPORT-2354 兼容传统插件商城
|
8 years ago |
|
superman
|
599423bc16
|
Merge pull request #909 in BA/design from ~HZZZ/design:fix-REPORT-2811 to dev
* commit 'd618b70f1e6a31a2906851af70a3c903bba6eb0d':
fix
use UIPopupMenu
PMD
REPORT-2811 设计器表单，点击控件下方的展开按钮，设计器最小化后，控件界面还在桌面上
|
8 years ago |
|
sunmondong
|
f905d03d0e
|
aspectJ编译
|
8 years ago |
hzzz
|
d618b70f1e
|
fix
|
8 years ago |
|
hzzz
|
b8fbd2ecc0
|
use UIPopupMenu
|
8 years ago |
|
hzzz
|
9d84491d12
|
PMD
|
8 years ago |
|
hzzz
|
f8932e2f28
|
REPORT-2811 设计器表单，点击控件下方的展开按钮，设计器最小化后，控件界面还在桌面上
|
8 years ago |
|
superman
|
cb6a072ebf
|
Merge pull request #908 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit '06af382b35fadc2970e1dd75fbc383ac38c3fb3c':
bug fix
bug fix
rt
alphafine 广告
alphafine 广告弹框
bug fix
bug fix
alphafine 广告弹窗
|
8 years ago |
|
XiaXiang
|
06af382b35
|
bug fix
|
8 years ago |
|
XiaXiang
|
40d6bfbb41
|
bug fix
|
8 years ago |
|
XiaXiang
|
869b50a565
|
rt
|
8 years ago |
|
XiaXiang
|
d5d7349d1b
|
alphafine 广告
|
8 years ago |
|
XiaXiang
|
4964155c0f
|
alphafine 广告弹框
|
8 years ago |
|
XiaXiang
|
fde3497b21
|
bug fix
|
8 years ago |
|
XiaXiang
|
f7728758c8
|
bug fix
|
8 years ago |
|
XiaXiang
|
b1187cbd05
|
alphafine 广告弹窗
|
8 years ago |
|
kerry
|
872d3677bb
|
Merge pull request #19 in PF/design from ~KERRY/design-pf:9.0 to 9.0
* commit '68c33117566ef88ba9ff9c8f1d308c838cb57c1a':
修改PMD
修改PMD
避免魔术数
REPORT-235
report-2354 整合后台插件操作代码
REPORT-2354 设计器插件操作部分
REPORT-2354 设计器插件操作部分
|
8 years ago |
|
kerry
|
68c3311756
|
修改PMD
|
8 years ago |
|
kerry
|
47138c4840
|
修改PMD
|
8 years ago |
|
kerry
|
556dce803a
|
避免魔术数
|
8 years ago |
|
kerry
|
94113f6b0e
|
REPORT-235
|
8 years ago |
|
superman
|
dcf9a44b08
|
Merge pull request #907 in BA/design from ~HZZZ/design:reset-before-2773 to dev
* commit '5b17a17e85a5fdc382644ee7663bd1863cb379e0':
back 2
back 1
|
8 years ago |
|
kerry
|
363138e5fc
|
report-2354 整合后台插件操作代码
|
8 years ago |
