Commit Graph

71 Commits (c8d91884c8b51c0a3b31aa6e2db68db36baf1da5)

Author SHA1 Message Date
ibuler c1d8de4558 合并简单 2015-04-18 16:58:16 +08:00
halcyon 75e1ea7f7d bug 2015-04-18 12:30:45 +08:00
halcyon 29d196410e Merge branch 'master' into wangyong 2015-04-16 14:34:49 +08:00
ibuler 60cb5561f0 修改move 2015-04-16 14:32:51 +08:00
halcyon 55c5230eb2 hehe 2015-04-16 14:32:48 +08:00
guanghongwei 3424bef5d0 修改bug 2015-04-15 12:07:59 +08:00
guanghongwei 3c1af0e266 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-11 12:53:22 +08:00
guanghongwei 3b00cfa97d 修改该bug 2015-04-11 12:52:17 +08:00
halcyon 9cfe6c569d hehe 2015-04-11 12:52:00 +08:00
guanghongwei ff77cc28fa 添加上传 2015-04-09 11:27:36 +08:00
guanghongwei b840db12a6 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver
Conflicts:
	jasset/views.py
	jumpserver/views.py
2015-04-08 17:38:30 +08:00
halcyon ef63fce7c4 淇敼bug锛屽疄鏃舵悳绱㈠畬鎴 2015-04-07 19:15:45 +08:00
guanghongwei bd0fd90e2d 用户详情和普通用户 2015-04-06 23:04:31 +08:00
halcyon 7de943c6e4 绠$悊鍛樹华琛ㄧ洏鍩烘湰瀹屾垚 2015-04-05 22:52:37 +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 340aaf42de 添加刷新 2015-03-27 16:34:00 +08:00
halcyon 359f70b9f9 apply 2015-03-26 18:42:52 +08:00
guanghongwei 59414dadfc 刷新sudo,sudo用户鉴权 2015-03-25 18:45:55 +08:00
guanghongwei 0c31968e3c 今天就这样吧 2015-03-23 22:57:19 +08:00
guanghongwei a2ede31ae6 鉴权开始 2015-03-15 23:23:20 +08:00
guanghongwei d1f19a5cad 修改部门显示 2015-03-14 13:15:33 +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 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
guanghongwei 8f163eb634 缁熶竴鍒嗛〉 2015-03-07 18:25:31 +08:00
guanghongwei 9a638bc856 淇敼涓浜沚ug 2015-03-07 17:37:26 +08:00
guanghongwei ac92498832 淇敼 鏉冮檺淇敼涓 submit 2015-03-07 15:28:49 +08:00
guanghongwei a94c050fd9 瀹屽伐锛岀潯瑙 2015-03-07 00:12:38 +08:00
guanghongwei 07b0e2980e 浠婂ぉ鍒版涓烘 2015-03-06 00:24:17 +08:00
guanghongwei 56f8f5d09b 修改分页 2015-02-15 10:06:02 +08:00
guanghongwei b7acef8cb0 鎺堟潈鏀跺熬宸ヤ綔 2015-02-13 00:00:07 +08:00
guanghongwei 4190b19450 淇敼鎺堟潈璇︽儏 2015-02-11 23:32:24 +08:00
guanghongwei f050866d94 主机授权更改 2015-02-11 18:38:56 +08:00
guanghongwei 97038aab37 sudo授权完成 2015-02-10 21:52:59 +08:00
guanghongwei 50208c0088 sudo授权 2015-02-10 18:53:01 +08:00
guanghongwei 8a5e494cfe 娣诲姞sudo鏉冮檺鍒犻櫎锛屼慨鏀瑰拰璇︽儏 2015-02-10 00:21:08 +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 46cc593a9e 添加权限支持搜索 2015-02-03 23:03:51 +08:00
guanghongwei 35d9be5c10 connect.py修改 2015-01-30 16:53:06 +08:00