Commit Graph

30 Commits (a50d3ba69211669c1c82a62c0d7b5d31fcfffd57)

Author SHA1 Message Date
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 璧勪骇绠$悊椤甸潰寮濮嬶紝澧炲姞娣诲姞璧勪骇椤甸潰锛屼慨鏀筨ase椤甸潰绛 2015-01-05 18:21:34 +08:00
ibuler 9087b41352 淇敼 鏂囧钩鎻愪氦 2015-01-03 23:10:09 +08:00
ibuler dde0b75d17 浣跨敤 闄堟枃骞崇殑html 2015-01-03 22:24:34 +08:00