174 Commits

Author	SHA1	Message	Date
ibuler	97fb2a4fe6	[Fixture] 修改index页面	2017-04-03 00:27:18 +08:00
ibuler	709552f14c	[Fixture] 添加首页	2017-04-02 18:09:40 +08:00
ibuler	135899608e	Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver	2017-03-31 18:48:11 +08:00
ibuler	61a481f427	[Fixture] 添加用户连接终端	2017-03-31 11:25:25 +08:00
ibuler	4e7b665ea8	[Change] 添加翻译，并添加用户登陆页面	2017-03-29 15:26:32 +08:00
右书僮	b34c5dde40	Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver ... # Conflicts: # apps/assets/templates/assets/asset_list.html	2017-03-27 08:03:23 +08:00
右书僮	9de2ff2052	修复idc_list删除时重新加载table	2017-03-27 07:58:35 +08:00
ibuler	49f6ed524d	Merge with master	2017-03-26 11:54:46 +08:00
ibuler	10eb13920b	[Delete] 删除资产tag	2017-03-24 14:48:18 +08:00
右书僮	e0179ea332	删除资产HTML页面中SystemUser相关内容(视图中的相关API暂时未动)	2017-03-24 11:13:40 +08:00
右书僮	c931d3179b	修复资产组更新中 用户己选择的资产项不全问题	2017-03-24 11:02:55 +08:00
右书僮	c5666f1357	fix some files	2017-03-24 10:37:05 +08:00
ibuler	b60e5a7ee3	[Change] 修改一些view	2017-03-24 00:27:33 +08:00
ibuler	c940a4c0fb	[Fixture] 增加 task list 删除按钮	2017-03-23 00:15:25 +08:00
ibuler	3f72ce4b1f	[Update] 更新生成fake数据脚本	2017-03-22 23:36:43 +08:00
ibuler	2ae57a7970	[Delete] 删除 system user一些属性	2017-03-22 22:15:15 +08:00
ibuler	610c9c5149	Pull it	2017-03-22 22:05:24 +08:00
ibuler	caec9709ef	[Fixture] 添加task list 搜索，重试	2017-03-22 21:57:05 +08:00
ibuler	0fbd9843bd	[Change] 修改runner, inventory位置	2017-03-16 00:19:47 +08:00
ibuler	915873135e	[Fixture] 添加runner run record	2017-03-14 00:58:25 +08:00
ibuler	a822f667af	[Fixture] 完成用户推送task	2017-03-09 14:55:33 +08:00
xiaokong1937@gmail.com	694899799b	trivial changes	2017-03-06 21:05:00 +08:00
ibuler	01e50d592e	完成AdHoc JMSHost JMSInventory	2017-03-05 11:38:02 +08:00
ibuler	ab62bfca7e	[Bugfix] 修改一些bug	2017-03-04 16:38:26 +08:00
ibuler	b055144908	Merge with audits	2017-03-01 15:35:11 +08:00
右书僮	dd5dd9d7e1	fixed html files	2017-02-25 23:20:20 +08:00
Webb	63fd3cfff2	fixed asset_group delete html	2017-02-25 20:18:13 +08:00
Webb	a6825ac91e	fixed asset_list html and asset_update	2017-02-25 17:25:27 +08:00
Webb	8ee9d02ffc	fixed html	2017-02-24 21:29:11 +08:00
ibuler	a79c3dd156	[Fixture] 添加command log backends, 未来支持es	2017-02-06 23:13:27 +08:00
xiaokong1937@gmail.com	8a5d0b2d92	remove unused templatetags: users_tags and common_tags	2017-01-26 20:24:50 +08:00
ibuler	0869931e67	[Bugfix] 修改了一些issue上的bug	2017-01-20 20:13:22 +08:00
ibuler	25cb47d2f5	[Change] 拆分user view为多个view	2017-01-17 16:34:47 +08:00
ibuler	87bbb6afde	[Bugfix] 修改添加系统用户view	2017-01-10 23:41:14 +08:00
ibuler	8916221bba	[Bugfix] 紧急修复url解析失败错误	2017-01-10 18:03:00 +08:00
ibuler	17657deb0e	[Bugfix] 和Master分支合并后，修复冲突，DRF 新版本要求 fields和exclude	2017-01-08 13:35:59 +08:00
ibuler	49861b6a84	Merge with master	2017-01-07 22:34:12 +08:00
ibuler	3da33a57e2	[Bugfix] 修改tab -> space, 删除system user的 as default	2017-01-07 20:17:22 +08:00
右书僮	dbdb8a58fe	资产相关API及Web	2017-01-06 20:34:24 +08:00
ibuler	70da177ed7	Update api	2016-12-29 19:17:00 +08:00
ibuler	d80fec6e60	Update some api	2016-12-28 00:28:52 +08:00
ibuler	775cd523eb	Update app terminal name to applications	2016-12-25 23:10:53 +08:00
ibuler	2707012325	Finish access key auth	2016-12-25 13:15:28 +08:00
ibuler	5b4ce709af	Add private token and change user group	2016-12-22 00:36:31 +08:00
ibuler	589b6d7cfe	update	2016-12-21 01:03:52 +08:00
ibuler	649509dec1	Change models dir	2016-12-21 00:43:52 +08:00
ibuler	a448fd02e2	merged	2016-12-20 23:07:33 +08:00
ibuler	4d71c2d1ff	修改token获取，拆分认证文件和权限文件	2016-12-20 01:19:50 +08:00
ibuler	2ab8e92bf4	Add black line	2016-12-19 23:10:16 +08:00
wangjun5	87eed2e59b	add asset tool	2016-12-15 19:55:15 +08:00