vito
|
2079274c45
|
改为直接获取sitecenter内容，缓存会出问题
|
9 years ago |
superman
|
1f698bea86
|
Merge pull request #110 in BA/design from ST/design:master to master
* commit 'f44e8a4575a997a68f5945a1ff4cae62e839471c':
去掉了todo注释
修改了函数名称为小写
x
增加了社工功能
sk c
|
9 years ago |
neil
|
37c107ab7d
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
9 years ago |
|
superman
|
024d7156f2
|
Merge pull request #109 in BA/design from ~XIAXIANG/design1:dev to dev
* commit '94dd5950dbf2c7103342f5d453f9fb4f557d9e87':
rt
|
9 years ago |
xiaxiang
|
94dd5950db
|
rt
|
9 years ago |
|
superman
|
4b63577ca5
|
Merge pull request #108 in BA/design from ~VITO/design:dev to dev
* commit '51bdaf47b6150f2155ab611c97b2bac6178f2a1f':
无窗口设计
|
9 years ago |
|
vito
|
51bdaf47b6
|
无窗口设计
|
9 years ago |
|
superman
|
f44e8a4575
|
Merge pull request #5 in ST/design from ~MINGCHE/design:master to master
* commit 'c501574367819d6d94b9a4f611551ec48e58172a':
去掉了todo注释
修改了函数名称为小写
x
增加了社工功能
|
9 years ago |
静听禅鸣
|
c501574367
|
去掉了todo注释
|
9 years ago |
|
静听禅鸣
|
22ea2b5e33
|
修改了函数名称为小写
|
9 years ago |
|
neil
|
dcd5e53264
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
9 years ago |
|
静听禅鸣
|
3dde945fac
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/st/design
|
9 years ago |
|
superman
|
acc634fa69
|
Merge pull request #2 in ST/design from ~MINGCHE/design:master to master
* commit 'eafb2c51ade3dd3a6de5c00b27b3eae4734ca290':
sk c
|
9 years ago |
|
superman
|
b9cadbe685
|
Merge pull request #107 in BA/design from ~XIAOHU/design:dev to dev
* commit 'a41a51ddaef4bf40563f2e2d655372eee68bfa48':
數據配置界面
|
9 years ago |
xiaohu
|
a41a51ddae
|
數據配置界面
|
9 years ago |
|
superman
|
de804eb17c
|
Merge pull request #106 in BA/design from ~VITO/design:dev to dev
* commit 'c573179143ccb976891ccc146515bcf492df359a':
catch更改
1、删除插件返回一个成功消息，供界面显示 2、更新过期插件弹出两个对话框的问题
|
9 years ago |
|
vito
|
c573179143
|
catch更改
|
9 years ago |
|
neil
|
e41cd5adea
|
11
|
9 years ago |
|
superman
|
c2d6c6758f
|
Merge pull request #103 in BA/design from ~RICHIE/design:dev to dev
* commit '0f54734d5afc7e9ba005c3d6df6e9def8caf5baf':
web属性界面打不开
给决策平台修改密码和认证等加一个事件监听,剩下的什么删除用户等还没有加
|
9 years ago |
|
vito
|
83efd7fe95
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~vito/design into dev
|
9 years ago |
|
vito
|
e6295278f4
|
1、删除插件返回一个成功消息，供界面显示
2、更新过期插件弹出两个对话框的问题
|
9 years ago |
|
superman
|
0bb322e0be
|
Merge pull request #105 in BA/design from ~ZACK/design:dev to dev
* commit '5bf2b7faa3508d5a0379d47e1546f4a1970bd5cd':
d
d
这个入口删掉，不需要做模板数据集分组
|
9 years ago |
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 |
