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

894 Commits (df80e8047af03fc266c83c623765774640492089)

Author SHA1 Message Date
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 d32f070b5c [Update] 修改Inverntoy，增加更多属性 2018-03-28 19:37:29 +08:00
ibuler c5af4d47eb Merge branch 'some_auth_api' into dev 2018-03-27 18:37:04 +08:00
ibuler c37bfb682a [Update] 添加设置认证api和创建用户时可以不选择组 2018-03-27 18:34:41 +08:00
ibuler 3aaea6cc31 Merge branch 'bugfix_useradd' into dev 2018-03-27 17:48:35 +08:00
ibuler f85e5b6f75 [Bugfix] 修改添加用户的bug 2018-03-27 17:47:53 +08:00
ibuler d598571dc1 [Update] 添加一个log 2018-03-27 16:51:27 +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 75319b99ae [Update] 更新ap请求 2018-03-25 21:47:29 +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 759760e7d9 [Update] 服务器可以生成用户密钥 2018-03-21 15:22:10 +08:00
ibuler 2fc9c04228 [Bugfix] 修复更新系统用户后关联节点丢失的问题 2018-03-19 15:32:02 +08:00
ibuler d8e614c54d [Update] 管理脚本 2018-03-19 11:26:51 +08:00
ibuler f195b309d4 [Bugfix] 全选后编辑checkbox问题 2018-03-16 10:42:53 +08:00
ibuler a58db9826e [Update] 升级版本号 2018-03-14 19:57:35 +08:00
ibuler 15427fb743 [Update] 还原ldap配置 2018-03-14 19:37:36 +08:00
ibuler 7874a1539c [Update] 修改配置，默认先从数据库认证 2018-03-14 19:33:48 +08:00
ibuler 7e087ad5c6 Merge remote-tracking branch 'github/dev' into dev 2018-03-14 18:36:22 +08:00
ibuler 93895b6b92 [Update] 修改一些文案说明和翻译 2018-03-14 18:14:37 +08:00
q4speed 4d7fbcc49b 修复文字过长bug 2018-03-14 18:01:37 +08:00
ibuler e9be4f51e5 [Update] 删除资产详情中的windows等测试连接 2018-03-14 16:19:59 +08:00
ibuler 42f297e6c4 [Update] 更新一些文案 2018-03-14 13:13:32 +08:00
ibuler 8b63961d4d [Update] 默认开启定时检测，运行失败默认log为warn 2018-03-14 12:17:48 +08:00
ibuler 2e8f5919a8 [Update] 默认关闭自动定时推送功能 2018-03-13 09:57:38 +08:00
ibuler faf6a7b623 [Update] 删掉token api调用次数限制 2018-03-12 20:29:27 +08:00
ibuler 8e4ab9f3a9 [Update] 支持获取token的用户 2018-03-12 19:39:27 +08:00
ibuler e4823a21e3 [Update] 优化部分代码 2018-03-12 18:29:06 +08:00
ibuler 634af19945 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev 2018-03-12 18:24:14 +08:00
liuzheng712 b2ae0e8f44
fix: download update 2018-03-12 17:53:22 +08:00
ibuler 4a3e5e9b22 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev 2018-03-12 16:44:10 +08:00
ibuler 43b4b7c55e [Feature] 资产节点增加批量测试可连接性和更新硬件信息 2018-03-12 11:41:12 +08:00
liuzheng b92ccdd05e
fix: update the jms-storage==0.0.11 2018-03-12 10:30:49 +08:00
ibuler f59f03adfd [Update] 支持使用环境变量关闭定时任务 2018-03-12 10:20:23 +08:00
ibuler fe03011177 [Update] 不允许添加应用程序类型的用户 2018-03-11 19:46:40 +08:00
ibuler 9ffb079c8f [Update] 增加修改system user auth 的api 2018-03-09 12:53:08 +08:00
liuzheng712 9162f4a226
revert: add the old apps/users/migrations/0002_auto_20171225_1157.py 2018-03-08 09:13:40 +08:00
ibuler 51e15b583f Merge remote-tracking branch 'origin/dev' into dev 2018-03-07 23:29:17 +08:00
ibuler f2251bbb32 [Update] index 2018-03-07 22:38:37 +08:00
liuzheng712 3c6c05f83e
fix: update 2018-03-07 22:15:17 +08:00
liuzheng712 51d7e51119
fix: AttributeError: 'SessionReplayViewSet' object has no attribute 'ACCESS_KEY' 2018-03-07 22:05:50 +08:00
liuzheng712 3c32048aa8
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev 2018-03-07 21:55:33 +08:00
liuzheng712 166a3fff5c
fix(config = settings.TERMINAL_REPLAY_STORAGE.items()): 2018-03-07 21:54:58 +08:00
ibuler 476a00d270 Merge branch 'docs' into dev 2018-03-07 21:41:08 +08:00
ibuler 88c10e851b [Update] 修改推送任务 2018-03-07 21:24:13 +08:00
ibuler 2def25cae6 [Update] 修改文档地址 2018-03-07 19:08:42 +08:00
ibuler d3fa3d63e7 [Update] 修改Model 2018-03-07 19:05:43 +08:00
ibuler 5cc43f6907 Merge remote-tracking branch 'github/dev' into dev 2018-03-07 18:10:33 +08:00