jumpserver

Author	SHA1	Message	Date
ibuler	cbc000696e	[Feature] 修改adminuser systemuser cluster及他们的关系	2017-12-11 17:08:43 +08:00
ibuler	18fd04d63c	[Stash] Test case 通不过，import error	2017-12-08 10:15:27 +08:00
ibuler	27a1849b1d	[Change] 修改idc => cluster	2017-12-07 16:25:50 +08:00
ibuler	7f9ce57318	修改 terminal上报接口和api	2017-11-14 09:44:16 +08:00
ibuler	0f9ae9efbb	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	2017-09-25 22:15:42 +08:00
ibuler	4aef5b8229	[Bugfix] export asset pof error when none of assets	2017-09-25 22:15:22 +08:00
Caijun	43a0c4fe51	Fix importing csv bugs (#717 ) * Fix exporting csv bugs 1. auto detect the encoding of csv 2. if id in csv is empty, let it equal 0 3. if hostname exists, give up this asset * Add chardet to requirements.txt	2017-09-24 09:16:47 +08:00
ibuler	cd1d690fd3	[Bugfix] 修复一些bug	2017-07-28 21:52:43 +08:00
ibuler	695e4da85e	[Fixture] 完成批量更新	2017-04-12 11:50:15 +08:00
ibuler	2aa9aafdf6	[Change] Bulk update asset	2017-04-11 17:29:53 +08:00
ibuler	95e64d7809	[Change] 修改导出和更新逻辑	2017-04-09 17:59:14 +08:00
ibuler	5418d0b44c	[Change] Using csv replace xlsx	2017-04-09 00:45:28 +08:00
ibuler	a320b9e05e	[Bugfix] 兼容py3	2017-04-07 19:11:27 +08:00
ibuler	be09db059d	Update some bug	2017-04-04 21:47:58 +08:00
ibuler	5a5d5bdd51	[Fixture] 添加更新硬件信息api	2017-04-04 19:16:34 +08:00
ibuler	992af0f1cb	[Fixture] 拆分asset view	2017-04-04 11:37:52 +08:00

1 2