github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
2,946 Commits
71 Branches
249 Tags
114 MiB
Commit Graph

390 Commits (8dfdefd428f60d66f68ceb918e4fe8bb40992fbe)

Author SHA1 Message Date
ibuler f37b331630 Merge with dev 2018-01-23 15:13:24 +08:00
ibuler 9dbf498322 [Update] 修改copyright 2018-01-23 12:40:22 +08:00
ibuler 8e6efac6db [Update] 修改copyrite 2018-01-23 12:39:19 +08:00
ibuler 579e74dd5d [Bugfix] 修复一些bug 2018-01-23 12:22:25 +08:00
ibuler b936d54a48 [Feature] 添加es支持 2018-01-20 22:22:09 +08:00
ibuler ce9ff67b24 [Bugfix] 读取不到prefix 2018-01-17 16:18:33 +08:00
ibuler 5bbad01909 [Feature] 增加标签 2018-01-16 16:32:06 +08:00
ibuler f1ec53d1bc [Remove] labels 2018-01-16 11:26:30 +08:00
ibuler d3109a03b2 [Bugfix] 修复资产列表显示bug 2018-01-16 11:20:26 +08:00
ibuler 7e2d627d3f [Bugfix] 资产列表选择别的页会报错 2018-01-15 18:14:58 +08:00
ibuler b2f97a263d [Feature] 添加后端paging 2018-01-15 17:41:49 +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 121f56f44b [Feature] 添加setting页面 2018-01-11 20:10:27 +08:00
ibuler b49e3b8f84 [Update] api 返回platform, 并增加web terminal nav 2018-01-10 19:39:22 +08:00
ibuler 3223d3b74d [Bugfix] 修复了一些显示上的bug 2018-01-10 17:38:10 +08:00
ibuler b2b123b41e [Bugfix] 用户添加报错 2018-01-10 15:15:29 +08:00
ibuler 99cd685194 [Bugfix] 默认default cluster 2018-01-10 12:03:35 +08:00
ibuler b4080be5be [Update] 修改一些翻译 2018-01-10 00:38:21 +08:00
ibuler 22af44211d [Update] set default cluster 2018-01-09 23:33:14 +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 450a9495ec [Bug&Update] 以下bug和功能 
- 修复新建资产不选管理用户和集群异常bug
- profile下拉增加icon
- 授权api增加os和platform
 2018-01-09 13:10:28 +08:00
ibuler c0829194dc [Update] 修改一些bug, 增加执行task的按钮 2018-01-08 19:16:28 +08:00
ibuler dfaf029a68 [Bugfix] 资产导入bugfix 2018-01-08 15:51:08 +08:00
ibuler 3f1863151a [Bugfix] 修复session搜索bug 2018-01-08 15:15:21 +08:00
ibuler 676d640e70 [Bugfix] 修复导出csv和更新资产环境变量冲突 2018-01-08 14:58:07 +08:00
ibuler 07a70311df [Bugfix] 修复以下bug 
- 删除用户报错，上次更新带来的
- 管理员用户页面会看到所有主机的，而不是授权给自己的
- 授权详情页面 资产显示无效
 2018-01-08 11:22:19 +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 28223421b1 [Bugfix] 修复一下bug 
1. 添加管理用户时同名的异常
2. 添加授权规则的检查
 2018-01-05 14:36:49 +08:00
