neil
|
4883e89a3c
|
冲突
|
8 years ago |
superman
|
310c690175
|
Merge pull request #302 in BA/design from ~LEE/design:dev to dev
* commit 'e920c7757a2d14b77a8db494453a58ebb877e84f':
bugfix：QQ授权页面超链问题；插件管理内登录问题
|
8 years ago |
李攀
|
e920c7757a
|
bugfix：QQ授权页面超链问题；插件管理内登录问题
1.现在改成捕捉授权部分，强制关闭当前窗口，且在浏览器上面给一个新的url地址处理。
2.之前的处理方案可能是webview的一个bug，现在完全改成html处理，把之前用到的也尽可能的移植过来。
|
8 years ago |
Fangjie Hu
|
0cd719303f
|
update
|
8 years ago |
|
Fangjie Hu
|
8f50359954
|
phantomjs
|
8 years ago |
|
Fangjie Hu
|
b916d352b3
|
phantomjs
|
8 years ago |
|
Fangjie Hu
|
289dcdfae2
|
update
|
8 years ago |
|
Fangjie Hu
|
dfa8ef6c53
|
update
|
8 years ago |
|
Fangjie Hu
|
59cc6264ba
|
update
|
8 years ago |
|
Fangjie Hu
|
cf670ae8e6
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~harry/design into dev
|
8 years ago |
|
Fangjie Hu
|
9d57c1a74d
|
准备插件资源
|
8 years ago |
|
superman
|
df4b44482f
|
Merge pull request #300 in BA/design from ~ZACK/design:dev to dev
* commit '7ad696659067d15b56b18d2ea9789cee1c0b755f':
补个注释
填报校验信息支持公式，把前面的条件框也改成公式编辑
|
8 years ago |
zack
|
7ad6966590
|
补个注释
|
8 years ago |
|
zack
|
0d2ad44641
|
填报校验信息支持公式，把前面的条件框也改成公式编辑
|
8 years ago |
|
superman
|
ab41d851d0
|
Merge pull request #299 in BA/design from ~RICHIE/design:dev to dev
* commit '4ecfc1c9269ac4b7383d614327b77db3ca743931':
某些菜单接口开放
|
8 years ago |
richie
|
4ecfc1c926
|
某些菜单接口开放
|
8 years ago |
|
superman
|
c61ac43a4a
|
Merge pull request #298 in BA/design from ~LEE/design:dev to dev
* commit '169782b7b185cfac24eb29888b3814de0502ccac':
修复
修改
格式修改
关闭窗口
登录的退出逻辑修改，还有弹出的页面大小修改
|
8 years ago |
|
李攀
|
169782b7b1
|
修复
|
8 years ago |
|
李攀
|
0f670e4aba
|
修改
|
8 years ago |
|
李攀
|
c772852a9c
|
格式修改
|
8 years ago |
|
superman
|
8d9d23c992
|
Merge pull request #295 in BA/design from ~ZHOUPING/design:dev to dev
* commit '9819153f459cffc2e912a422ede2ca89f6d2435f':
绝对布局bug修改3
|
8 years ago |
|
superman
|
084052d0e9
|
Merge pull request #296 in BA/design from ~ZHOUPING/design:release to release
* commit '444446ad051cc1dd874ae238d14a4907cc0c9622':
绝对布局bug修改3
|
8 years ago |
|
superman
|
ef02774826
|
Merge pull request #294 in BA/design from ~DANIEL/finereport_design:dev to dev
* commit 'cdb5e7515c24d8948017582dddc60f70747bb369':
1
|
8 years ago |
zhouping
|
444446ad05
|
绝对布局bug修改3
|
8 years ago |
|
zhouping
|
9819153f45
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zhouping/design into dev
|
8 years ago |
|
zhouping
|
f264ccda89
|
绝对布局bug修改3
|
8 years ago |
daniel
|
cdb5e7515c
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev
|
8 years ago |
|
daniel
|
74152de997
|
1
|
8 years ago |
|
superman
|
5053d18375
|
Merge pull request #292 in BA/design from ~ZHOUPING/design:dev to dev
* commit '55cdd4d42b41044e9923c2349fc2046532d45ac7':
bug:103653
|
8 years ago |
|
zhouping
|
55cdd4d42b
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zhouping/design into dev
|
8 years ago |
|
zhouping
|
f468fc4491
|
bug:103653
|
8 years ago |
|
superman
|
f0ff820251
|
Merge pull request #291 in BA/design from ~ZACK/design:dev to dev
* commit '52af1da90319089e0a1bd45d5a38afcae212d48c':
bug103155,tab布局的重命名功能先屏蔽了
|
8 years ago |
|
zack
|
52af1da903
|
bug103155,tab布局的重命名功能先屏蔽了
|
8 years ago |
sunmondong
|
4a09ba2985
|
更改依赖范围
|
8 years ago |
|
sunmondong
|
59a3e8f7be
|
更改依赖范围
|
8 years ago |
|
sunmondong
|
9437dbd7a1
|
更改依赖范围
Signed-off-by: sunmondong <sunmondong@finereport.com>
|
8 years ago |
|
sunmondong
|
49b3b70a74
|
再次缩小依赖范围
|
8 years ago |
|
sunmondong
|
05fa04516b
|
缩小依赖范围
|
8 years ago |
|
sunmondong
|
d6788f0f0a
|
缩小依赖范围
|
8 years ago |
|
sunmondong
|
be94670f8c
|
缩小依赖范围
|
8 years ago |
|
superman
|
545018032d
|
Merge pull request #290 in BA/design from ~XIAOHU/design:dev to dev
* commit '05e4fc08cd0641933dcf81ad853864e01dbd120d':
表单画图
|
8 years ago |
|
superman
|
47bc18354d
|
Merge pull request #289 in BA/design from ~ZHOUPING/design:release to release
* commit '4c3b74469fdc08e2e469f4d3ced8675f9f297bf6':
release分支，工具栏上屏蔽绝对布局
|
8 years ago |
|
Fangjie Hu
|
05e4fc08cd
|
表单画图
|
8 years ago |
|
zhouping
|
4c3b74469f
|
release分支，工具栏上屏蔽绝对布局
|
8 years ago |
kerry
|
89ce432aaa
|
回退
|
8 years ago |
|
superman
|
a8c5aff27f
|
Merge pull request #288 in BA/design from ~ZHOUPING/design:dev to dev
* commit 'de754516cce1e598dbe0ccb1e75000102e9d0cd7':
绝对布局测试bug修改2
|
8 years ago |
|
zhouping
|
de754516cc
|
绝对布局测试bug修改2
|
8 years ago |
|
kerry
|
7dbe35bb7a
|
添加一个在安装插件时做的其他操作接口
|
8 years ago |
|
superman
|
61949f043e
|
Merge pull request #284 in BA/design from ~DANIEL/finereport_design:dev to dev
* commit '765820382948d8a6bf7907e1e1e0a673d8d6408e':
import错误
|
8 years ago |
|
daniel
|
7658203829
|
import错误
|
8 years ago |
