github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,101 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

3101 Commits (f8ff223f90ba3a4ebd04d022fadd538d7eee48ff)

Author SHA1 Message Date
ibuler bbaa35c773 [Update] 修改Perms 2018-04-11 11:34:15 +08:00
ibuler 0fa8287811 Merge branch 'dev' into perms 2018-04-11 10:25:18 +08:00
ibuler 78f4e5a89a [Update] 修改用户Opt 2018-04-10 21:04:56 +08:00
ibuler 3193c5549d Merge remote-tracking branch 'github/dev' into dev 2018-04-10 21:02:36 +08:00
ibuler ed71e7d2d9 [Update] 修改用户Opt 2018-04-10 21:02:07 +08:00
ibuler 33c299566a [Update] 修复bug 2018-04-10 20:45:01 +08:00
ibuler 84634eb8c0 [Update] 修改Permr认证 2018-04-10 20:29:06 +08:00
ibuler a4ff2181c5 [Update] 修改用户view的api 2018-04-10 09:41:06 +08:00
ibuler fffa0def9e [Update] 修改api和view 2018-04-08 20:02:40 +08:00
ibuler d0ede246e7 [Update] 修改授权 2018-04-08 00:16:37 +08:00
BaiJiangJie b8b78ffeb2
Merge pull request #1162 from BaiJiangJie/dev 
创建用户发送邮件
 2018-04-06 15:50:50 +08:00
老广 d2d10b59ac
Merge pull request #1175 from jumpserver/dev 
支持sftp
 2018-04-06 13:30:05 +08:00
ibuler cb8e59edf2 [Update] 修改文案 2018-04-06 13:23:15 +08:00
ibuler 1c0d783eec [update] 添加Migrations 2018-04-06 11:36:47 +08:00
ibuler 4fa72400be Merge remote-tracking branch 'github/dev' into dev 2018-04-06 11:35:33 +08:00
ibuler 37c0062fae [Update] 添加审计模块 2018-04-06 11:27:52 +08:00
BaiJiangjie 8504c3d2fd 修复资产列表导出问题 2018-04-04 19:38:32 +08:00
老广 2d10e13057
Merge pull request #1171 from jumpserver/dev 
Dev
 2018-04-04 14:05:16 +08:00
ibuler 1d7ba3e204 [Bugfix] 修复小bug 2018-04-04 13:03:36 +08:00
ibuler d966e22cf9 [Update] 修改小bug 2018-04-04 13:01:57 +08:00
ibuler 6a88fd2d60 [Update] 修改api权限 2018-04-04 08:47:02 +08:00
BaiJiangjie b63999f385 创建用户发送邮件 2018-04-03 16:28:58 +08:00
老广 82d06351e7
Merge pull request #1158 from jumpserver/dev 
bugfix for celery log path
 2018-04-03 14:50:49 +08:00
ibuler aa8bece724 Merge branch 'ansible' into dev 2018-04-03 14:49:58 +08:00
老广 241bdff7c8
Merge pull request #1156 from jumpserver/dev 
Dev
 2018-04-03 12:18:41 +08:00
ibuler 168335a381 [Update] 更新内容 2018-04-03 12:14:58 +08:00
ibuler 121726b731 Merge remote-tracking branch 'github/dev' into dev 2018-04-03 10:44:35 +08:00
ibuler 0b812a03c6 [Bugfix] 修复 ApiUpdateAttr的bug 2018-04-03 10:36:11 +08:00
ibuler 79ae6efafb [Bugfix] 修复没有Log path引起的bug 2018-04-02 19:14:42 +08:00
老广 d2f108eeec
Merge pull request #1154 from BaiJiangJie/master 
终端管理用户显示，资产导入IP字段空格，资产导入domain字段保存
 2018-04-02 19:03:51 +08:00
BaiJiangJie c48beb10af
Merge pull request #1 from BaiJiangJie/dev 
终端管理用户，资产列表IP字段，domain保存对象
 2018-04-02 18:52:52 +08:00
老广 ea9264ec49
Merge pull request #1153 from BaiJiangJie/dev 
修复导入资产列表IP字段前后有空格问题，导入资产列表时domain保存为对象
 2018-04-02 18:43:33 +08:00
BaiJiangjie 5b65ed8a19 修复导入资产列表IP字段前后有空格问题，导入资产列表时doamin保存为对象 2018-04-02 18:32:24 +08:00
ibuler 951ac252fe [Merge] 更新ansible功能 2018-04-02 17:45:17 +08:00
ibuler 24c4e1df50 [Update] 资产，系统用户，管理用户等支持查看日志 2018-04-02 16:55:39 +08:00
ibuler d247e49b70 [Update] 修改celery位置 2018-04-02 15:54:49 +08:00
ibuler a4c843ff13 [Update] 迁移celery到ops 2018-04-02 13:19:31 +08:00
BaiJiangjie ec6103448e 使终端管理的应用用户不显示在用户组里 2018-04-02 12:02:06 +08:00
老广 0ca14463cd
Merge pull request #1147 from jumpserver/dev 
支持网域功能
 2018-04-02 10:59:55 +08:00
ibuler df80e8047a [Update] 修改日志 2018-04-01 23:45:37 +08:00
ibuler 09fc2776df [Update] Support history view 2018-03-30 22:03:43 +08:00
ibuler e4c2affb5f Merge branch 'rev' into dev 2018-03-29 15:07:49 +08:00
ibuler 6fae4d5dee [Bugfix] for some commit 2018-03-29 15:06:35 +08:00
ibuler 0c80e3e815 [rev] for api commit 2018-03-29 15:02:09 +08:00
ibuler d32f070b5c [Update] 修改Inverntoy，增加更多属性 2018-03-28 19:37:29 +08:00
ibuler b959f1f68b Merge branch 'bugfix_ip_lookup' into dev 2018-03-28 16:47:44 +08:00
ibuler e1cab35db0 [Bugfix] 修改获取城市 2018-03-28 16:47:36 +08:00
ibuler 8014cc48b6 [Update] 修改settings和缩进 2018-03-28 15:47:20 +08:00
ibuler 829f57e2d7 [Bugfix] 修复小bug 2018-03-28 14:35:27 +08:00
ibuler 5f0b4a4b63 [Update] 修改一些翻译 2018-03-28 11:28:40 +08:00