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 42e4c64d06 [Bugfix] 修复一些bug 2017-02-11 12:13:02 +08:00
xiaokong1937@gmail.com 548d7ef99a fix #13;fix `user` context conflict problem in user-detail page 2017-02-09 21:19:49 +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 fe01f92545 user profile: update ssh pk 2017-02-03 13:37:05 +08:00
xiaokong1937@gmail.com 8a5d0b2d92 remove unused templatetags: users_tags and common_tags 2017-01-26 20:24:50 +08:00
xiaokong1937@gmail.com f3647ea46d user-profile page 2017-01-25 21:19:16 +08:00
xiaokong1937@gmail.com 31bded8953 CAPTCHA_TEST_MODE settings and small fix 2017-01-23 12:29:36 +08:00
xiaokong1937@gmail.com 3f7cb4a458 ignore windows bat files 2017-01-23 10:52:59 +08:00
ibuler 0869931e67 [Bugfix] 修改了一些issue上的bug 2017-01-20 20:13:22 +08:00
ibuler 948214cacb Merge branch 'audits' 2017-01-20 14:00:11 +08:00
ibuler df94d11f53 [Fix] 修改一些api bug 2017-01-20 13:59:53 +08:00
ibuler ffed28c9c7 [Change] 修改perm的代码， 强制79个字符内 2017-01-17 17:11:01 +08:00
ibuler 25cb47d2f5 [Change] 拆分user view为多个view 2017-01-17 16:34:47 +08:00
wangfeng7399 0979480103 update dockerfile 2017-01-13 15:43:51 +08:00
王胜辉 dc4c37afb6 Update README.md 2017-01-13 07:30:23 +00:00
ibuler 87bbb6afde [Bugfix] 修改添加系统用户view 2017-01-10 23:41:14 +08:00
ibuler 8916221bba [Bugfix] 紧急修复url解析失败错误 2017-01-10 18:03:00 +08:00
ibuler 8658675f67 [Bugfix] 重命名applications导致api请求content_type不对 2017-01-09 23:12:32 +08:00
ibuler be3f94d86c [BugFix] 修改requirements添加新的库 2017-01-09 01:58:23 +08:00
ibuler 17657deb0e [Bugfix] 和Master分支合并后，修复冲突，DRF 新版本要求 fields和exclude 2017-01-08 13:35:59 +08:00
ibuler 49861b6a84 Merge with master 2017-01-07 22:34:12 +08:00
ibuler 3da33a57e2 [Bugfix] 修改tab -> space, 删除system user的 as default 2017-01-07 20:17:22 +08:00
ibuler 9c6c6d6b4c [Feature] 添加Dockerfile 2017-01-07 20:07:33 +08:00
右书僮 dbdb8a58fe 资产相关API及Web 2017-01-06 20:34:24 +08:00
ibuler b670259ab6 Modify terminal reqject templatte 2017-01-03 00:11:44 +08:00
ibuler 0907f5021e Finish form ajax submmit 2016-12-30 22:21:50 +08:00
ibuler 301e02bcd8 Update some api 2016-12-30 00:19:47 +08:00
ibuler 70da177ed7 Update api 2016-12-29 19:17:00 +08:00
ibuler 92d854b971 Update api 2016-12-29 00:29:59 +08:00
ibuler d80fec6e60 Update some api 2016-12-28 00:28:52 +08:00
广宏伟 4c06257070 Update README.md 2016-12-27 23:44:05 +08:00
ibuler d56f030dc4 Finish terminal accept 2016-12-27 00:59:52 +08:00
ibuler 775cd523eb Update app terminal name to applications 2016-12-25 23:10:53 +08:00
ibuler a8fa4d2f0c update terminal regist 2016-12-25 17:44:39 +08:00
ibuler 2707012325 Finish access key auth 2016-12-25 13:15:28 +08:00
ibuler c5ab49c515 Finish access key auth 2016-12-25 13:15:19 +08:00
ibuler fe17bec752 Add access key auth 2016-12-22 01:07:05 +08:00
ibuler 5b4ce709af Add private token and change user group 2016-12-22 00:36:31 +08:00
ibuler 875aaa0029 update user model for create application user 2016-12-21 01:17:36 +08:00
ibuler 589b6d7cfe update 2016-12-21 01:03:52 +08:00
ibuler 649509dec1 Change models dir 2016-12-21 00:43:52 +08:00
ibuler 4d96978b4f Merge branch 'master' into audits 2016-12-20 23:08:09 +08:00
ibuler 81ec121918 Merge branch 'master' of code.jumpserver.org:jumpserver/jumpserver 2016-12-20 23:07:57 +08:00
ibuler a448fd02e2 merged 2016-12-20 23:07:33 +08:00
ibuler 96d32f2e3e prepare merge ops 2016-12-20 23:06:27 +08:00
ibuler 4d71c2d1ff 修改token获取，拆分认证文件和权限文件 2016-12-20 01:19:50 +08:00
广宏伟 6ef33eb0c3 Merge branch 'ops_dev' into 'master' 
Ops dev

See merge request !1
 2016-12-19 23:58:49 +08:00
yumaojun03 046c7e21e9 Merge remote-tracking branch 'origin/master' into ops_dev 
# Conflicts:
#	requirements.txt
 2016-12-19 23:55:54 +08:00
yumaojun03 47d87e38a6 补充task需要的一些接口 2016-12-19 23:46:03 +08:00