Commit Graph

2705 Commits (bd4768c14795db59df3a868371b43228ad84f9eb)

Author SHA1 Message Date
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
蓝枫 8ad37c6ce3 Update views.py
修改bug
2015-01-05 16:24:55 +08:00
halcyon ccb4876d88 修改bug 2015-01-04 11:12:38 +08:00
ibuler a4b3a07885 修改已出bug 2015-01-03 23:11:15 +08:00
ibuler 9087b41352 修改 文平提交 2015-01-03 23:10:09 +08:00
ibuler 8682d7c6ec 基于文平修改 2015-01-03 22:42:46 +08:00
ibuler dde0b75d17 使用 陈文平的html 2015-01-03 22:24:34 +08:00
ibuler a6642ab004 修改base.html 2015-01-03 20:42:20 +08:00
ibuler caabc04ffe 添加支持readline 2015-01-03 09:52:52 +08:00
ibuler f552babde6 添加facio 2015-01-02 22:08:49 +08:00
root d51287fa8b 修改base.html 2015-01-02 22:06:35 +08:00
root 2cf845ceac Merge branch 'master' of gitcafe.com:ibuler/jumpserver 2015-01-02 20:53:31 +08:00
root 55c3b06d0f 简单定制base 2015-01-02 20:53:20 +08:00
ibuler 2a2e169da5 禁用google fonts 2015-01-02 20:52:52 +08:00
ibuler 6d32e6a1a7 添加Demo皮肤设置 2015-01-02 17:43:28 +08:00
ibuler 542873159b 添加Demo皮肤设置 2015-01-02 17:40:34 +08:00
ibuler 19a9e5aa2c 添加Demo皮肤设置 2015-01-02 17:26:11 +08:00
ibuler 9c1e313472 添加Demo皮肤设置 2015-01-02 17:24:56 +08:00
ibuler d17c0bceb2 添加Demo皮肤设置 2015-01-02 17:23:59 +08:00
ibuler 8f95f11f35 添加Demo皮肤设置 2015-01-02 17:14:57 +08:00
ibuler cd9a62f40b 删除没用的css 2015-01-02 16:59:37 +08:00
ibuler bbc407660d 修改bug 2015-01-01 09:15:01 +08:00
ibuler d1358b3d4f 修改bug 2015-01-01 08:44:46 +08:00
ibuler 2eaf6d7d81 修改bug 2014-12-31 23:02:03 +08:00
ibuler 73da287c6c 优化代码 2014-12-31 22:58:37 +08:00
ibuler 9ba7ad147a 修改multi拼写错误 2014-12-31 00:11:12 +08:00
root b1e0a24184 Merge branch 'ssh_key'
Conflicts:
	connect.py
2014-12-30 23:59:27 +08:00
ibuler 894911126b 添加异常处理 2014-12-30 23:51:00 +08:00
ibuler 0b97c19862 修改bug 2014-12-30 23:22:57 +08:00
ibuler 89e2133341 serve active and user active 2014-12-30 22:52:39 +08:00
ibuler 3f4a7225b1 修改bug,增加ssh_key和普通密码登陆 2014-12-30 22:48:39 +08:00
halcyon bd9049deb6 增加批量执行命令功能 2014-12-30 22:48:18 +08:00
ibuler d316b08b6d 修改bug 2014-12-30 00:05:03 +08:00
ibuler 6c2b782964 支持ssh-key 2014-12-29 23:50:56 +08:00
ibuler cefc175790 测试固定Footer 2014-12-29 21:26:09 +08:00
ibuler d7df0fb48b 修改皮肤颜色 2014-12-29 21:23:34 +08:00
ibuler c0d1ae6afc t图片bug 2014-12-29 21:20:10 +08:00
ibuler c8c34dca29 修改地址 2014-12-29 21:16:43 +08:00
ibuler 588545c3f9 添加静态资源css,js 2014-12-28 21:52:23 +08:00
ibuler 7bfad09c49 修改bug 2014-12-28 21:49:35 +08:00
ibuler 2860f4a343 添加测试页面 2014-12-28 21:48:26 +08:00
ibuler 731196094b 添加解密时异常处理 2014-12-28 19:57:48 +08:00
root c71e685913 修改.gitigonre 2014-12-28 00:42:21 +08:00
ibuler fead462124 修改登录名和记录日志不一样的问题 2014-12-28 00:34:05 +08:00
ibuler 42d14ee1d6 修改bug 2014-12-28 00:14:10 +08:00
ibuler 1e78b65cd7 修改bug 2014-12-28 00:04:00 +08:00
root 37893bb394 修改配置文件 2014-12-27 23:57:40 +08:00
root 0744007701 添加测试 test.py 2014-12-27 23:56:16 +08:00