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

51 Commits (7de943c6e4376a83dfb177361689b6ad085df13e)

Author SHA1 Message Date
halcyon 7de943c6e4 管理员仪表盘基本完成 2015-04-05 22:52:37 +08:00
halcyon 6e976b0583 0406 2015-04-04 12:47:07 +08:00
halcyon e1b9134d7f 0402 2015-04-01 18:58:10 +08:00
halcyon 359f70b9f9 apply 2015-03-26 18:42:52 +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
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
guanghongwei a2ede31ae6 Ȩʼ 2015-03-15 23:23:20 +08:00
halcyon 78dc6e5154 bugs 2015-03-14 17:54:27 +08:00
guanghongwei b2c72221f7 2015-03-13 23:46:38 +08:00
guanghongwei a7800b9a7a Ȩ޹ 2015-03-13 00:09:18 +08:00
guanghongwei 475501595e ҳ 2015-03-12 18:43:17 +08:00
guanghongwei 546393d9c3 Ȩ޸ 2015-03-11 23:46:35 +08:00
guanghongwei ae0c28ef8f 2015-03-11 17:59:15 +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 修改一些bug 2015-03-07 17:37:26 +08:00
guanghongwei 07b0e2980e 今天到此为止 2015-03-06 00:24:17 +08:00
guanghongwei d90b59191f ع1 2015-03-02 18:27:48 +08:00
halcyon 08410820ab 03-01 2015-03-01 12:16:14 +08:00
guanghongwei f050866d94 Ȩ 2015-02-11 18:38:56 +08:00
halcyon db86daf86d dashboard等 2015-02-11 17:53:17 +08:00
halcyon c84f124511 bug 2015-02-09 19:02:25 +08:00
guanghongwei d7de3edcf4 sudo޸Ȩ 2015-02-09 18:50:21 +08:00
guanghongwei b9e2c9aa95 修改sudo授权 2015-02-09 08:40:54 +08:00
guanghongwei 75979e3999 修改sudo授权 2015-02-07 00:07:07 +08:00
guanghongwei 121b76284a Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	static/js/base.js
	templates/head_script.html
 2015-02-03 23:15:22 +08:00
guanghongwei 46cc593a9e Ȩ֧ 2015-02-03 23:03:51 +08:00
halcyon de58e92df9 添加组修改，组内删除主机并不删除真实机 2015-02-03 22:45:51 +08:00
halcyon 6c70d5bf03 批量添加删除功能实现，修改资产添加修改等 2015-02-01 23:00:23 +08:00
root 2a645747de Merge in 20150131 2015-01-31 13:03:58 +08:00
guanghongwei c1fb72f393 ޸ĵ½˳ 2015-01-30 23:30:16 +08:00
guanghongwei b4006d3d36 perm edit޸ 2015-01-29 00:53:15 +08:00
halcyon 173f520929 添加idc和主机组合并 2015-01-26 23:32:52 +08:00
guanghongwei df82c17c1c ޸nav perm_host 2015-01-24 14:48:29 +08:00
guanghongwei 1ea63bf3d0 ޸Ȩweb 2015-01-24 14:36:58 +08:00
halcyon 1a266f0b19 菜单active bug 2015-01-24 13:54:08 +08:00
halcyon 449bde4b03 菜单active 2015-01-24 12:13:49 +08:00
ibuler 98061f9dce 修改bug 2015-01-22 00:17:12 +08:00
ibuler f73f349153 修改nav.html 2015-01-21 23:23:44 +08:00
halcyon acf508f074 资产管理页面基本完成. 2015-01-11 19:27:21 +08:00
ibuler 9e32964382 修改bug and 睡觉 2015-01-08 00:07:00 +08:00
halcyon 0ed0853489 完善资产添加和查看资产页面 2015-01-07 18:35:09 +08:00
ibuler f497003948 修改content 2015-01-05 22:35:25 +08:00
ibuler 02ef9c687c Merge remote-tracking branch 'origin/master' 
Conflicts:
	jumpserver/urls.py
	templates/nav.html
 2015-01-05 21:25:14 +08:00
ibuler a184ae9888 添加测试 useradd 2015-01-05 21:20:09 +08:00
halcyon 7a86ba0b51 资产管理页面开始，增加添加资产页面，修改base页面等 2015-01-05 18:21:34 +08:00
ibuler 9087b41352 修改 文平提交 2015-01-03 23:10:09 +08:00