mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-04 15:14:01 +00:00

Go to file

guanghongwei c9928fc1f9 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver

Conflicts:
	docs/AddUserAsset.py

2015-03-07 17:39:10 +08:00

docs

Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver

2015-03-07 17:39:10 +08:00

jasset

修改各种bug

2015-03-07 17:37:40 +08:00

jlog

bug

2015-03-07 15:29:49 +08:00

jperm

修改一些bug

2015-03-07 17:37:26 +08:00

jumpserver

Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver

2015-03-07 17:39:10 +08:00

juser

修改权限修改为 submit

2015-03-07 15:28:49 +08:00

static

bug

2015-03-07 15:29:49 +08:00

templates

Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver

2015-03-07 17:39:10 +08:00

websocket

bug

2015-03-07 15:29:49 +08:00

.gitignore

基本完成用户管理

2015-03-05 00:20:24 +08:00

connect.py

修改一些bug

2015-03-07 17:37:26 +08:00

jumpserver.conf

修改各种bug

2015-03-07 17:37:40 +08:00

LICENSE

Init project add LICENSE file

2014-12-21 22:13:04 +08:00

log_handler.py

bug

2015-02-09 19:02:25 +08:00

manage.py

Init project add LICENSE file

2014-12-21 22:13:04 +08:00

README.md

a new branch

2015-01-10 13:52:39 +08:00