732 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
liuzheng712	c9e192fae4	recovery User's function	2015-10-07 12:17:20 +08:00
liuzheng712	cee8b2d787	rollback jumpserver/views.py 54 : user = get_object() part and delete useless 'class CustomUser'	2015-10-07 12:01:14 +08:00
liuzheng712	02218e624a	lots	2015-10-04 19:07:42 +08:00
liuzheng712	5a5928483f	lots	2015-10-04 00:53:01 +08:00
liuzheng712	11b3cee346	gitignore	2015-10-03 22:50:05 +08:00
liuzheng712	7a94724dbc	initial_data_test	2015-09-24 09:43:28 +08:00
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	960e45d0fa	添加asset_api	2015-09-09 00:19:36 +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	fd5041965b	分离juser方法	2015-08-27 00:08:45 +08:00
ibuler	33c624c76f	删除部门后	2015-08-27 00:08:20 +08:00
ibuler	913f93b91f	删除部门前	2015-08-26 23:31:32 +08:00
ibuler	c1facb939e	优化connect.py排序	2015-08-22 00:01:54 +08:00
ibuler	ad16d8b532	优化connect.py 和 api.py	2015-08-21 23:45:41 +08:00
Guang	9f0620f97e	调整User,UserGroup类	2015-08-20 23:42:27 +08:00
ibuler	9e52e6a320	modify some	2015-07-03 20:45:45 +08:00
ibuler	f3a0c390b1	connect.py base ok	2015-06-16 09:21:11 +08:00
ibuler	bb32c0480c	dev	2015-06-15 23:00:19 +08:00
ibuler	8d167baf46	modify some	2015-06-15 19:20:05 +08:00
ibuler	fdcaa358e5	modify some api.py bug	2015-06-13 00:36:10 +08:00
ibuler	5d16836b05	modify connect.py	2015-06-10 23:16:24 +08:00
ibuler	fc22677f3f	modify some	2015-06-09 23:06:32 +08:00
ibuler	e979c2753b	modify 1	2015-06-08 23:46:40 +08:00
ibuler	dcfd4e05ec	modify sudo cmd bug	2015-06-04 10:15:41 +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	bf80799fb6	modify port type	2015-05-25 17:13:08 +08:00
ibuler	38f89042ac	modify single user login bug	2015-05-25 14:16:08 +08:00
ibuler	67b2467bc9	Merge branch 'guanghongwei'	2015-05-25 10:10:49 +08:00
ibuler	345be469fa	Merge branch 'wangyong'	2015-05-25 10:07:25 +08:00
halcyon	04522c0b80	修改port字段	2015-05-25 10:03:55 +08:00
蓝枫	4a9e002440	Merge pull request #6 from losswei/master ... 修复当用户使用Ctrl+C结束进程时,没有正确退出	2015-05-22 17:24:46 +08:00
何威	6998036bdc	修复当用户使用Ctrl+C结束进程时,没有正确退出	2015-05-22 17:18:37 +08:00
ibuler	e09cb10439	modify a bug with 10.0.0.1 10.0.0.11 10.0.0.12 match problem	2015-05-18 17:22:26 +08:00
ibuler	caa318b808	modify a bug with 10.0.0.1 10.0.0.11 10.0.0.12 match problem	2015-05-18 16:40:36 +08:00
ibuler	58fd4374c7	Merge branch 'wangyong'	2015-05-15 12:01:51 +08:00
ibuler	f89d444ddf	modify requirements.txt	2015-05-15 11:53:31 +08:00
root	49bee0c3fd	修改主机添加或者修改没添加进ALL组bug	2015-05-14 18:02:20 +08:00
ibuler	00f7346578	resolve connect.py string start with g bug	2015-04-28 16:54:58 +08:00
ibuler	b1add204b6	�޸�������ʾ����	2015-04-28 15:08:28 +08:00
ibuler	6d34bd45d2	modify nav_bar_header.html	2015-04-24 20:42:15 +08:00