Commit Graph

3010 Commits (5c17b1a7f75a6229c107f310eb0c0a175225bb02)
 

Author SHA1 Message Date
ibuler e4c2affb5f Merge branch 'rev' into dev
7 years ago
ibuler 6fae4d5dee [Bugfix] for some commit
7 years ago
ibuler 0c80e3e815 [rev] for api commit
7 years ago
ibuler d32f070b5c [Update] 修改Inverntoy,增加更多属性
7 years ago
ibuler b959f1f68b Merge branch 'bugfix_ip_lookup' into dev
7 years ago
ibuler e1cab35db0 [Bugfix] 修改获取城市
7 years ago
ibuler 8014cc48b6 [Update] 修改settings和缩进
7 years ago
ibuler 829f57e2d7 [Bugfix] 修复小bug
7 years ago
ibuler 5f0b4a4b63 [Update] 修改一些翻译
7 years ago
ibuler c5af4d47eb Merge branch 'some_auth_api' into dev
7 years ago
ibuler c37bfb682a [Update] 添加设置认证api和创建用户时可以不选择组
7 years ago
ibuler 3aaea6cc31 Merge branch 'bugfix_useradd' into dev
7 years ago
ibuler f85e5b6f75 [Bugfix] 修改添加用户的bug
7 years ago
ibuler d598571dc1 [Update] 添加一个log
7 years ago
ibuler e873be95d5 [Update] 导入到当前node
7 years ago
ibuler dbaa4ab502 [Update] 修改资产导入的事务问题
7 years ago
ibuler ac1e319cd9 [Merge] merge with vpc
7 years ago
ibuler a39424ac09 [Update] 更新jms脚本
7 years ago
ibuler 75319b99ae [Update] 更新ap请求
7 years ago
ibuler 7f4f67aa8d [Update] 支持网域
7 years ago
ibuler fe1862120f [Update] 删掉集群等等
7 years ago
ibuler 759760e7d9 [Update] 服务器可以生成用户密钥
7 years ago
老广 15b74da57c
Merge pull request #1100 from jumpserver/dev
7 years ago
ibuler 6f29cf5ddd [Update] 修改quickstart
7 years ago
ibuler 0bba840e4d Merge branch 'pubkey' into dev
7 years ago
ibuler 2156e0f51a [Update] 修改jms
7 years ago
ibuler 2fc9c04228 [Bugfix] 修复更新系统用户后关联节点丢失的问题
7 years ago
ibuler d8e614c54d [Update] 管理脚本
7 years ago
ibuler 2ab26e25cc [Update] 改为supervisor启动
7 years ago
ibuler f195b309d4 [Bugfix] 全选后编辑checkbox问题
7 years ago
ibuler 5e41c5cadc [Update] 删掉没用的脚本
7 years ago
ibuler d92d09bd80 [Update] 更新说明
7 years ago
liuzheng 227804b7ab
Update step_by_step.rst
7 years ago
liuzheng eeae989c06
Update step_by_step.rst
7 years ago
liuzheng c67a9eb845
Update quickstart.rst
7 years ago
老广 35ed881139
Merge pull request #1070 from jumpserver/dev
7 years ago
ibuler a58db9826e [Update] 升级版本号
7 years ago
老广 5250a223c3
Merge pull request #1069 from jumpserver/dev
7 years ago
ibuler 15427fb743 [Update] 还原ldap配置
7 years ago
ibuler 7874a1539c [Update] 修改配置,默认先从数据库认证
7 years ago
老广 9f23520712
Merge pull request #1068 from jumpserver/dev
7 years ago
ibuler 63f1ec839c [Update] merge with master
7 years ago
ibuler 7e087ad5c6 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 93895b6b92 [Update] 修改一些文案说明和翻译
7 years ago
q4speed 4d7fbcc49b 修复文字过长bug
7 years ago
ibuler 3822d51888 Merge branch 'docs' into dev
7 years ago
ibuler aa5187dc39 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler e9be4f51e5 [Update] 删除资产详情中的windows等测试连接
7 years ago
ibuler 496403bde0 [Update] 修改docs
7 years ago
ibuler 4f522c1cd1 [Update] docs
7 years ago