11 Commits (fd490bd685d84f0338978ff3a9e43d6da2e4ec80)

Author	SHA1	Message	Date
halcyon	75f06f9b62	bugs	2015-03-11 18:29:47 +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	67f9aad1b9	Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei ... Conflicts: docs/AddUserAsset.py	2015-03-07 15:33:06 +08:00
guanghongwei	07b0e2980e	今天到此为止	2015-03-06 00:24:17 +08:00
root	e086a03692	bug	2015-03-04 23:14:07 +08:00
guanghongwei	50fcac67c3	修改 删除等	2015-03-03 22:44:00 +08:00
guanghongwei	fc007e96d7	�޸ĺܶ�����	2015-03-03 18:42:06 +08:00
guanghongwei	4190b19450	修改授权详情	2015-02-11 23:32:24 +08:00
guanghongwei	50208c0088	sudo��Ȩ	2015-02-10 18:53:01 +08:00