superman
|
616141ae3f
|
Merge pull request #120 in BA/design from ~NEIL/design:master to master
* commit '63a5286f07b877a44a9064d1903a0ff53d248f2b':
build failed
|
9 years ago |
neil
|
63a5286f07
|
build failed
|
9 years ago |
|
superman
|
ac93e76f30
|
Merge pull request #119 in BA/design from release to master
* commit 'a27d9aee82407834f412b35e8daba7c3e01cb72c': (41 commits)
1
1
1
冲突
冲突
old plugin level
api level
rt
无窗口设计
數據配置界面
catch更改
1、删除插件返回一个成功消息，供界面显示 2、更新过期插件弹出两个对话框的问题
d
d
这个入口删掉，不需要做模板数据集分组
web属性界面打不开
给决策平台修改密码和认证等加一个事件监听,剩下的什么删除用户等还没有加
分组插件需要把action开出去
加个参数
地图数据配置界面
...
|
9 years ago |
|
superman
|
a27d9aee82
|
Merge pull request #118 in BA/design from ~NEIL/design:release to release
* commit '8ce32a4fffdb348e71f7a1d186a62245713b1d5c':
1
1
1
冲突
冲突
1
1
冲突
|
9 years ago |
|
neil
|
8ce32a4fff
|
1
|
9 years ago |
|
neil
|
b1c040aff4
|
1
|
9 years ago |
|
neil
|
b5588b54d3
|
1
|
9 years ago |
|
neil
|
9e607e097c
|
冲突
|
9 years ago |
|
neil
|
0df8ff6097
|
冲突
|
9 years ago |
xiaohu
|
0ec29c51c5
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
9 years ago |
|
neil
|
7cfec4e5fb
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~neil/design into release
|
9 years ago |
|
neil
|
e8153b0963
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
9 years ago |
|
superman
|
a7ea734e91
|
Merge pull request #116 in BA/design from ~XIAOHU/design:dev to dev
* commit '060d1181c38371270269d0e6365abc2a11909b6f':
添加是否顯示滾動條接口
|
9 years ago |
|
xiaohu
|
060d1181c3
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
9 years ago |
|
xiaohu
|
a0d9a7b141
|
添加是否顯示滾動條接口
|
9 years ago |
|
superman
|
0ad5fc8720
|
Merge pull request #114 in BA/design from ~SHINE/design:release to release
* commit 'b7319449ec89b7bcaf117c3573368a577ba7d862':
old plugin level
|
9 years ago |
|
superman
|
a53773be10
|
Merge pull request #115 in BA/design from ~SHINE/design:dev to dev
* commit '1c66d60fed6be4e7eef654bca91a8c9243ce3e0c':
APIlevel
|
9 years ago |
fr_shine
|
b7319449ec
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~shine/design into release
|
9 years ago |
|
fr_shine
|
e4588625d9
|
old plugin level
|
9 years ago |
|
fr_shine
|
1c66d60fed
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~shine/design into dev
|
9 years ago |
|
fr_shine
|
e9b6598f87
|
APIlevel
|
9 years ago |
|
superman
|
c061344ce7
|
Merge pull request #113 in BA/design from ~SHINE/design:release to release
* commit 'e681fde3c279cf9253638b25a1817c1b36962a6d':
api level
|
9 years ago |
|
neil
|
b4588fcf5b
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
9 years ago |
|
fr_shine
|
e681fde3c2
|
api level
|
9 years ago |
|
superman
|
c9a3414ad2
|
Merge pull request #112 in BA/design from ~SHINE/design:dev to dev
* commit 'c5d826a747e16acabd2b723a23ab98dc37da2e94':
api level
|
9 years ago |
|
fr_shine
|
c5d826a747
|
api level
|
9 years ago |
|
superman
|
4d95cd9bd0
|
Merge pull request #111 in BA/design from ~VITO/design:master to master
* commit '2079274c45e679a31cfde2331114de7bcf04ccc0':
改为直接获取sitecenter内容，缓存会出问题
|
9 years ago |
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 |
