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

102 Commits (ec45c56868c57a1b0b203868ed8fc04e24df84dc)

Author SHA1 Message Date
ibuler ec45c56868 [Change] 修改media地址 2017-12-21 16:04:24 +08:00
ibuler 76df1de634 [Bugfix] 修复一些明显的bug 2017-12-21 11:31:13 +08:00
ibuler 0f64d39cc5 Merge branch 'new_api' of github.com:jumpserver/jumpserver into new_api 2017-12-15 18:56:21 +08:00
liuzheng712 ef1bbc29b5 fix: update the terminal app 2017-12-13 00:34:04 +08:00
ibuler 722863428d [Feature] 添加context_processor 2017-12-12 14:28:12 +08:00
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码 2017-12-12 12:19:45 +08:00
ibuler 0c9e24dc59 [Feture] 添加ops 页面 2017-12-11 00:29:25 +08:00
ibuler a5f9735906 [Update] 更新index view 2017-12-04 20:15:47 +08:00
ibuler 61a8d95f46 [Change] Rename applications -> terminal 2017-12-01 17:28:47 +08:00
ibuler 7910292e0f [Feature] 修改命令上传api 2017-11-29 19:27:04 +08:00
ibuler 91601cce9e [Feature] Support multiple ou search 2017-10-12 14:29:00 +08:00
ibuler a4fa15a7de Update logging 2017-10-10 15:46:14 +08:00
ibuler d4ed6a97a5 [Bugfix] Update jumpserver settings 2017-10-10 14:28:32 +08:00
老广 1d950c4f49 Update settings.py 2017-09-12 17:58:09 +08:00
本杰明 8537e3e135 Update settings (#595) 
修改redis有密码无法连接bug
 2017-08-03 15:24:16 +08:00
tonygatescxp 72c2290300 Update settings.py (#515) 
修正Redis连接字符串
 2017-07-17 17:18:14 +08:00
ibuler 143cabe5fc update settings 2017-07-10 11:02:51 +08:00
Eli 370cdc275a 添加一个资产，然后推送系统用户时出现（Asset实例无法序列化） (#477) 
* error while push systemuser. error while create assets with adminuser(ssh key)

* fix errors in case of config.py dose not exist.

* change sign_t return from bytes to str. (#480)

* fix id_dsa check error (#458)

* fix id_dsa check error

* fix 邮件修改密码 token错误

* fix 3c8aec9 add )

* Dockerfile 优化 (#453)
 2017-07-10 11:01:20 +08:00
ibuler 4e67749eef [Docs] 添加api dockers 2017-07-10 10:26:17 +08:00
ibuler 29095a869c [Demo] update demo mode code 2017-06-19 17:59:13 +08:00
ibuler cda22a6f0d add demo mode middleware 2017-06-15 22:35:03 +08:00
GuangHongwei ff374b7141 [Docker] Build a docker 2017-05-17 09:42:32 +08:00
ibuler 5418d0b44c [Change] Using csv replace xlsx 2017-04-09 00:45:28 +08:00
ibuler bcc065eb8f [Compat] compat py3 change bootstrap form to bootstrap3 2017-04-07 23:52:46 +08:00
ibuler a320b9e05e [Bugfix] 兼容py3 2017-04-07 19:11:27 +08:00
ibuler b913bce398 [Bugfix] 修改翻译bug 2017-04-07 17:09:25 +08:00
ibuler c11374ae39 [Bugfix] 修改翻译 2017-04-07 16:59:09 +08:00
ibuler 92ebe85a3f [Fixture] 详情页添加system user 推送 2017-04-05 19:09:51 +08:00
ibuler 1f9dbb6bdc [Change] 修复验证码模糊度 2017-03-24 23:13:17 +08:00
ibuler b055144908 Merge with audits 2017-03-01 15:35:11 +08:00
ibuler 9c7bd7d285 [Fixture] 添加record log 2017-02-07 21:51:44 +08:00
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es 2017-02-06 23:13:27 +08:00
xiaokong1937@gmail.com 31bded8953 CAPTCHA_TEST_MODE settings and small fix 2017-01-23 12:29:36 +08:00
ibuler 9c6c6d6b4c [Feature] 添加Dockerfile 2017-01-07 20:07:33 +08:00
ibuler 92d854b971 Update api 2016-12-29 00:29:59 +08:00
ibuler 775cd523eb Update app terminal name to applications 2016-12-25 23:10:53 +08:00
ibuler 2707012325 Finish access key auth 2016-12-25 13:15:28 +08:00
ibuler 5b4ce709af Add private token and change user group 2016-12-22 00:36:31 +08:00
ibuler 4d96978b4f Merge branch 'master' into audits 2016-12-20 23:08:09 +08:00
ibuler 4d71c2d1ff 修改token获取，拆分认证文件和权限文件 2016-12-20 01:19:50 +08:00
yumaojun03 046c7e21e9 Merge remote-tracking branch 'origin/master' into ops_dev 
# Conflicts:
#	requirements.txt
 2016-12-19 23:55:54 +08:00
ibuler d8a229c09b to Commpany 2016-11-25 08:39:24 +08:00
ibuler 72ad4b44ce update bug 2016-11-24 19:36:49 +08:00
Administrator c289d6a4c5 Merge branch 'ansible_api' into ops_dev 
# Conflicts:
#	apps/jumpserver/urls.py
#	apps/locale/zh/LC_MESSAGES/django.po
#	apps/templates/_nav.html
#	requirements.txt
#	run_server.py
 2016-11-24 17:57:50 +08:00
ibuler eae580e51f Update user import and export 2016-11-24 15:45:08 +08:00
ibuler 419876b575 Update heatbeat 2016-11-13 22:34:38 +08:00
ibuler c6fc3dfe91 Update terminal interval 2016-11-11 02:13:13 +08:00
ibuler f70abec5ef Finish user detail 2016-11-10 22:06:23 +08:00
ibuler 3448f3eb0a Modify init data 2016-11-02 23:00:47 +08:00
ibuler 34a0a37b63 Add token 2016-11-01 19:31:35 +08:00