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 |
|
hzzz
|
5b17a17e85
|
back 2
|
8 years ago |
|
hzzz
|
71b44df358
|
back 1
|
8 years ago |
|
superman
|
5148082547
|
Merge pull request #905 in BA/design from ~HZZZ/design:fix-REPORT-2773-9.0 to 9.0
* commit '85b2ed5e0424c000f47ef1e8f772a37223ed20e8':
PMD
PMD
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
PMD
局部变量不行..还是改回去吧
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
fix
修logPane的快捷键
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
superman
|
fd1d2d76b4
|
Merge pull request #906 in BA/design from ~MANGO/design:dev to dev
* commit 'de88676473718e3791828128c4fc2bd141267485':
在使用form的时候发现form里面的图表编辑面板不能正常加载，重新修改下加载图表编辑面板加载的位置
|
8 years ago |
mengao
|
de88676473
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
|
mengao
|
8d64d45fc3
|
在使用form的时候发现form里面的图表编辑面板不能正常加载，重新修改下加载图表编辑面板加载的位置
|
8 years ago |
|
hzzz
|
85b2ed5e04
|
PMD
|
8 years ago |
|
hzzz
|
35aa59377d
|
PMD
|
8 years ago |
|
hzzz
|
53bd971610
|
PMD
|
8 years ago |
|
hzzz
|
082987e03c
|
PMD
|
8 years ago |
|
hzzz
|
84f091a2f4
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
9c6a862e43
|
PMD
|
8 years ago |
|
hzzz
|
3f29a1be5a
|
PMD
|
8 years ago |
|
hzzz
|
d257489ee4
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
1f5114ede1
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
c6d1d6d9ee
|
PMD
|
8 years ago |
|
hzzz
|
e959791ed3
|
局部变量不行..还是改回去吧
|
8 years ago |
|
hzzz
|
16925fe0ae
|
PMD
|
8 years ago |
|
hzzz
|
e26becc684
|
PMD
|
8 years ago |
|
hzzz
|
487002536e
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
fbc7daed4f
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
aaa4c1fb0d
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
