github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,251 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

3251 Commits (dded4e10fb6a62be83486f1d90f3b8a57cf2a363)

Author SHA1 Message Date
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 ac1e319cd9 [Merge] merge with vpc 2018-03-26 09:56:25 +08:00
ibuler a39424ac09 [Update] 更新jms脚本 2018-03-25 21:48:41 +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
老广 15b74da57c
Merge pull request #1100 from jumpserver/dev 
Dev
 2018-03-21 11:59:05 +08:00
ibuler 6f29cf5ddd [Update] 修改quickstart 2018-03-21 09:26:14 +08:00
ibuler 0bba840e4d Merge branch 'pubkey' into dev 2018-03-19 16:24:59 +08:00
ibuler 2156e0f51a [Update] 修改jms 2018-03-19 16:24:50 +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 2ab26e25cc [Update] 改为supervisor启动 2018-03-16 10:43:21 +08:00
ibuler f195b309d4 [Bugfix] 全选后编辑checkbox问题 2018-03-16 10:42:53 +08:00
ibuler 5e41c5cadc [Update] 删掉没用的脚本 2018-03-15 18:14:43 +08:00
ibuler d92d09bd80 [Update] 更新说明 2018-03-15 09:34:19 +08:00
liuzheng 227804b7ab
Update step_by_step.rst 2018-03-15 07:33:56 +08:00
liuzheng eeae989c06
Update step_by_step.rst 2018-03-15 07:30:32 +08:00
liuzheng c67a9eb845
Update quickstart.rst 2018-03-15 07:27:30 +08:00
老广 35ed881139
Merge pull request #1070 from jumpserver/dev 
[Update] 升级版本号
 2018-03-14 20:03:02 +08:00
ibuler a58db9826e [Update] 升级版本号 2018-03-14 19:57:35 +08:00
老广 5250a223c3
Merge pull request #1069 from jumpserver/dev 
Dev to master
 2018-03-14 19:56:04 +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
老广 9f23520712
Merge pull request #1068 from jumpserver/dev 
merge dev to master
 2018-03-14 18:39:31 +08:00
ibuler 63f1ec839c [Update] merge with master 2018-03-14 18:38:54 +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 3822d51888 Merge branch 'docs' into dev 2018-03-14 16:21:53 +08:00
ibuler aa5187dc39 Merge remote-tracking branch 'github/dev' into dev 2018-03-14 16:21:35 +08:00
ibuler e9be4f51e5 [Update] 删除资产详情中的windows等测试连接 2018-03-14 16:19:59 +08:00
ibuler 496403bde0 [Update] 修改docs 2018-03-14 16:08:27 +08:00
ibuler 4f522c1cd1 [Update] docs 2018-03-14 16:06:05 +08:00
ibuler 5c3846a886 [Update] 添加Faq 2018-03-14 15:54:27 +08:00
ibuler 42f297e6c4 [Update] 更新一些文案 2018-03-14 13:13:32 +08:00
fit2cloud-fengyi 5d88c7b779 add git install 2018-03-14 13:09:51 +08:00
ibuler 74047d19d0 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev 2018-03-14 12:18:17 +08:00
ibuler 8b63961d4d [Update] 默认开启定时检测，运行失败默认log为warn 2018-03-14 12:17:48 +08:00
liuzheng712 9c2470b67c
feat: update the sdk 2018-03-13 19:05:16 +08:00
liuzheng 240faee2b4
Update upgrade.rst 2018-03-13 14:53:23 +08:00
liuzheng 3d3d9b565a
Update upgrade.rst 2018-03-13 14:51:22 +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