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

2976 Commits (b90d3306c5b0fb639fa3706b49a320ae2277c5a9)

Author SHA1 Message Date
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
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
fit2cloud-fengyi b19a0e1cdf 删除faq和久的intro 2018-03-12 10:33:55 +08:00
liuzheng b92ccdd05e
fix: update the jms-storage==0.0.11 2018-03-12 10:30:49 +08:00
fit2cloud-fengyi 34cc6abec5 Merge remote-tracking branch 'origin/docs' into docs 2018-03-12 10:28:54 +08:00
ibuler f59f03adfd [Update] 支持使用环境变量关闭定时任务 2018-03-12 10:20:23 +08:00
老广 0f2b0b146d
Update README.md 2018-03-12 09:17:34 +08:00
老广 e085fee101
Update README.md 2018-03-12 09:16:54 +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
ibuler 050b6e6d88 [Update] 修改一些docs 2018-03-09 12:12:10 +08:00
fit2cloud-fengyi 422990a992 添加 venv 到 ignore 文件 2018-03-09 10:33:57 +08:00
老广 06ff7f75ce
Merge pull request #1061 from toryzen/master 
Update step_by_step.rst
 2018-03-09 10:07:38 +08:00
toryzen 0b82b97c66
Update step_by_step.rst 
删除多余的3.2章节
 2018-03-09 10:04:59 +08:00
ibuler fcbe94de37 [Update] 更新持久化 2018-03-08 12:28:45 +08:00
老广 ce35a8e2ac
Merge pull request #1059 from jumpserver/dev 
Dev
 2018-03-08 12:11:50 +08:00
老广 bebd71895c
Merge pull request #1058 from jumpserver/docs 
Docs
 2018-03-08 12:11:04 +08:00
ibuler ea18727bdb Merge remote-tracking branch 'github/docs' into docs 2018-03-08 12:08:45 +08:00
fit2cloud-fengyi b90c5d1e43 英文格式 2018-03-08 12:00:14 +08:00
liuzheng 0be31a8078
Merge pull request #1056 from jumpserver/dev 
revert: add the old apps/users/migrations/0002_auto_20171225_1157.py
 2018-03-08 09:18:25 +08:00