46 Commits

Author	SHA1	Message	Date
ibuler	8479989ea8	更换nav ico, 修复需要登陆，登陆后跳转到登陆前页面	2015-11-17 21:41:03 +08:00
ibuler	dc547de592	修正文件目录	2015-11-17 10:27:41 +08:00
广宏伟	b8ae0ed565	some bug fix	2015-11-15 17:01:02 +08:00
liuzheng712	4d3e7d694b	lots	2015-10-28 10:55:25 +08:00
liuzheng712	5a5928483f	lots	2015-10-04 00:53:01 +08:00
liuzheng712	7a94724dbc	initial_data_test	2015-09-24 09:43:28 +08:00
ibuler	8bf9103fcf	修改资产管理	2015-09-09 00:19:17 +08:00
Guang	9f0620f97e	调整User,UserGroup类	2015-08-20 23:42:27 +08:00
ibuler	38f89042ac	modify single user login bug	2015-05-25 14:16:08 +08:00
ibuler	f89d444ddf	modify requirements.txt	2015-05-15 11:53:31 +08:00
ibuler	b1add204b6	�޸�������ʾ����	2015-04-28 15:08:28 +08:00
ibuler	8f7e1bfc38	modify readme	2015-04-20 22:55:26 +08:00
ibuler	7accf70e17	���ӽű�	2015-04-20 21:17:16 +08:00
ibuler	e2ac212fc3	resolve confilict	2015-04-20 20:56:26 +08:00
ibuler	09d3763a02	fix a bug	2015-04-20 20:54:10 +08:00
ibuler	ea37374ea5	����django 1.6	2015-04-20 18:56:30 +08:00
ibuler	a203b89ad4	Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver	2015-04-20 15:57:33 +08:00
ibuler	d84ff97019	�޸��Ƴ�bug	2015-04-20 15:56:49 +08:00
ibuler	412dadce76	version 2.0.0 beta	2015-04-20 10:12:11 +08:00
halcyon	b65f620ff7	hehe	2015-04-19 23:14:51 +08:00
ibuler	76b1bf2c39	���Խű�ȥ��ע��	2015-04-19 18:39:15 +08:00
guanghongwei	bd0fd90e2d	�û��������ͨ�û�	2015-04-06 23:04:31 +08:00
guanghongwei	2f7e7b0072	�޸�nav.html	2015-03-21 15:08:16 +08:00
halcyon	fef224459c	鉴权	2015-03-19 18:32:10 +08:00
halcyon	6759146426	bugs	2015-03-17 15:28:48 +08:00
halcyon	78dc6e5154	bugs	2015-03-14 17:54:27 +08:00
guanghongwei	d926cbdef2	merge with wangyong	2015-03-14 13:20:53 +08:00
guanghongwei	546393d9c3	��Ȩ�޸�	2015-03-11 23:46:35 +08:00
halcyon	75f06f9b62	bugs	2015-03-11 18:29:47 +08:00
guanghongwei	5c54128f8d	�޸ĺܶ�����,����������	2015-03-11 10:18:20 +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
root	0744007701	添加测试 test.py	2014-12-27 23:56:16 +08:00
ibuler	7a73bd98d3	添加测试用户	2014-12-27 17:01:08 +08:00
ibuler	aa4c02cfcd	添加测试用户	2014-12-27 16:52:31 +08:00
ibuler	0d48884e19	记录日志	2014-12-26 23:58:11 +08:00
ibuler	5e8605981b	增加开发者文档	2014-12-26 23:13:01 +08:00
ibuler	bcf3281a10	添加log models ... 添加 docs目录	2014-12-26 22:54:37 +08:00