github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,452 Commits
65 Branches
246 Tags
104 MiB
Commit Graph

4452 Commits (1c92516fd0b3ae8f8170f641dc248512171274f8)

Author SHA1 Message Date
ibuler 782bad916e Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix 2019-07-04 21:18:04 +08:00
ibuler 1472f0437f [update] 修改一些性能问题 2019-07-04 21:17:39 +08:00
八千流 1256944b96 [Bugfix] 修复删除节点bug (#2883) 2019-07-04 18:31:53 +08:00
ibuler 218e425333 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix 2019-07-04 17:29:32 +08:00
ibuler 5562a04f79 [update] 修改资产导出的permssions 2019-07-04 17:26:05 +08:00
BaiJiangJie 75409519a1 [Update] 添加翻译 2019-07-04 17:22:04 +08:00
ibuler 62689b240b Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix 2019-07-04 17:21:01 +08:00
ibuler 6f570bcbf1 [update] 修改Node无法被删除的bug 2019-07-04 17:20:42 +08:00
BaiJiangJie b5962a098a [Update] 解决select_for_update的错误 2019-07-04 17:09:36 +08:00
BaiJiangJie 371aff3251
[Update] 优化用户组列表用户显示问题 (#2882) 2019-07-04 16:44:46 +08:00
ibuler bab4326aeb [Update] 优化节点 2019-07-04 16:41:38 +08:00
ibuler dc4ee2f0fa [Update] 优化资产 2019-07-04 16:41:25 +08:00
ibuler bf9a2714d3 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix 2019-07-04 16:30:38 +08:00
ibuler 29824fb7d2 [Update] 修改user group serialzier 2019-07-04 16:30:26 +08:00
ibuler 5b1ee67820 [Update] 修改command搜索 2019-07-04 16:28:42 +08:00
八千流 3598bc79c3 [Bugfix] 修复创建用户的View,使用密码创建用户时没有校验密码规则 (#2877) 
* [Bugfix] 修复创建用户的View,使用密码创建用户时没有校验密码规则

* [Bugfix]修复小问题

* [Update] 优化创建用户和更新用户密码的校验

* [Update] 优化用户表单校验password逻辑

* [Update] 小问题
 2019-07-04 16:14:00 +08:00
八千流 17e1fe2acb [Bugfix] 修复initDataTable表格搜索栏位置错乱的问题，显示不友好问题 (#2880) 2019-07-04 16:13:05 +08:00
ibuler 858c7df86b Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix 2019-07-04 16:09:14 +08:00
ibuler 2d07eeb16b [Update] 修改去掉一些print 2019-07-04 16:08:52 +08:00
ibuler 1448d23ca6 [Update] 准备优化 asset user 2019-07-04 15:36:57 +08:00
BaiJiangJie 2eb942a947 [Update] 修改Permission响应层缓存key 2019-07-04 11:31:31 +08:00
ibuler cdbdc853ea Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix 2019-07-03 22:28:45 +08:00
ibuler c3a54a8927 [Update] 修改session 2019-07-03 22:28:20 +08:00
ibuler dfcbdb0c35 [Update] 修改command导出和搜索 2019-07-03 18:03:01 +08:00
BaiJiangJie 28ec1eb0ad
[Update] 解决用户授权资产/节点为空时，前端构建资产授权树的bug (#2874) 
* [Update] 解决用户授权资产/节点为空时，前端构建资产授权树的bug

* [Update] 如果用户授权节点为空，返回时添加空节点
 2019-07-03 16:33:21 +08:00
ibuler 5f6af8c07d [Update] 修改command列表 2019-07-03 16:29:39 +08:00
ibuler e7d600ee50 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix 2019-07-02 22:09:12 +08:00
ibuler b9f82fd0ac [Update] 优化命令记录列表 2019-07-02 22:08:50 +08:00
BaiJiangJie 186c22decd [Update] 资产授权Model模块添加导入 2019-07-02 19:30:59 +08:00
BaiJiangJie 9a20ec9c09 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix 2019-07-02 18:24:13 +08:00
ibuler 1b44172bc5 [Update] 修改migrations 2019-07-02 18:23:47 +08:00
BaiJiangJie bbf5e28571 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix 2019-07-02 18:01:20 +08:00
ibuler 7bf1555c67 [Update] 修改Minxs 2019-07-02 17:51:50 +08:00
BaiJiangJie 003601bbdd [Bugfix] 解决进入授权详情页的资产管理页面bug 2019-07-02 17:48:29 +08:00
ibuler 58182712a2 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix 2019-07-02 16:47:10 +08:00
ibuler 930eb1d2e1 [Update] 修正migrations 2019-07-02 16:45:26 +08:00
BaiJiangJie 98260b5b52 [Update] 修改用户授权资产API返回的queryset 2019-07-02 16:34:38 +08:00
BaiJiangJie 9a3065ad4c [Bugfix] 会话/命令列表中获取用户列表排除app用户 2019-07-02 16:01:45 +08:00
ibuler 79554b47d3 [Update] Merge 2019-07-02 14:19:45 +08:00
ibuler 31d2f2a799 [Update] 去掉原来批量的view 2019-07-02 14:17:56 +08:00
BaiJiangJie 1983533e76 [Bugfix] 修改校验系统用户资产动作权限的API逻辑 2019-07-02 12:44:53 +08:00
ibuler e4880a247f [Update] 修改action 2019-07-02 12:08:25 +08:00
ibuler e43da3d6e1 ipython 2019-07-02 10:51:48 +08:00
ibuler b064be3ec0 [Bugfix] 修复用户页面不走cache的bug 2019-07-01 22:09:04 +08:00
ibuler c33084421d [Update] Debug cache 2019-07-01 21:48:25 +08:00
ibuler 7f7853dbc9 Merge remote-tracking branch 'origin/bugfix' into bugfix 2019-07-01 20:02:17 +08:00
ibuler 4d3856975b [Update] 修改一些bug 2019-07-01 20:01:47 +08:00
BaiJiangJie 8905c27b86 [Update] 修改upgrouped_node key的获取（解决操作日志中出现coco/gua的问题） 2019-07-01 19:39:10 +08:00
ibuler 034fee0f75 [Update] 修改用户有权限的资产 2019-07-01 19:30:18 +08:00
ibuler d41d58e30f [Update] 修改serializer 2019-07-01 19:08:47 +08:00