github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,418 Commits
72 Branches
249 Tags
113 MiB
Commit Graph

113 Commits (3a10fd4160021cc0e52dcade5657947dd79b510f)

Author SHA1 Message Date
BaiJiangjie 5b65ed8a19 修复导入资产列表IP字段前后有空格问题，导入资产列表时doamin保存为对象 2018-04-02 18:32:24 +08:00
ibuler e873be95d5 [Update] 导入到当前node 2018-03-26 16:16:18 +08:00
ibuler dbaa4ab502 [Update] 修改资产导入的事务问题 2018-03-26 15:55:31 +08:00
ibuler 7f4f67aa8d [Update] 支持网域 2018-03-23 19:46:46 +08:00
ibuler fe1862120f [Update] 删掉集群等等 2018-03-21 18:13:16 +08:00
ibuler bd4f96134f [Update] 修改一些文案 2018-03-04 13:01:33 +08:00
ibuler 9292e48554 [Bugfix] 用户csv导入编码问题 2018-02-27 12:18:36 +08:00
ibuler f1c386714d [Update]一些修改 2018-02-25 22:36:42 +08:00
ibuler 08edda35e1 [Update] 完成资产书 2018-02-25 18:08:00 +08:00
ibuler c8728cace4 [Update] 完成树形改造 2018-02-09 15:24:44 +08:00
ibuler c7296c2498 [Update] 修改系统用户推送，拆分assets的部分模块 2018-02-09 11:12:40 +08:00
ibuler f82d939d15 [Update] 使用资产树，去掉集群和资产组 2018-02-08 11:34:21 +08:00
ibuler 3bb6e08985 [Feature] 更改perms api 2018-02-07 23:25:15 +08:00
ibuler 2d3967872b [Feature] 完成资产授权和资产添加 2018-02-02 17:06:08 +08:00
ibuler 1ac30ed09c [Feature] 使用ztree 2018-01-31 12:46:33 +08:00
ibuler 3603b33a42 [Feature] 添加资产树 2018-01-31 10:46:26 +08:00
ibuler 3e62a7f5b7 [Update] 修改认证 2018-01-30 16:12:33 +08:00
ibuler 58d22b72ec [Feature] Label 删除修改 2018-01-29 16:25:30 +08:00
ibuler b2d6645f46 [Feature] 添加资产详情标签 2018-01-26 15:32:23 +08:00
ibuler cb902362b5 [Feature] 资产列表标签搜索 2018-01-26 14:47:10 +08:00
ibuler 7433327d75 [Feature] 标签管理功能 2018-01-23 19:37:22 +08:00
ibuler f37b331630 Merge with dev 2018-01-23 15:13:24 +08:00
ibuler b936d54a48 [Feature] 添加es支持 2018-01-20 22:22:09 +08:00
ibuler 5bbad01909 [Feature] 增加标签 2018-01-16 16:32:06 +08:00
ibuler 39fff235d1 [Bugfix] 修复cluster创建的bug 2018-01-14 18:02:11 +08:00
ibuler abb1a40a4f [Feature] 添加basic settings 2018-01-12 15:43:26 +08:00
ibuler b4080be5be [Update] 修改一些翻译 2018-01-10 00:38:21 +08:00
ibuler a4d02adb22 [Update] system user form add label 2018-01-09 23:14:25 +08:00
ibuler 72a82c41ee [Update] 修改 success message, 添加资产组时可以添加资产 2018-01-09 23:07:53 +08:00
ibuler 3f1863151a [Bugfix] 修复session搜索bug 2018-01-08 15:15:21 +08:00
ibuler c16471d54f [Bugfix] 资产导入中下载模板异常 2018-01-05 19:09:42 +08:00
ibuler 1888c698f1 [Bugfix] 修复一些bug 2018-01-05 17:57:02 +08:00
ibuler 3b6403b2f2 [Update] 修改一些翻译 2018-01-01 15:08:33 +08:00
ibuler 6586bef84c [Modify] Add access log 2017-12-30 20:45:54 +08:00
ibuler 3804ab532d [Update] 修改信号 2017-12-29 23:53:45 +08:00
ibuler bf9bb1b973 [Update] 修改ops task运行 2017-12-24 18:53:07 +08:00
ibuler b0eace6ad8 [Bugfix] 基本完成assets模块 2017-12-19 12:41:00 +08:00
ibuler b4e1ac1953 [Bugfix] 修复资产模块中一些bug 2017-12-18 22:48:19 +08:00
ibuler b97d5b0960 [Feature] assets task 修改 2017-12-15 15:50:15 +08:00
ibuler 08e1788426 [Feature] 打算拆分下载和上传为独立模块，时间有限暂时放弃 2017-12-14 21:27:14 +08:00
ibuler 17ddb3bbbd [Feture] 使用信号解耦 2017-12-13 17:21:08 +08:00
ibuler 722863428d [Feature] 添加context_processor 2017-12-12 14:28:12 +08:00
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码 2017-12-12 12:19:45 +08:00
ibuler cbc000696e [Feature] 修改adminuser systemuser cluster及他们的关系 2017-12-11 17:08:43 +08:00
ibuler 0c9e24dc59 [Feture] 添加ops 页面 2017-12-11 00:29:25 +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 5ffd1f99fd [Bugfix] 修复更新bug 2017-07-24 22:42:01 +08:00
ibuler 477d23ea37 fix some bug 2017-07-20 07:55:24 +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 c11374ae39 [Bugfix] 修改翻译 2017-04-07 16:59:09 +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