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

2567 Commits (6518ae8fa36cd3aba19ad8550e166b3e7f9da411)

Author SHA1 Message Date
ibuler d73d6e943b update user model charfield max length more than 767 bug 2017-08-31 16:04:57 +08:00
老广 eb8b02d88b Update README.md 2017-08-03 18:16:32 +08:00
老广 c8728e52d8 Update README.md 2017-08-03 18:14:36 +08:00
本杰明 8537e3e135 Update settings (#595) 
修改redis有密码无法连接bug
 2017-08-03 15:24:16 +08:00
ibuler cd1d690fd3 [Bugfix] 修复一些bug 2017-07-28 21:52:43 +08:00
中国娃 67e953902b Update utils.py (#579) 2017-07-28 20:42:16 +08:00
ibuler 5ffd1f99fd [Bugfix] 修复更新bug 2017-07-24 22:42:01 +08:00
ibuler cc1a339142 [bugfix] system user update bug 2017-07-24 21:59:55 +08:00
ibuler 1c78526f86 Fix bug 2017-07-20 07:58:16 +08:00
ibuler b0a5289a42 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2017-07-20 07:55:45 +08:00
ibuler 477d23ea37 fix some bug 2017-07-20 07:55:24 +08:00
tonygatescxp 72c2290300 Update settings.py (#515) 
修正Redis连接字符串
 2017-07-17 17:18:14 +08:00
ibuler 61014c747e Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2017-07-15 13:51:15 +08:00
ibuler b2ba1f3ca5 update requirements 2017-07-15 13:50:56 +08:00
Eli 7c154abf70 fix bug: variable i should be the host name (#538) 
fix bug: variable i is not the host name, because summary['failed'] is something like [("hostname1", "error message 1"),("hostname1", "error message 1")]
 2017-07-13 14:00:17 +08:00
ibuler d012880a90 [Bugfix] 修复bug 2017-07-13 11:46:56 +08:00
ibuler 3ce07cf969 Update README 2017-07-12 20:45:21 +08:00
ibuler 24dd7b6347 update docker config 2017-07-10 15:11:28 +08:00
ibuler 9237c9dcee Add requirements 2017-07-10 11:31:33 +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
老广 235cbe12ee Update README.md 2017-07-10 10:57:41 +08:00
Fengxu Lin 26a169d938 fix bug in pagination_range function (#511) 
start and end may be float when current_num >= 3 and display % 2 == 1
 2017-07-10 10:39:18 +08:00
ibuler 4e67749eef [Docs] 添加api dockers 2017-07-10 10:26:17 +08:00
ibuler e120fd56a6 Update readme 2017-06-19 23:48:36 +08:00
ibuler 51b9e3732f Update readme 2017-06-19 23:41:45 +08:00
ibuler f3a50610af [Update] update docker-compose 2017-06-19 23:15:09 +08:00
ibuler 4141ae517f update docker-compose 2017-06-19 18:13:44 +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
Caijun 8f4d8b1c02 Compile messages (#495) 2017-06-13 17:51:12 +08:00
Caijun b502b06e82 Support i18n for asset `platform` field (#494) 2017-06-13 16:38:33 +08:00
谢义学 7d541ee916 Dockerfile 优化 (#453) 2017-06-06 11:25:14 +08:00
njqaaa 9b14244363 fix id_dsa check error (#458) 
* fix id_dsa check error

* fix 邮件修改密码 token错误

* fix 3c8aec9 add )
 2017-06-06 11:23:39 +08:00
bdlzhx b680a42425 change sign_t return from bytes to str. (#480) 2017-06-06 11:22:29 +08:00
Caijun cf07a6ebb7 Fix judging request.user valid on UserToken API (#476) 2017-06-02 17:15:59 +08:00
njqaaa dd6c82b168 fix left's users logout (#446) 
* fix left's users logout

* fix issues 445
 2017-05-25 14:12:16 +08:00
crisewng 18169251fa [Bugfix] 修复管理用户上传私钥兼容问题 (#451) 2017-05-25 11:14:21 +08:00
ibuler 8ee1e468b8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2017-05-24 20:13:01 +08:00
ibuler 1719eee264 [Bugfix] 修复py3 bytes bug 2017-05-24 20:12:50 +08:00
老广 ae94948246 Update README.md 2017-05-24 09:49:02 +08:00
老广 f19bcc48f6 Update python_style_guide.md 2017-05-22 23:28:35 +08:00
ibuler 41633be1aa [Bugfix] 修复无法删除资产组 2017-05-22 20:30:31 +08:00
ibuler d2620a655c [Bugfix] 修复模板bug, 修复getattr bug 2017-05-22 20:18:13 +08:00
ibuler 24c1a931a5 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2017-05-22 19:56:39 +08:00
ibuler 31025b8c52 [bugfix] 修复重置密码bug 2017-05-22 19:51:54 +08:00
ibuler 25f3d5bf02 [Bugfix] 修复翻译一处bug 2017-05-22 19:48:15 +08:00
老广 e21bea6ec0 Update README.md 2017-05-22 12:31:37 +08:00
老广 0399074fcb Update README.md 2017-05-22 11:27:30 +08:00
ibuler edc631ad60 [Docker] 添加Docker compose 2017-05-20 00:19:10 +08:00