311 Commits

Author	SHA1	Message	Date
liuzheng712	79c79432f5	usermodle	2015-09-15 23:38:06 +08:00
ibuler	d32ea9f9a1	授权管理	2015-09-11 00:04:07 +08:00
ibuler	907c2c7e97	资产修改基本完成	2015-09-10 22:51:42 +08:00
ibuler	8bf9103fcf	修改资产管理	2015-09-09 00:19:17 +08:00
ibuler	4eb78e151e	用户模块修改告一段落	2015-09-06 21:37:22 +08:00
ibuler	3efd810fe1	修改修改用户bug	2015-09-02 21:42:31 +08:00
ibuler	c21cdc2131	添加忘记密码	2015-08-31 23:04:53 +08:00
ibuler	44c69ded78	干掉ldap前	2015-08-30 14:03:10 +08:00
root	1e170714c0	修改用户添加视图	2015-08-29 00:09:36 +08:00
ibuler	10d96a9767	修改用户组视图	2015-08-28 00:33:54 +08:00
ibuler	33c624c76f	删除部门后	2015-08-27 00:08:20 +08:00
ibuler	913f93b91f	删除部门前	2015-08-26 23:31:32 +08:00
ibuler	1662269153	websocket auth add	2015-05-28 17:00:03 +08:00
ibuler	ce99bf2266	placeholder	2015-05-25 18:35:32 +08:00
ibuler	1952d1ca23	modify sudo show	2015-05-25 18:27:57 +08:00
ibuler	6d34bd45d2	modify nav_bar_header.html	2015-04-24 20:42:15 +08:00
ibuler	992947ac99	modify service.sh bug	2015-04-24 20:39:44 +08:00
ibuler	ba55cdde87	modify service.sh bug	2015-04-24 19:12:14 +08:00
ibuler	0beb683c40	Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver	2015-04-23 11:23:05 +08:00
root	b134c90bfd	解决阻断报错问题	2015-04-23 11:20:12 +08:00
ibuler	311b65da00	�޸�bug	2015-04-22 18:57:55 +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	0a8198b2ca	�޸��Ƴ�bug	2015-04-20 15:57:10 +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
ibuler	8b50e5252f	merge with wangyong	2015-04-19 18:45:07 +08:00
halcyon	86e334e4fa	last bug?	2015-04-19 18:36:41 +08:00
ibuler	d5fba23d73	������Ȩ����ҳ���������û�����ҳ���ӵ���Ȩ�б�	2015-04-19 00:23:35 +08:00
ibuler	e96053ba20	���޸�	2015-04-18 19:15:53 +08:00
ibuler	6d6e9d97b5	�޸�	2015-04-18 18:04:01 +08:00
ibuler	9ab855fd92	merge	2015-04-18 17:00:03 +08:00
ibuler	c1d8de4558	�ϲ���	2015-04-18 16:58:16 +08:00
halcyon	f19b274fcc	bug	2015-04-18 16:58:15 +08:00
ibuler	0873211d13	Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei	2015-04-18 14:02:57 +08:00
ibuler	bcc5774365	���ӳɹ�ҳ��	2015-04-18 13:52:28 +08:00
halcyon	84929840d0	bug	2015-04-18 13:51:47 +08:00
ibuler	d6171f7fe7	merge	2015-04-18 12:37:55 +08:00
halcyon	75e1ea7f7d	bug	2015-04-18 12:30:45 +08:00
ibuler	4f1b4f1947	�޸�bug	2015-04-17 22:22:21 +08:00
halcyon	a269c43d1c	优化	2015-04-16 19:03:02 +08:00
halcyon	29d196410e	Merge branch 'master' into wangyong	2015-04-16 14:34:49 +08:00
ibuler	e2e131146d	Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver	2015-04-16 14:33:55 +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	c08cee8052	�����û���������	2015-04-15 17:32:30 +08:00
guanghongwei	3424bef5d0	�޸�bug	2015-04-15 12:07:59 +08:00
halcyon	e72e30bc4e	bug	2015-04-14 21:06:19 +08:00
halcyon	3bfe0e3c16	bugs	2015-04-14 17:25:56 +08:00
halcyon	4abf25ef13	hehe	2015-04-13 21:25:43 +08:00