ibuler 56fd18241d [Update] 修改一些翻译 2018-01-04 09:29:54 +08:00
ibuler 239a829c20 [Bugfix] support xvdx disk 2018-01-02 14:49:52 +08:00
ibuler 3b6403b2f2 [Update] 修改一些翻译 2018-01-01 15:08:33 +08:00
ibuler c48531c586 [Update] 添加和修改部分翻译 2018-01-01 00:45:12 +08:00
ibuler 0916757eb8 [Bugfix] 修复一些bug 2017-12-31 21:51:25 +08:00
ibuler 0b299344a7 [Update] 修改database 表现 2017-12-31 12:20:08 +08:00
ibuler a755882100 [Bugfix] 修复打印中文报错异常 2017-12-30 22:26:05 +08:00
ibuler 6586bef84c [Modify] Add access log 2017-12-30 20:45:54 +08:00
ibuler e0a3fafbd5 [Bugfix] 详见trello 2017-12-30 02:29:29 +08:00
ibuler 3804ab532d [Update] 修改信号 2017-12-29 23:53:45 +08:00
ibuler 158678c2db [Bugfix] 修改bug，显示cluster 2017-12-28 18:01:15 +08:00
ibuler 69f723c8f5 [Bugfix] requirements 添加openssh-cleints 2017-12-28 16:06:07 +08:00
ibuler f992347fc5 [Update] 修改become信息 2017-12-28 14:25:56 +08:00
ibuler e20444983d [Bugfix] 修改html bug 2017-12-28 12:25:43 +08:00
ibuler 0848893f1e [Bugfix] 修复时间日期搜索的bug，select2模块自适应长度 2017-12-27 01:29:23 +08:00
ibuler 3d705dbeaa [Bugfix] 修复一些bug 2017-12-27 00:14:46 +08:00
ibuler 22b7b84a45 [Update] 修改创建默认集群，组等名称为Default 2017-12-26 22:14:37 +08:00
ibuler a39e0a1db9 [Docker] For docker update 2017-12-26 01:54:10 +08:00
ibuler d0ef1e715e [Add] Add initial migrations 2017-12-24 23:21:05 +08:00
ibuler bf9bb1b973 [Update] 修改ops task运行 2017-12-24 18:53:07 +08:00
ibuler 30efec1b09 [Update] 修改 task 运行机制 2017-12-22 21:42:12 +08:00
ibuler 4893c4664d [Update] 修改task定时运行机制 2017-12-22 02:08:29 +08:00
ibuler 76df1de634 [Bugfix] 修复一些明显的bug 2017-12-21 11:31:13 +08:00
ibuler 5a92972120 [Bugfix] 修复ops一些功能的bug 2017-12-20 11:30:15 +08:00
ibuler 3f89701b84 [Bugfix] 修复授权和资产的一部分bug 2017-12-19 19:38:09 +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 a308000d2e [Bugfix] 修改users模块一些bug 2017-12-18 18:38:30 +08:00
ibuler e1163895e2 [Update] 系统用户api允许app user获取 2017-12-16 17:21:30 +08:00
ibuler 1b6fd4d13a [Bugfix] 修改普通用户获取资产详情的bug 2017-12-16 17:16:40 +08:00
ibuler 2d0be8f996 [git status 2017-12-15 17:07:52 +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 18fbfb449d [Feature] 修改url pattern 精确匹配uuid 2017-12-12 15:45:01 +08:00
ibuler cb57002682 [Change] 去掉前端html中的hardcode 99991937 2017-12-12 14:38:51 +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 2b3551f1fc [Feature] 修改ansible和ops 2017-12-07 13:01:33 +08:00
ibuler e57121a780 [Feature] 优化Ops ansible api 2017-12-06 18:31:51 +08:00
ibuler 19051d36dc [Update] 修改一些bug 2017-12-01 17:00:55 +08:00
ibuler 7910292e0f [Feature] 修改命令上传api 2017-11-29 19:27:04 +08:00
ibuler e7f38ec894 [Change] 全部使用uuid作为主键 2017-11-23 14:08:01 +08:00
ibuler d80cbe270a [Update] 修改用户获取自己授权资产的api，和查询用户授权资产组等api的Url和结构 2017-11-23 11:26:17 +08:00
ibuler 7f9ce57318 修改 terminal上报接口和api 2017-11-14 09:44:16 +08:00
ibuler 3639b190e3 Update perm api 2017-11-01 23:23:11 +08:00
ibuler da5b9be5ca [Bugfix] Update some translation and set warning, partial fix #646 2017-09-28 20:52:33 +08:00
ibuler 5446196471 [Bugfix] #695 Asset detail add or delete system user or group mixed 2017-09-27 07:20: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 e6537699fd [Bugfix] Update asset create template bug 2017-09-13 10:09:17 +08:00
ibuler d73d6e943b update user model charfield max length more than 767 bug 2017-08-31 16:04:57 +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 cc1a339142 [bugfix] system user update bug 2017-07-24 21:59:55 +08:00
ibuler 477d23ea37 fix some bug 2017-07-20 07:55:24 +08:00
Eli 7c154abf70 fix bug: variable i should be the host name (#538) 
fix bug: variable i is not the host name, because summary['failed'] is something like [("hostname1", "error message 1"),("hostname1", "error message 1")]
 2017-07-13 14:00:17 +08:00
Eli 370cdc275a 添加一个资产，然后推送系统用户时出现（Asset实例无法序列化） (#477) 
* error while push systemuser. error while create assets with adminuser(ssh key)

* fix errors in case of config.py dose not exist.

* change sign_t return from bytes to str. (#480)

* fix id_dsa check error (#458)

* fix id_dsa check error

* fix 邮件修改密码 token错误

* fix 3c8aec9 add )

* Dockerfile 优化 (#453)
 2017-07-10 11:01:20 +08:00
ibuler 4e67749eef [Docs] 添加api dockers 2017-07-10 10:26:17 +08:00
ibuler 29095a869c [Demo] update demo mode code 2017-06-19 17:59:13 +08:00
Caijun b502b06e82 Support i18n for asset `platform` field (#494) 2017-06-13 16:38:33 +08:00
njqaaa dd6c82b168 fix left's users logout (#446) 
* fix left's users logout

* fix issues 445
 2017-05-25 14:12:16 +08:00
ibuler 1719eee264 [Bugfix] 修复py3 bytes bug 2017-05-24 20:12:50 +08:00
ibuler 41633be1aa [Bugfix] 修复无法删除资产组 2017-05-22 20:30:31 +08:00
ibuler d2620a655c [Bugfix] 修复模板bug, 修复getattr bug 2017-05-22 20:18:13 +08:00
GuangHongwei 458989328e [Bugfix] 修改bug，使用py3编程 2017-05-15 23:39:54 +08:00
ibuler 2ec0ab871a Fix form bug 2017-04-12 18:06:32 +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 071d1922d0 stash it 2017-04-10 22:55:15 +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 bcc065eb8f [Compat] compat py3 change bootstrap form to bootstrap3 2017-04-07 23:52:46 +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 92ebe85a3f [Fixture] 详情页添加system user 推送 2017-04-05 19:09:51 +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
ibuler ac3553babb [Fixture] 修改asset detail 2017-04-04 11:14:59 +08:00
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