superman
|
f6b722c7c7
|
Merge pull request #97 in BA/design from ~ZACK/design:dev to dev
* commit '52336f6123c22191cc2f386542ba088439999db8':
修改
误删代码了
|
8 years ago |
zack
|
52336f6123
|
修改
|
8 years ago |
|
zack
|
a99dfb9eae
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zack/design
|
8 years ago |
|
zack
|
27086ced57
|
误删代码了
|
8 years ago |
|
superman
|
d0d720c652
|
Merge pull request #96 in BA/design from ~RICHIE/design:dev to dev
* commit 'ac4773554653bcf5dc3ec32f481657e954b4a433':
引用错误
|
8 years ago |
richie
|
ac47735546
|
Merge branch 'dev' of ssh://www.finedevelop.com:7999/~richie/design into dev
|
8 years ago |
|
richie
|
8c543728f6
|
引用错误
|
8 years ago |
neil
|
507e59be0f
|
Merge pull request #90 in BA/design from ~ZACK/design:dev to dev
* commit 'b6433715ba84e504e5224e2f4c42ed2060570406':
加override
加上override
加一个数据集面板处理器的接口，和jcontrolpane分开
|
8 years ago |
|
richie
|
758bc57775
|
背景部分代码重构,增加背景接口
|
8 years ago |
|
superman
|
dd40164246
|
Merge pull request #93 in BA/design from ~XIAOHU/design:dev to dev
* commit '909b4b1a0bd7fd2d357f6b4fded0681ff041a8c8':
數據配置界面
|
8 years ago |
|
zack
|
b6433715ba
|
加override
|
8 years ago |
xiaohu
|
909b4b1a0b
|
數據配置界面
|
8 years ago |
|
superman
|
c3dcfb0868
|
Merge pull request #92 in BA/design from ~NEIL/design:master to master
* commit '8ac770681a0ccd5822e4f155d487ad10bafb067d':
1
1
编码
|
8 years ago |
|
zack
|
282b730267
|
加上override
|
8 years ago |
|
neil
|
8ac770681a
|
1
|
8 years ago |
|
neil
|
58ed9518a1
|
1
|
8 years ago |
|
neil
|
db80af6d5d
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
8 years ago |
|
neil
|
cbcca87993
|
编码
|
8 years ago |
|
superman
|
82710ab726
|
Merge pull request #91 in BA/design from ~NEIL/design:master to master
* commit '811d74157e18fda1d793d2bdf1c088ab63b0ae68':
移动端自适应master
|
8 years ago |
|
neil
|
811d74157e
|
移动端自适应master
|
8 years ago |
|
zack
|
7c80cb51a2
|
加一个数据集面板处理器的接口，和jcontrolpane分开
|
8 years ago |
|
superman
|
03713c3b53
|
Merge pull request #89 in BA/design from ~ZACK/design:dev to dev
* commit '34b1582c04bf6ddb076e65c7f3beda726e0fcc7e':
属性这边单独整理下
|
8 years ago |
|
zack
|
34b1582c04
|
属性这边单独整理下
|
8 years ago |
|
superman
|
fa65bdfdfe
|
Merge pull request #87 in BA/design from ~ZACK/design:dev to dev
* commit 'cef2c42140903950f7268ce89c5c3fa20a5edae8':
服务器，模板数据集分组接口
|
8 years ago |
|
superman
|
1e50307f0a
|
Merge pull request #88 in BA/design from ~SHINE/design:dev to dev
* commit 'f5e26549e5ba933e817ddbb9281d8ac47f56c0dc':
地图配置
|
8 years ago |
fr_shine
|
f5e26549e5
|
地图配置
|
8 years ago |
|
zack
|
cef2c42140
|
服务器，模板数据集分组接口
|
8 years ago |
|
superman
|
6d6ebd1866
|
Merge pull request #86 in BA/design from ~RICHIE/design:dev to dev
* commit 'a69e7863a50badff8f7c6c65fee01724a63c3cce':
单元格Tag增量修改
|
8 years ago |
|
superman
|
91f3774580
|
Merge pull request #85 in BA/design from ~NEIL/design:dev to dev
* commit '3b4d25b2ab2414cc4e781cb72e482016d0ad7b3b':
自适应界面
|
8 years ago |
|
richie
|
a69e7863a5
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
|
richie
|
eefa01daae
|
单元格Tag增量修改
|
8 years ago |
 neil
|
3b4d25b2ab
|
自适应界面
|
8 years ago |
|
superman
|
2b729b1f38
|
Merge pull request #82 in BA/design from ~GARYTU/design:dev to dev
* commit 'd5e6b3fcdf9403945f398a8a4a6c9af3aa8a639d':
代码可读性改进
上上次对资讯框的更改撤销
新功能已实现，手机报表最大高度的限制，测试可行。默认高度比：0.75（75%）。
设计器资讯框兼容，新的资讯框接受地址
|
8 years ago |
Lee
|
d5e6b3fcdf
|
代码可读性改进
|
8 years ago |
|
superman
|
88e5306891
|
Merge pull request #84 in BA/design from ~VITO/design:dev to dev
* commit '301628c23b6d9d5afc157c517c9d743022c138bc':
移包
|
8 years ago |
vito
|
301628c23b
|
移包
|
8 years ago |
Lee
|
e294105982
|
上上次对资讯框的更改撤销
|
8 years ago |
|
Lee
|
05c3e3b86e
|
新功能已实现，手机报表最大高度的限制，测试可行。默认高度比：0.75（75%）。
|
8 years ago |
|
superman
|
a0e2ca7c3a
|
Merge pull request #81 in BA/design from ~VITO/design:master to master
* commit '31915106e6c3f3404d6554ba7167fc5f50026837':
更换包名
更改下包的位置，添加注释
|
8 years ago |
|
vito
|
31915106e6
|
更换包名
|
8 years ago |
|
vito
|
49d5d32b38
|
更改下包的位置，添加注释
|
8 years ago |
|
superman
|
6b59fa7b98
|
Merge pull request #80 in BA/design from ~NEIL/design:master to master
* commit 'e191733588e7646119170abf2cef0ab2f57b71fe':
之前冲突的改回来.
|
8 years ago |
|
neil
|
e191733588
|
之前冲突的改回来.
|
8 years ago |
|
superman
|
7490bd1b7c
|
Merge pull request #79 in BA/design from release to master
* commit 'aaa9350a4aaadd474aab1896f2ffffb1e481e75c':
1
1
冲突
update
update
update
接口
rt
接口
去掉无用返回值
private
改成循环存取
邮件图片导出设置part5 in 5
接口命名规范
接口命名规范
1、更新对话框在插件管理背面的问题 2、下载插件和更新插件时提醒登陆
数据集分组插件调整
update
|
8 years ago |
|
superman
|
aaa9350a4a
|
Merge pull request #78 in BA/design from ~NEIL/design:release to release
* commit 'fe42842a54f30ae533289cb5ee88f724d37906a6':
1
1
冲突
|
8 years ago |
|
neil
|
fe42842a54
|
1
|
8 years ago |
|
neil
|
73e45d17d2
|
1
|
8 years ago |
|
neil
|
ed012834fe
|
冲突
|
8 years ago |
|
superman
|
a4588353ab
|
Merge pull request #76 in BA/design from ~ZACK/design:master to master
* commit '47f779ac70e6533140a33f1be080fc2690554de2':
修改方法名
修改
格式化一下
删除不需要的变量
修改
控件属性传递插件接口
|
8 years ago |
|
zack
|
47f779ac70
|
修改方法名
|
8 years ago |
