Commit Graph

  • af9d42695f [Update] 修改用户ViewSet序列类返回的admin_orgs(解决组织管理员登录的Bug) Bai 2020-04-10 12:38:05 +08:00
  • 422b4424fe Merge pull request #3867 from jumpserver/dev_ab BaiJiangJie 2020-04-09 23:40:18 +08:00
  • dc172e1ef0 [Update] 修复AuthBook删除失败的Bug Michael Bai 2020-04-09 23:39:17 +08:00
  • cd7946f3f0 [Update] 修改一些bug ibuler 2020-04-09 18:58:22 +08:00
  • 4994a4a387 Dev bai (#3865) BaiJiangJie 2020-04-09 13:39:11 +08:00
  • e26eba9919 Merge pull request #3864 from jumpserver/1.5.8 BaiJiangJie 2020-04-09 11:36:38 +08:00
  • 44cd82f3e1 [Update] 修改翻译 Bai 2020-04-09 10:59:00 +08:00
  • adf14b0f2e [Update] 修改版本号 Bai 2020-04-09 10:46:24 +08:00
  • f5a7c4131d [Update] 修改校验join session的url-name Bai 2020-04-09 10:43:25 +08:00
  • e7031d0ac1 [Update] 修改serailizer mixin ibuler 2020-04-09 10:33:20 +08:00
  • ef27188f86 [Update] 修改Bug: CommandViewSet的Option方法Error Bai 2020-04-08 18:08:22 +08:00
  • a7734812fc Merge pull request #3860 from jumpserver/1.5.8_bai BaiJiangJie 2020-04-08 01:35:16 +08:00
  • fb62fbde6c [Update] 命令记录导出: 只导出满足搜索条件的数据 Michael Bai 2020-04-08 01:34:10 +08:00
  • 521f4ea86b Merge pull request #3857 from jumpserver/1.5.8_bai BaiJiangJie 2020-04-07 12:32:54 +08:00
  • e9827c8b25 [Update] 添加会话加入校验API Bai 2020-04-07 12:26:47 +08:00
  • 29b099efc0 [Update] 添加加入会话按钮 Bai 2020-04-02 19:45:56 +08:00
  • e9fc56c056 [Update] 修改日志日期显示问题 Bai 2020-04-02 16:02:51 +08:00
  • e9103ee608 [Update] 对自定义MetaDict字段值进行strip Bai 2020-04-02 15:14:30 +08:00
  • f8dae2a3c9 [Update] 时区允许设置 ibuler 2020-04-01 17:27:32 +08:00
  • 52c6244b2b Merge pull request #3842 from jumpserver/dev BaiJiangJie 2020-03-28 21:36:54 +08:00
  • 7977294c5c Merge pull request #3841 from jumpserver/dev BaiJiangJie 2020-03-28 21:36:09 +08:00
  • e1331084e5 Merge pull request #3840 from jumpserver/dev_readme BaiJiangJie 2020-03-28 21:35:23 +08:00
  • 5268c0faae [Update] OpenID登录成功后,如果用户没有email字段则构造默认的email Michael Bai 2020-03-28 21:34:17 +08:00
  • b2d9b69874 [Update] 修改readme Michael Bai 2020-03-28 21:26:27 +08:00
  • 336589af98 Merge pull request #3836 from jumpserver/1.5.8_cap BaiJiangJie 2020-03-27 11:28:39 +08:00
  • 5087c0e06f Merge branch 'dev' into 1.5.8_cap Bai 2020-03-27 11:26:09 +08:00
  • 43ecd39d0e Merge pull request #3835 from jumpserver/dev BaiJiangJie 2020-03-27 11:09:09 +08:00
  • 209b23c5ce Merge pull request #3834 from jumpserver/dev_req BaiJiangJie 2020-03-27 11:08:42 +08:00
  • 7e7d4401e6 [Update] 修改依赖jms-storage==0.0.28 Bai 2020-03-27 11:07:50 +08:00
  • b4c3471d2c Merge pull request #3833 from jumpserver/dev BaiJiangJie 2020-03-27 10:48:09 +08:00
  • f4a822062f Merge pull request #3829 from jumpserver/dev_bai BaiJiangJie 2020-03-26 13:13:35 +08:00
  • 4583beaec0 [Update] 创建AuthBook对象的方法从ModelManager中移动到Model中,保留原生的对象create方法;同时添加事务处理; Bai 2020-03-26 13:11:38 +08:00
  • 42a6feb35e Merge pull request #3822 from jumpserver/dev_lock BaiJiangJie 2020-03-24 23:20:38 +08:00
  • 4503df910d [Update] 优化创建AuthBook逻辑;添加锁机制(基于redis-lock); Bai 2020-03-24 18:40:20 +08:00
  • a09b0c6c06 Merge pull request #3818 from jumpserver/dev_bai BaiJiangJie 2020-03-24 08:57:45 +08:00
  • 55c7e06185 [Update] 修改任务执行日期显示本地时间 Michael Bai 2020-03-24 01:37:09 +08:00
  • a95a0da6f7 Merge pull request #3816 from jumpserver/dev 老广 2020-03-23 17:56:45 +08:00
  • 0fd43f48f0 [Bugfix] 修复因数据不支持timezone引起的仪表盘数据为空的bug ibuler 2020-03-23 17:55:28 +08:00
  • dffd05cd20 [Update] 修改组织获取优先级 ibuler 2020-03-23 10:52:26 +08:00
  • 681046119d Merge pull request #3811 from jumpserver/dev BaiJiangJie 2020-03-23 03:22:00 +08:00
  • b19c49da41 Merge pull request #3810 from jumpserver/dev_bai BaiJiangJie 2020-03-23 03:20:30 +08:00
  • cc31c04b5f [Update] 升级依赖 Michael Bai 2020-03-23 03:15:51 +08:00
  • 89f62d8e6b [Update] 更新翻译 Michael Bai 2020-03-23 03:06:53 +08:00
  • 41b73c3701 [Update] 修改提示播放器下载地址 Michael Bai 2020-03-23 03:02:22 +08:00
  • cff3a790ef Merge pull request #3809 from jumpserver/dev_bai BaiJiangJie 2020-03-23 02:50:06 +08:00
  • 8328edd69c [Update] 修改Node generate fake时死循环的问题 Michael Bai 2020-03-23 02:32:24 +08:00
  • 9bf5d6dd45 [Update] 用户profile中添加orgs ibuler 2020-03-20 18:21:27 +08:00
  • ac9a0c6d26 Merge pull request #3803 from jumpserver/dev BaiJiangJie 2020-03-20 17:55:38 +08:00
  • 064cb16d25 [Update] 禁用ansible连接复用 ibuler 2020-03-20 16:45:38 +08:00
  • f89b1fd44b Merge pull request #3798 from jumpserver/dev BaiJiangJie 2020-03-19 16:28:34 +08:00
  • b25096925b [Bugfix] 修复重置并下载ssh key的bug ibuler 2020-03-19 16:28:08 +08:00
  • e8ff576324 Merge pull request #3797 from jumpserver/dev BaiJiangJie 2020-03-19 15:43:44 +08:00
  • 5ac1467564 [Update] 修复收藏数量不对的问题 ibuler 2020-03-19 15:41:41 +08:00
  • 1c54e5acd8 Merge pull request #3796 from jumpserver/dev BaiJiangJie 2020-03-19 14:26:23 +08:00
  • b8d0272e37 [Update] 修改测试系统用户显示 ibuler 2020-03-19 11:47:39 +08:00
  • 0b7a90b83c Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-03-19 11:13:34 +08:00
  • 7cf000262d [Update] django cas ng 退出逻辑有问题,暂时屏蔽 ibuler 2020-03-19 11:11:18 +08:00
  • fa7e0d84f9 Merge pull request #3794 from jumpserver/dev_bai BaiJiangJie 2020-03-19 10:27:26 +08:00
  • 98f6d0146c [Update] 修改批量移除节点时不选择节点给出提示信息 Bai 2020-03-19 10:21:19 +08:00
  • d0fac3f838 [Bugfix] 修复task 列表、 ibuler 2020-03-18 19:58:08 +08:00
  • a41988d2b5 [Bugfix] 修改配置文件,支持cas proxy ibuler 2020-03-18 19:10:27 +08:00
  • b801d2f2e9 Update README.md BaiJiangJie 2020-03-18 17:16:53 +08:00
  • 6bed9210dd Merge pull request #3793 from jumpserver/dev_bai BaiJiangJie 2020-03-18 17:15:15 +08:00
  • eac4630272 [Update] 修改readme2 Bai 2020-03-18 17:14:21 +08:00
  • 11a0d72b01 Merge pull request #3792 from jumpserver/dev_readme BaiJiangJie 2020-03-18 17:09:21 +08:00
  • 7dcd04ca1a [Update] 修改readme Bai 2020-03-18 17:03:49 +08:00
  • ccfb151fb1 Merge pull request #3791 from jumpserver/dev_version BaiJiangJie 2020-03-18 16:43:12 +08:00
  • ae98eee0c7 [Update] 更新版本号 Bai 2020-03-18 16:34:37 +08:00
  • 829a4406a2 Merge pull request #3790 from jumpserver/dev_bai BaiJiangJie 2020-03-18 14:04:14 +08:00
  • 91c42e8530 [Update] 修改执行task时切换root组织2 Bai 2020-03-18 14:02:36 +08:00
  • 250acea751 Merge pull request #3789 from jumpserver/dev_bai BaiJiangJie 2020-03-18 13:49:04 +08:00
  • 00d9f71384 [Update] 修改执行task时切换root组织 Bai 2020-03-18 13:45:49 +08:00
  • ffce909ee3 Merge pull request #3783 from jumpserver/bugfix BaiJiangJie 2020-03-18 11:05:51 +08:00
  • 0e62ea787c Merge pull request #3785 from jumpserver/login_image_2 BaiJiangJie 2020-03-18 10:44:55 +08:00
  • cedb862420 [Fix] 修改登录图片亮度 jym503558564 2020-03-17 17:28:53 +08:00
  • a6054ff6a5 [Update] 修复批量删除资产,当待删除数量和资产总数相等时,提示删除失败。 Bai 2020-03-17 17:06:59 +08:00
  • a67b445026 [Update] 修复录像存储ceph的help_text Bai 2020-03-17 16:15:37 +08:00
  • 8d33990050 Merge pull request #3782 from jumpserver/login_image_2 BaiJiangJie 2020-03-17 15:32:18 +08:00
  • 516e75cbf4 [Fix] 修改登录界面LOGO jym503558564 2020-03-17 15:30:59 +08:00
  • 15ca775005 [Update] 删除推送系统用户时关于task的log Bai 2020-03-17 15:21:12 +08:00
  • 41ca43bf33 Merge branch 'bugfix' of https://github.com/jumpserver/jumpserver into bugfix Bai 2020-03-17 15:02:56 +08:00
  • c6a604fd5f [Update] 修复显示创建者字段值的问题 Bai 2020-03-17 15:02:44 +08:00
  • 8e84efb296 [Update] 修改一些文案和翻译 ibuler 2020-03-17 13:51:41 +08:00
  • caee286973 [Update] 修改华为云始终有效的bug ibuler 2020-03-17 10:59:49 +08:00
  • 672b82c3d6 [Bugfix] 修复可能无法找到command execution的bug ibuler 2020-03-16 19:24:48 +08:00
  • 55554a025f [Bugfix] 修复动态系统用户更新用户时无法推送的bug, 修复通过relation api无法触发m2m_change的bug ibuler 2020-03-16 19:15:29 +08:00
  • c91ce2b99f [Bugfix] 修复动态系统用户返回auth info的bug ibuler 2020-03-16 16:59:45 +08:00
  • 02a901467b [Bugfix] 修复动态系统用户登录windows的bug ibuler 2020-03-16 16:13:54 +08:00
  • 00b3c7c945 [Bugfix] 修复动态系统用户执行批量命令的bug ibuler 2020-03-16 15:23:15 +08:00
  • 2f9598ba49 [Update] 修复ops task中任务某版本任务的bug ibuler 2020-03-16 14:41:24 +08:00
  • 3138abb00c [Bugfix] 修复ops列表任务无法删除的bug ibuler 2020-03-16 14:18:29 +08:00
  • 3afb8647bd Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-03-13 13:57:42 +08:00
  • 0682f4fc90 [Update] 修改readme ibuler 2020-03-13 13:57:21 +08:00
  • 44ec69fdbd Merge pull request #3775 from jumpserver/dev_bai BaiJiangJie 2020-03-13 12:36:40 +08:00
  • 04945809a5 [Update] 修改只有local用户需要发送创建成功邮件、发送密码过期邮件; Bai 2020-03-13 12:33:09 +08:00
  • e38b113d7e Merge pull request #3771 from jumpserver/dev_trans BaiJiangJie 2020-03-12 19:05:50 +08:00
  • eb448dc3f2 [Update] 更新翻译 Bai 2020-03-12 19:00:22 +08:00
  • 954a97bba7 Merge pull request #3770 from jumpserver/dev_req BaiJiangJie 2020-03-12 16:34:33 +08:00
  • 41e03c629f [Update] 更新依赖jms-storage=0.0.27 Bai 2020-03-12 16:33:33 +08:00
  • 1fd2e782f8 1.5.7 Merge to dev (#3766) 老广 2020-03-12 16:24:38 +08:00