github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3460 Commits
69 Branches
244 Tags
132 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f87e08efff'
${ noResults }
Commit Graph

491 Commits (f87e08efffb9095971692c60e898ac2489d47c55)

Author SHA1 Message Date
ibuler 26607bc327 [Copyright] 修改copyrite
7 years ago
ibuler e7f38ec894 [Change] 全部使用uuid作为主键
7 years ago
ibuler 7f9ce57318 修改 terminal上报接口和api
7 years ago
ibuler 3639b190e3 Update perm api
7 years ago
ibuler 034f0a02b1 Update terminal api
7 years ago
ibuler 0db8482873 Update ldap auth
7 years ago
ibuler 8bccaa6ee2 Update issue template
7 years ago
ibuler 2ae3bec335 [Bugfix] Change user public key length to 5000, fixed #631
7 years ago
ibuler da5b9be5ca [Bugfix] Update some translation and set warning, partial fix #646
7 years ago
管宜尧 290872dcad bugfix: 解决用户失效时间为空时，无法使用密码进行ssh登录跳板机的问题 (#659)
7 years ago
ibuler cd1d690fd3 [Bugfix] 修复一些bug
7 years ago
中国娃 67e953902b Update utils.py (#579)
7 years ago
ibuler 1c78526f86 Fix bug
7 years ago
ibuler d012880a90 [Bugfix] 修复bug
7 years ago
Eli 370cdc275a 添加一个资产，然后推送系统用户时出现（Asset实例无法序列化） (#477)
7 years ago
ibuler 4e67749eef [Docs] 添加api dockers
7 years ago
ibuler 29095a869c [Demo] update demo mode code
8 years ago
njqaaa 9b14244363 fix id_dsa check error (#458)
8 years ago
Caijun cf07a6ebb7 Fix judging request.user valid on UserToken API (#476)
8 years ago
ibuler 41633be1aa [Bugfix] 修复无法删除资产组
8 years ago
ibuler d2620a655c [Bugfix] 修复模板bug, 修复getattr bug
8 years ago
ibuler edc631ad60 [Docker] 添加Docker compose
8 years ago
GuangHongwei 458989328e [Bugfix] 修改bug，使用py3编程
8 years ago
ibuler 2ec0ab871a Fix form bug
8 years ago
ibuler 695e4da85e [Fixture] 完成批量更新
8 years ago
ibuler 071d1922d0 stash it
8 years ago
ibuler 95e64d7809 [Change] 修改导出和更新逻辑
8 years ago
ibuler 5418d0b44c [Change] Using csv replace xlsx
8 years ago
ibuler bcc065eb8f [Compat] compat py3 change bootstrap form to bootstrap3
8 years ago
ibuler a320b9e05e [Bugfix] 兼容py3
8 years ago
ibuler c11374ae39 [Bugfix] 修改翻译
8 years ago
ibuler 92ebe85a3f [Fixture] 详情页添加system user 推送
8 years ago
ibuler ac3553babb [Fixture] 修改asset detail
8 years ago
ibuler 709552f14c [Fixture] 添加首页
8 years ago
ibuler 66a2262ee9 [Fixture] 增加 asset groups assets api
8 years ago
ibuler 067426d5e0 [Fixture] 完成用户向导页
8 years ago
ibuler 7720e9f3fd [Change] 修改图片
8 years ago
ibuler 61a481f427 [Fixture] 添加用户连接终端
8 years ago
ibuler 3fa5ce5404 [Fixture] 添加用户信息更改
8 years ago
ibuler 0983f294b7 [Fixture] 添加用户profile
8 years ago
ibuler 4e7b665ea8 [Change] 添加翻译，并添加用户登陆页面
8 years ago
ibuler ab62bfca7e [Bugfix] 修改一些bug
8 years ago
ibuler 695dc96ce8 Merge branch 'audits'
8 years ago
ibuler 9518672ad2 Add
8 years ago
ibuler b055144908 Merge with audits
8 years ago
xiaokong1937@gmail.com 548d7ef99a fix #13;fix `user` context conflict problem in user-detail page
8 years ago
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es
8 years ago
xiaokong1937@gmail.com fe01f92545 user profile: update ssh pk
8 years ago
xiaokong1937@gmail.com 8a5d0b2d92 remove unused templatetags: users_tags and common_tags
8 years ago
xiaokong1937@gmail.com f3647ea46d user-profile page
8 years ago
ibuler 0869931e67 [Bugfix] 修改了一些issue上的bug
8 years ago
ibuler df94d11f53 [Fix] 修改一些api bug
8 years ago
ibuler ffed28c9c7 [Change] 修改perm的代码， 强制79个字符内
8 years ago
ibuler 25cb47d2f5 [Change] 拆分user view为多个view
8 years ago
ibuler 8916221bba [Bugfix] 紧急修复url解析失败错误
8 years ago
ibuler 17657deb0e [Bugfix] 和Master分支合并后，修复冲突，DRF 新版本要求 fields和exclude
8 years ago
ibuler 9c6c6d6b4c [Feature] 添加Dockerfile
8 years ago
ibuler b670259ab6 Modify terminal reqject templatte
8 years ago
ibuler 301e02bcd8 Update some api
8 years ago
ibuler 70da177ed7 Update api
8 years ago
ibuler 92d854b971 Update api
8 years ago
ibuler d80fec6e60 Update some api
8 years ago
ibuler d56f030dc4 Finish terminal accept
8 years ago
ibuler 775cd523eb Update app terminal name to applications
8 years ago
ibuler a8fa4d2f0c update terminal regist
8 years ago
ibuler 2707012325 Finish access key auth
8 years ago
ibuler fe17bec752 Add access key auth
8 years ago
ibuler 5b4ce709af Add private token and change user group
8 years ago
ibuler 875aaa0029 update user model for create application user
8 years ago
ibuler 649509dec1 Change models dir
8 years ago
ibuler a448fd02e2 merged
8 years ago
ibuler 96d32f2e3e prepare merge ops
8 years ago
ibuler 4d71c2d1ff 修改token获取，拆分认证文件和权限文件
8 years ago
ibuler d964221689 Update api
8 years ago
wangjun5 87eed2e59b add asset tool
8 years ago
ibuler 3aea994101 asset import
8 years ago
ibuler c1c9c7b68a update asset
8 years ago
ibuler 6e843533cb Base finish user
8 years ago
ibuler d8a229c09b to Commpany
8 years ago
ibuler 72ad4b44ce update bug
8 years ago
ibuler c1a74aebc5 [BugFix] update some user import bug
8 years ago
ibuler eae580e51f Update user import and export
8 years ago
ibuler e28f7a3bec Add export and import
8 years ago
ibuler be99eb82e8 udpate some bug
8 years ago
ibuler 5af97c969b export csv
8 years ago
ibuler 7dfde3a3c5 Update
8 years ago
ibuler 180af7e0bd Update csv
8 years ago
ibuler e89d3b3807 Update asset
8 years ago
ibuler aff37092bf Rename urls
8 years ago
ibuler 5745c8cc4a Finish url namespace change
8 years ago
ibuler a5e487441f prepare change api name
8 years ago
ibuler 3b30eb3278 Weiteng
8 years ago
ibuler 99c36f2a2c Fix bug
8 years ago
ibuler db8b0022fc Update usergroup detail
8 years ago
ibuler bd882c8bef User group detail
8 years ago
ibuler 8d358a7a68 UPdate some
8 years ago
ibuler 10aa8c40a7 Add login log
8 years ago
ibuler f70abec5ef Finish user detail
8 years ago
ibuler 69f2bf664b Finish user permission revoke
8 years ago
ibuler 47090eb0f7 update some user api
8 years ago
ibuler 8d7759d22f change user api
8 years ago
ibuler ea3f8af161 Fix pubkey auth bug
8 years ago
ibuler a75e1db970 Add form validate
8 years ago
ibuler 072da114db Finish system user list
8 years ago
ibuler 968b1b4cb6 Stash
8 years ago
ibuler 41337d28c3 add proxy log search
8 years ago
ibuler 53e97dac40 stash it
8 years ago
ibuler f437d3f883 update
8 years ago
ibuler 3448f3eb0a Modify init data
8 years ago
ibuler 34a0a37b63 Add token
8 years ago
ibuler 1159d9494c Update signer
8 years ago
ibuler f1dfba6a93 Update some asset issues
8 years ago
ibuler 315af35296 Finish token access api
8 years ago
ibuler 6a510dad6c Update some bug
8 years ago
ibuler df380c343e Update api
8 years ago
ibuler 6164896793 Update some thing
8 years ago
ibuler 303659cb0e Change app name apps => terrminal
8 years ago
ibuler 4531157c72 may be some wrong
8 years ago
ibuler 9960a6cd21 Plan create a new app: terminal
8 years ago
ibuler 0446f449e9 Add auth and permission backends
8 years ago
ibuler a62a2178d0 Add user backend
8 years ago
ibuler 0c8922e30f Modify some bug
8 years ago
ibuler 0954f6d7e8 Add audits api
8 years ago
ibuler 59727656c3 Update table desgin doc and audit log
8 years ago
ibuler 6b6105491c Add migrations
8 years ago
ibuler 45df58114c Merge branch 'connect'
8 years ago
ibuler a04d772501 Merge with master
8 years ago
xiaokong1937@gmail.com 6856fad0c0 integrate the user-group list page with its api;
8 years ago
xiaokong1937@gmail.com d40aa49d8c user bulk import through Excel and close #20
8 years ago
xiaokong1937@gmail.com 05e961f29f user-group detail: fix #15
8 years ago
xiaokong1937@gmail.com d8143a67cd user-group-detail: user-adding frontend integration
8 years ago
ibuler acf51238d0 Modify ssh server bug for using public key
8 years ago
xiaoyu e7fddf80ae user-group-detail: add users support
8 years ago
xiaokong1937@gmail.com f9b49605e4 user-group detail page: users op
8 years ago
xiaokong1937@gmail.com 2522f0d80f trivial changes: refactor the jumpserver DataTable api
8 years ago
xiaokong1937@gmail.com 70a6ddc897 fix #27
8 years ago
xiaokong1937@gmail.com 49f007601f add user-list-delete support for user-group detail page
8 years ago
xiaokong1937@gmail.com 74cdd2d0f3 user list groups bulk update
8 years ago
xiaoyu 15dcc760b4 user list bulk update modal
8 years ago
xiaoyu d2197d99c2 fix #26
8 years ago
ibuler cfef374454 Update ssh server
8 years ago
ibuler 7ab47916f2 add __init__.py
8 years ago
ibuler 283c53fddf Update gitignore
8 years ago
ibuler da56310db9 update .gitignore
8 years ago
ibuler 4925f3227a update .gitignore
8 years ago
ibuler 88bb620af2 Modify ignore
8 years ago
xiaoyu 22163173fe user bulk delete view
8 years ago
xiaoyu af713672fb user list page bulk action
8 years ago
xiaoyu 515406c05d temp: deactive test
8 years ago
xiaoyu 61d1d9ec90 temp
8 years ago
ibuler 220892824c Finish some bug
8 years ago
ibuler ce5950ca73 Merge with asset
8 years ago
xiaokong1937@gmail.com 65461a09a7 user-group edit implement
8 years ago
xiaoyu 9a81057d95 fix a typo
8 years ago
xiaoyu f00da20764 user-group delete implement
8 years ago
xiaokong1937@gmail.com 4e2a41f4cf user-group draft
8 years ago
xiaoyu 8a5a4f3362 fix #14
8 years ago
xiaoyu 8cdc4674d7 update toastr js and close #8
8 years ago
ibuler 502c7e756b Modify asset
8 years ago
ibuler dc4d388d9a Merge with master
8 years ago
ibuler df281defd8 Finish user detail asset grant ..
8 years ago
ibuler 7d3474aeea Add user permission user list
8 years ago
ibuler b5abb17568 Jiu zhe yang ba
8 years ago
ibuler ab2eeb0da3 Finish user asset form
8 years ago
ibuler 06b2c623cb Modify some bug
8 years ago
xiaokong1937@gmail.com 7984806b38 change user ssh reset type from private key to public key
8 years ago
ibuler 037d9323a4 Modify and code review
8 years ago
ibuler f253d2ea69 Merge with master
8 years ago
unknown 0f9bdab108 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
unknown 8490583d73 add assets manage
8 years ago
ibuler 5bca783e12 permission user search
8 years ago
xiaokong1937@gmail.com 6751c5a63a reset user password and ssh pk implement
8 years ago
xiaoyu 00502ce33d trivial js style changes; bugfix for patch method
8 years ago
unknown 7cff5cbf61 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
unknown 12831a7d21 text
8 years ago
ibuler 6d736d7309 Finish permission create and list
8 years ago
ibuler 324bb68667 user-pserm
8 years ago
ibuler 627a5825f4 Add user perm
8 years ago
xiaokong1937@gmail.com 899233338d #8 user first login view
8 years ago
xiaokong1937@gmail.com a7e3f9c465 #8 user first login view
8 years ago
xiaokong1937@gmail.com d8fe59debb temp save for issue 8
8 years ago
ibuler 409fac3ef1 Merge branch 'admin-user'
8 years ago
ibuler 239dd0567f Finish admin user view
8 years ago
xiaokong1937@gmail.com 62cac20ba7 fix #9
8 years ago
ibuler ff30435eb4 Finish adin user add
8 years ago
ibuler ccfe9b9d08 Merge branch 'admin-user'
8 years ago
ibuler 6f4a832389 Add admin user list view
8 years ago
xiaokong1937@gmail.com 8acbcb2ed2 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
xiaokong1937@gmail.com 04151b9957 user group quickedit frontend and rest API
8 years ago
ibuler 4db352f55b Add idc
8 years ago
ibuler d8e6433404 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
ibuler d0ba17374e Finish asset group create
8 years ago
xiaokong1937@gmail.com 7f09b486d9 user-group edit serializer and url implement
8 years ago
ibuler 30fd51c268 Asset group detail
8 years ago
xiaokong1937@gmail.com 556fb4e09f refactor `is_active` trigger view and `enable_otp` trigger view in UserDetail page;trivial changes
8 years ago
xiaokong1937@gmail.com a3096689b5 Merge branch 'xiaoyu'
8 years ago
ibuler dc01833a5b Forget to forgot
8 years ago
ibuler 170b49428c change date_added -> date_created
8 years ago
xiaoyu c6f875c517 temp commit
8 years ago
ibuler 07dd6d1192 Reslove conflict
8 years ago
ibuler 25d9dbe93c Merge with cmdb
8 years ago
xiaoyu 8cc09f0e5a move login and logout view back to CBV
8 years ago
ibuler 02b5483d81 Update add->create edit->update and assetgrou->asset-grou etc format
8 years ago
ibuler 3c6f50b788 Modify some bug
8 years ago
ibuler 2f5b7ad654 Modify asset model
8 years ago
xiaokong1937@gmail.com 6aedfb5219 fix small template erros
8 years ago
xiaokong1937@gmail.com 397da7d676 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
xiaokong1937@gmail.com e75d33439a fix captcha not valid bug of login view; use django's default login and logout view to enhance robustness
8 years ago
ibuler 7241f7509f Update nav
8 years ago
ibuler 8827fd2d74 Modify translation
8 years ago
ibuler 508bda37f5 Modify form datetime valid error, because form format
8 years ago
ibuler a0ef3cfc34 Update locale dir name to zh
8 years ago
ibuler 4855e86a3f Add asset group view
8 years ago
ibuler 3972bd3ff3 Add asset traslation
8 years ago
wangyong 0e8e88fac0 add admin|sys user model
8 years ago
wangyong 426c3c4062 add asset amdin|sys user model
8 years ago
ibuler 8d0334e003 Add translation
8 years ago
ibuler 0ab015abfd Asset add traslation
8 years ago
ibuler 7350e150c8 Merge branch 'master' into cmdb
8 years ago
ibuler 61f0205529 Modify users url to singular
8 years ago
ibuler acd98365c1 Fix translation
8 years ago
ibuler f274684473 Add translation for support i18n
8 years ago
wangyong d96ac56460 merge master
8 years ago
wangyong 77f3a1f146 add asset add
8 years ago
ibuler ba3f46fbd6 i18n
8 years ago
ibuler 0b406b6988 Add captch login using
8 years ago
ibuler 6f0cfd23c1 Rm logout.html
8 years ago
ibuler 10d51ada37 Update login error message
8 years ago
ibuler 90ca5a8bb7 start capcha support
8 years ago
ibuler 9803dd9547 Add ico, Modify forget_password
8 years ago
ibuler 3a9cf6c360 Add forget password and reset password
8 years ago
ibuler 8ff872f41d Add ls config
8 years ago
ibuler 5940cec0e6 Add user and send mail
8 years ago
ibuler 5359da3ce2 Finish user login
8 years ago
ibuler c9369db578 Add new login page
8 years ago
ibuler b31f8d5867 Add user generate reset password token
8 years ago
ibuler 0d3bde1191 User add confirmed
8 years ago
ibuler c143735393 Add ssh-key-gen function
8 years ago
ibuler 43af5383e3 Add model user method: get_token set_token
8 years ago
ibuler ffed46175d update .gitignore
8 years ago
ibuler 31a39be9ea Resolve conflicts
8 years ago
ibuler 2022ca8e10 Add test code
8 years ago
ibuler 011c125564 Modify user active api And Add Token authorization
8 years ago
ibuler 1a9f90a08e Modify api
8 years ago
ibuler 3eb4897bd3 Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api
8 years ago
ibuler 3c9dbaf860 Fix some bug
8 years ago
ibuler d918d5b466 Add Logger setting .
8 years ago
ibuler d95ffdfbf7 Test permmision
8 years ago
ibuler bb76f6c652 Add api authentication
8 years ago
ibuler 641e998504 Update context name path1, path2 => app, action
8 years ago