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

362 Commits (fa0ec1e7d75374b25e59ee77776c4506fe8ad28e)

Author SHA1 Message Date
guanghongwei d90b59191f ع1 2015-03-02 18:27:48 +08:00
guanghongwei 458ca42f22 未完成 2015-03-01 23:34:00 +08:00
guanghongwei a50d3ba692 头像大小导致 nav颜色中间差 2015-03-01 22:46:19 +08:00
guanghongwei fb1c17dc51 修改bug 2015-03-01 15:01:15 +08:00
guanghongwei da1beef94d Merge branch 'guanghongwei' 
Conflicts:
	jumpserver/views.py
	static/js/base.js
	templates/head_script.html
 2015-03-01 12:26:52 +08:00
guanghongwei 32ab6311ae 合并分支 2015-03-01 12:23:26 +08:00
halcyon 08410820ab 03-01 2015-03-01 12:16:14 +08:00
halcyon 3c70512d8e dashboard 2015-03-01 12:09:33 +08:00
guanghongwei 1e26543f99 添加头像 2015-02-28 23:24:10 +08:00
guanghongwei 1c96443e73 修改头像 2015-02-28 23:22:52 +08:00
guanghongwei 9bab7bf1e7 Merge branch 'guanghongwei' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	jperm/views.py
	jumpserver/views.py
 2015-02-28 21:26:23 +08:00
root cf8af114fe dashboard 2015-02-27 23:18:40 +08:00
guanghongwei f0cd064195 修改 用户左侧显示 2015-02-27 22:14:09 +08:00
halcyon 9d44bc1593 dashboard con 2015-02-27 18:48:24 +08:00
root 67c1f12086 dashboard 2015-02-26 18:02:39 +08:00
guanghongwei 56f8f5d09b ޸ķҳ 2015-02-15 10:06:02 +08:00
guanghongwei b7acef8cb0 授权收尾工作 2015-02-13 00:00:07 +08:00
root a746cab21c bug 2015-02-12 23:17:07 +08:00
halcyon b1e6699330 每日一更? 2015-02-12 18:54:40 +08:00
guanghongwei 4190b19450 修改授权详情 2015-02-11 23:32:24 +08:00
guanghongwei f050866d94 Ȩ 2015-02-11 18:38:56 +08:00
halcyon db86daf86d dashboard等 2015-02-11 17:53:17 +08:00
guanghongwei 97038aab37 sudoȨ 2015-02-10 21:52:59 +08:00
halcyon a42d053cbb 新弹窗等 2015-02-10 18:57:43 +08:00
guanghongwei 50208c0088 sudoȨ 2015-02-10 18:53:01 +08:00
guanghongwei 8a5e494cfe 添加sudo权限删除，修改和详情 2015-02-10 00:21:08 +08:00
halcyon 5f2e2a808e 添加搜索功能 2015-02-09 19:03:18 +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 c113035d3d sudo perm 2015-02-06 18:39:20 +08:00
halcyon 433974d77d 改bug 2015-02-05 18:53:57 +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
guanghongwei 70fe42f359 ޸scriptλ 2015-02-01 23:33:38 +08:00
guanghongwei 3d1df73a99 merge with wangyong 2015-02-01 23:12:57 +08:00
guanghongwei 0336bfa906 group_addʹajax 2015-02-01 23:03:28 +08:00
halcyon 6c70d5bf03 批量添加删除功能实现，修改资产添加修改等 2015-02-01 23:00:23 +08:00
halcyon 0560332768 change view 2015-01-31 13:46:55 +08:00
guanghongwei 7adbf52aeb ޸jsλ 2015-01-31 13:45:58 +08:00
root 795183c7ab remove node module from repo 2015-01-31 13:09:29 +08:00
root 4e0cd4cddf modify ignore 2015-01-31 13:06:48 +08:00
root f187a368e4 add ignore 2015-01-31 13:06:02 +08:00
root 2a645747de Merge in 20150131 2015-01-31 13:03:58 +08:00
guanghongwei deb55d3bb2 logo 2015-01-31 12:56:32 +08:00
halcyon a8991bfb14 资产修改功能强化，日志功能添加 2015-01-31 12:55:10 +08:00
guanghongwei c1fb72f393 ޸ĵ½˳ 2015-01-30 23:30:16 +08:00
guanghongwei 35d9be5c10 connect.py޸ 2015-01-30 16:53:06 +08:00