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

245 Commits (bd0fd90e2d7cecaf8bd2b1ff80e7aaca0b3d03db)

Author SHA1 Message Date
guanghongwei bd0fd90e2d 用户详情和普通用户 2015-04-06 23:04:31 +08:00
guanghongwei 7e53228359 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-04-04 12:48:56 +08:00
guanghongwei afcc784797 修改用户详情 2015-04-04 12:48:26 +08:00
halcyon 6e976b0583 0406 2015-04-04 12:47:07 +08:00
guanghongwei 8f66de365e merge with wangyong 2015-04-02 20:40:54 +08:00
halcyon b35f1e6174 鏉冮檺鐢宠 2015-04-02 18:32:43 +08:00
guanghongwei a998de5973 修改用户详情 2015-04-01 22:54:10 +08:00
halcyon e1b9134d7f 0402 2015-04-01 18:58:10 +08:00
guanghongwei 2e5b22417d 添加切换 2015-03-30 21:31:02 +08:00
guanghongwei 340aaf42de 添加刷新 2015-03-27 16:34:00 +08:00
halcyon 359f70b9f9 apply 2015-03-26 18:42:52 +08:00
halcyon 408e4a54d8 bugs 2015-03-25 19:02:14 +08:00
guanghongwei 59414dadfc 刷新sudo，sudo用户鉴权 2015-03-25 18:45:55 +08:00
halcyon e3b2be0261 bugs 2015-03-24 18:34:00 +08:00
halcyon 6816f941d9 Merge branch 'guanghongwei' into wangyong 2015-03-24 17:05:17 +08:00
halcyon 1dddd98741 bug 2015-03-24 17:04:25 +08:00
guanghongwei 0c31968e3c 今天就这样吧 2015-03-23 22:57:19 +08:00
guanghongwei 2f7e7b0072 修改nav.html 2015-03-21 15:08:16 +08:00
guanghongwei d8a6eba2f3 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	connect.py
	jumpserver.conf
	jumpserver/api.py
 2015-03-21 13:10:38 +08:00
halcyon df2c2fc7d5 zhoumo 2015-03-21 12:58:29 +08:00
guanghongwei e717fad762 今天先到这里吧 2015-03-19 23:57:08 +08:00
halcyon fef224459c 閴存潈 2015-03-19 18:32:10 +08:00
halcyon 9348a0deb7 閴存潈 2015-03-18 18:05:46 +08:00
halcyon 92ccd3dc78 jlog 2015-03-17 16:25:32 +08:00
halcyon 9e1dd270ae bugs 2015-03-17 13:56:43 +08:00
guanghongwei 386d6a1cb2 先这样 2015-03-16 22:38:42 +08:00
guanghongwei a2ede31ae6 鉴权开始 2015-03-15 23:23:20 +08:00
guanghongwei f3ae7f00a0 暂时这样吧 2015-03-14 23:57:53 +08:00
guanghongwei 56df1f6963 merge 2015-03-14 17:57:26 +08:00
halcyon 78dc6e5154 bugs 2015-03-14 17:54:27 +08:00
guanghongwei 026836ebc5 今天就这样 2015-03-14 17:54:17 +08:00
guanghongwei d926cbdef2 merge with wangyong 2015-03-14 13:20:53 +08:00
guanghongwei d1f19a5cad 修改部门显示 2015-03-14 13:15:33 +08:00
halcyon ce6494ba64 bugs 2015-03-14 13:13:46 +08:00
guanghongwei b2c72221f7 今天就这样了 2015-03-13 23:46:38 +08:00
guanghongwei a7800b9a7a 添加权限管理 2015-03-13 00:09:18 +08:00
halcyon 691271c74f bugs 2015-03-12 18:54:26 +08:00
guanghongwei 475501595e 解决分页问题 2015-03-12 18:43:17 +08:00
halcyon fd490bd685 bugs 2015-03-12 11:03:53 +08:00
guanghongwei 546393d9c3 授权修改 2015-03-11 23:46:35 +08:00
guanghongwei 80d4272ee5 Merge remote-tracking branch 'origin/guanghongwei' into guanghongwei 
Conflicts:
	jperm/models.py
 2015-03-11 18:00:55 +08:00
guanghongwei ae0c28ef8f 今天就这样吧 2015-03-11 17:59:15 +08:00
guanghongwei 5c54128f8d 修改很多内容,但不打算用 2015-03-11 10:18:20 +08:00
halcyon 10bcae7cf0 dashboard 2015-03-10 18:27:47 +08:00
guanghongwei d72d55c965 娌℃庝箞淇敼 2015-03-08 22:48:50 +08:00
guanghongwei 6c10b06d5a Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-03-07 18:38:29 +08:00
halcyon 95bb96ebbf 鍚勭bug淇敼 2015-03-07 18:37:23 +08:00
guanghongwei 8f163eb634 缁熶竴鍒嗛〉 2015-03-07 18:25:31 +08:00
guanghongwei de358099cf Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-03-07 18:07:04 +08:00
guanghongwei cbf8dac5cc 淇敼鏄剧ず鍒嗛〉 2015-03-07 18:06:50 +08:00