github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
736 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

24 Commits (e24003df9744e85388724da3f9b66835f7aa01f9)

Author SHA1 Message Date
ibuler e2ac212fc3 resolve confilict 2015-04-20 20:56:26 +08:00
ibuler 09d3763a02 fix a bug 2015-04-20 20:54:10 +08:00
ibuler ea37374ea5 兼容django 1.6 2015-04-20 18:56:30 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00
halcyon b65f620ff7 hehe 2015-04-19 23:14:51 +08:00
ibuler 76b1bf2c39 测试脚本去掉注释 2015-04-19 18:39:15 +08:00
guanghongwei bd0fd90e2d 用户详情和普通用户 2015-04-06 23:04:31 +08:00
guanghongwei 2f7e7b0072 修改nav.html 2015-03-21 15:08:16 +08:00
halcyon fef224459c 閴存潈 2015-03-19 18:32:10 +08:00
halcyon 78dc6e5154 bugs 2015-03-14 17:54:27 +08:00
guanghongwei d926cbdef2 merge with wangyong 2015-03-14 13:20:53 +08:00
guanghongwei 546393d9c3 授权修改 2015-03-11 23:46:35 +08:00
halcyon 75f06f9b62 bugs 2015-03-11 18:29:47 +08:00
guanghongwei 5c54128f8d 修改很多内容,但不打算用 2015-03-11 10:18:20 +08:00
guanghongwei c9928fc1f9 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	docs/AddUserAsset.py
 2015-03-07 17:39:10 +08:00
halcyon 5bf66ca92e 淇敼鍚勭bug 2015-03-07 17:37:40 +08:00
guanghongwei 9a638bc856 淇敼涓浜沚ug 2015-03-07 17:37:26 +08:00
guanghongwei 67f9aad1b9 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	docs/AddUserAsset.py
 2015-03-07 15:33:06 +08:00
guanghongwei 07b0e2980e 浠婂ぉ鍒版涓烘 2015-03-06 00:24:17 +08:00
root e086a03692 bug 2015-03-04 23:14:07 +08:00
guanghongwei 50fcac67c3 淇敼 鍒犻櫎绛 2015-03-03 22:44:00 +08:00
guanghongwei fc007e96d7 修改很多内容 2015-03-03 18:42:06 +08:00
guanghongwei 4190b19450 淇敼鎺堟潈璇︽儏 2015-02-11 23:32:24 +08:00
guanghongwei 50208c0088 sudo授权 2015-02-10 18:53:01 +08:00