zack
|
5bf2b7faa3
|
d
|
9 years ago |
|
zack
|
263a699aff
|
d
|
9 years ago |
|
zack
|
a05a51a034
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zack/design
|
9 years ago |
|
zack
|
de842c99a3
|
这个入口删掉，不需要做模板数据集分组
|
9 years ago |
richie
|
0f54734d5a
|
web属性界面打不开
|
9 years ago |
neil
|
20e489848e
|
模板web属性打不开.
|
9 years ago |
|
richie
|
89c1f6e520
|
Merge remote-tracking branch 'origin/dev' into dev
|
9 years ago |
|
richie
|
959c9eb30c
|
给决策平台修改密码和认证等加一个事件监听,剩下的什么删除用户等还没有加
|
9 years ago |
superman
|
0af39c19f7
|
Merge pull request #102 in BA/design from ~ZACK/design:dev to dev
* commit 'e3a8cdd999aa1cf05db368c9c02deea0db3f23d8':
分组插件需要把action开出去
|
9 years ago |
|
zack
|
e3a8cdd999
|
分组插件需要把action开出去
|
9 years ago |
|
superman
|
ced05b857e
|
Merge pull request #101 in BA/design from ~ZACK/design:dev to dev
* commit 'b527593b488da4eb126758d05b8f7431c40e4cc9':
加个参数
|
9 years ago |
静听禅鸣
|
86255b9997
|
x
|
9 years ago |
|
静听禅鸣
|
31421f64e3
|
增加了社工功能
|
9 years ago |
|
静听禅鸣
|
eafb2c51ad
|
sk c
|
9 years ago |
|
zack
|
b527593b48
|
加个参数
|
9 years ago |
|
superman
|
8d210ee628
|
Merge pull request #100 in BA/design from ~SHINE/design:dev to dev
* commit 'a5929659051b1b0a56824d5f79c368a7802c36c6':
地图数据配置界面
|
9 years ago |
fr_shine
|
a592965905
|
地图数据配置界面
|
9 years ago |
|
superman
|
ac22564246
|
Merge pull request #98 in BA/design from ~RICHIE/design:dev to dev
* commit '6c3c766fdc5cbbf8d8db5834b09ae647b1a8d16d':
方法调用一点小错误
自定义背景的示例
|
9 years ago |
|
superman
|
709e435f10
|
Merge pull request #99 in BA/design from ~VITO/design:dev to dev
* commit '3d73fade2ddd1d5a69298a7042db6e94647aaf43':
动态获取插件分类api
|
9 years ago |
|
richie
|
6c3c766fdc
|
方法调用一点小错误
|
9 years ago |
vito
|
3d73fade2d
|
动态获取插件分类api
|
9 years ago |
|
richie
|
3d5b65368a
|
自定义背景的示例
|
9 years ago |
|
superman
|
f6b722c7c7
|
Merge pull request #97 in BA/design from ~ZACK/design:dev to dev
* commit '52336f6123c22191cc2f386542ba088439999db8':
修改
误删代码了
|
9 years ago |
|
zack
|
52336f6123
|
修改
|
9 years ago |
|
zack
|
a99dfb9eae
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zack/design
|
9 years ago |
|
zack
|
27086ced57
|
误删代码了
|
9 years ago |
|
superman
|
d0d720c652
|
Merge pull request #96 in BA/design from ~RICHIE/design:dev to dev
* commit 'ac4773554653bcf5dc3ec32f481657e954b4a433':
引用错误
|
9 years ago |
|
richie
|
ac47735546
|
Merge branch 'dev' of ssh://www.finedevelop.com:7999/~richie/design into dev
|
9 years ago |
|
richie
|
8c543728f6
|
引用错误
|
9 years ago |
|
neil
|
507e59be0f
|
Merge pull request #90 in BA/design from ~ZACK/design:dev to dev
* commit 'b6433715ba84e504e5224e2f4c42ed2060570406':
加override
加上override
加一个数据集面板处理器的接口，和jcontrolpane分开
|
9 years ago |
|
richie
|
758bc57775
|
背景部分代码重构,增加背景接口
|
9 years ago |
|
superman
|
dd40164246
|
Merge pull request #93 in BA/design from ~XIAOHU/design:dev to dev
* commit '909b4b1a0bd7fd2d357f6b4fded0681ff041a8c8':
數據配置界面
|
9 years ago |
|
zack
|
b6433715ba
|
加override
|
9 years ago |
xiaohu
|
909b4b1a0b
|
數據配置界面
|
9 years ago |
|
superman
|
c3dcfb0868
|
Merge pull request #92 in BA/design from ~NEIL/design:master to master
* commit '8ac770681a0ccd5822e4f155d487ad10bafb067d':
1
1
编码
|
9 years ago |
|
zack
|
282b730267
|
加上override
|
9 years ago |
|
neil
|
8ac770681a
|
1
|
9 years ago |
|
neil
|
58ed9518a1
|
1
|
9 years ago |
|
neil
|
db80af6d5d
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
9 years ago |
|
neil
|
cbcca87993
|
编码
|
9 years ago |
|
superman
|
82710ab726
|
Merge pull request #91 in BA/design from ~NEIL/design:master to master
* commit '811d74157e18fda1d793d2bdf1c088ab63b0ae68':
移动端自适应master
|
9 years ago |
|
neil
|
811d74157e
|
移动端自适应master
|
9 years ago |
|
zack
|
7c80cb51a2
|
加一个数据集面板处理器的接口，和jcontrolpane分开
|
9 years ago |
|
superman
|
03713c3b53
|
Merge pull request #89 in BA/design from ~ZACK/design:dev to dev
* commit '34b1582c04bf6ddb076e65c7f3beda726e0fcc7e':
属性这边单独整理下
|
9 years ago |
|
zack
|
34b1582c04
|
属性这边单独整理下
|
9 years ago |
|
superman
|
fa65bdfdfe
|
Merge pull request #87 in BA/design from ~ZACK/design:dev to dev
* commit 'cef2c42140903950f7268ce89c5c3fa20a5edae8':
服务器，模板数据集分组接口
|
9 years ago |
|
superman
|
1e50307f0a
|
Merge pull request #88 in BA/design from ~SHINE/design:dev to dev
* commit 'f5e26549e5ba933e817ddbb9281d8ac47f56c0dc':
地图配置
|
9 years ago |
|
fr_shine
|
f5e26549e5
|
地图配置
|
9 years ago |
|
zack
|
cef2c42140
|
服务器，模板数据集分组接口
|
9 years ago |
|
superman
|
6d6ebd1866
|
Merge pull request #86 in BA/design from ~RICHIE/design:dev to dev
* commit 'a69e7863a50badff8f7c6c65fee01724a63c3cce':
单元格Tag增量修改
|
9 years ago |
