github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3582 Commits
64 Branches
246 Tags
103 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a990098744'
${ noResults }
Commit Graph

1388 Commits (a990098744144c6db1f1d0b387959ea8ba55b62b)

Author SHA1 Message Date
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 d3e9c8c9c0 Replace ssh server dir
8 years ago
ibuler cfef374454 Update ssh server
8 years ago
ibuler 0d4ca9717e Merge branch 'master' into connect
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 ab18fe466b stash
8 years ago
ibuler 88bb620af2 Modify ignore
8 years ago
ibuler 1f3d763490 Add requirement
8 years ago
江世峰 184ac728db Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
江世峰 5bf414ffb5 update add_assets-group
8 years ago
xiaoyu 22163173fe user bulk delete view
8 years ago
江世峰 18341717a1 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
江世峰 d2e989403f update assets-group
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 c7f3aaa654 Change appname webterminal to terminal
8 years ago
ibuler 220892824c Finish some bug
8 years ago
ibuler ce5950ca73 Merge with asset
8 years ago
ibuler 24e31a69cb finish asset
8 years ago
xiaokong1937@gmail.com 65461a09a7 user-group edit implement
8 years ago
江世峰 6c7e51041f update assets_group
8 years ago
江世峰 98757aa428 update assets_group
8 years ago
xiaoyu 9a81057d95 fix a typo
8 years ago
xiaoyu f00da20764 user-group delete implement
8 years ago
ibuler d323c9df88 Modify asset create
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 acfe8950b8 MOdify asset create
8 years ago
ibuler 502c7e756b Modify asset
8 years ago
ibuler 7fd224e690 Merge with user-perm
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
wangyong 343f139904 alter asset add and detail
8 years ago
wangyong b95c1deee1 alter asset add and detail
8 years ago
ibuler b5abb17568 Jiu zhe yang ba
8 years ago
ibuler ab2eeb0da3 Finish user asset form
8 years ago
ibuler e232962649 Update some template
8 years ago
wangyong 42012d7bfe merge master
8 years ago
ibuler 06b2c623cb Modify some bug
8 years ago
wangyong 792908eb35 asset add
8 years ago
ibuler a091036744 Add user permission select
8 years ago
ibuler d9812e2bdb Remove action from asset permission
8 years ago
ibuler 74b8ee8c10 Pre delete action
8 years ago
xiaokong1937@gmail.com db5d04c37f fix #13
8 years ago
xiaokong1937@gmail.com 7984806b38 change user ssh reset type from private key to public key
8 years ago
ibuler 766bd3b76d Move js to jumpserver.js
8 years ago
ibuler b2444c2aca Add fake data to init.json
8 years ago
ibuler bb8852d57e Modify some style
8 years ago
ibuler 037d9323a4 Modify and code review
8 years ago
ibuler f253d2ea69 Merge with master
8 years ago
ibuler a4dc27f073 Finish permissin detail asset list and user list
8 years ago
ibuler 812df7b07b Restore settings.py
8 years ago
unknown c237f82e51 restore settings
8 years ago
unknown e7c20f0707 add assets manage Sweet Alert"
8 years ago
unknown 0f9bdab108 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
unknown 1005fbabbd add assets manage
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
ibuler 4c4f598552 Finish asset permission detail and add user or user group list
8 years ago
unknown 7cff5cbf61 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
unknown 12831a7d21 text
8 years ago
ibuler 7b99a33a2f permission update and delete finished
8 years ago
ibuler 6d736d7309 Finish permission create and list
8 years ago
ibuler f558ded5bb Plan delete some view
8 years ago
ibuler 324bb68667 user-pserm
8 years ago
ibuler 70cae93a4b Add user perm model and form
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
ibuler 6069b8946b Start asset extend
8 years ago
ibuler c58725dbc0 Finish system user view
8 years ago
ibuler 292179d41d system-user
8 years ago
ibuler a89ae94d85 Update system user create template script
8 years ago
ibuler 4fc9274e00 Add asset system user
8 years ago
ibuler 5259dd8054 Asset form: Add some comment
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 5a0b119410 Stash it
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 dfc628a397 modify idc
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
wangyong bc232c4f77 merge cmdb
8 years ago
wangyong 342e4bdee8 change some html
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 b8c10a0350 Add assetgroup form save action
8 years ago
ibuler 126d7fd62c Add asset group add Form m2m
8 years ago
ibuler 3c6f50b788 Modify some bug
8 years ago
ibuler 2cb6b15bc3 set textarea rows
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 6fc3bbb97d Update initial data: fixtures dir
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 1b9c9c48b6 Merge branch 'cmdb'
8 years ago
ibuler 22e20d29f5 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
ibuler 0604f76f56 Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb
8 years ago
ibuler 4855e86a3f Add asset group view
8 years ago
wangyong 69349368bf cmdb merge model and url
8 years ago
wangyong b531d9eeb2 asset add html
8 years ago
ibuler 3972bd3ff3 Add asset traslation
8 years ago
ibuler d1c96cd4b2 Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb
8 years ago
ibuler 154783a974 Modify some and pull from server
8 years ago
wangyong fa07f4ee8a fix null
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 11d06b5e2b Add asset group view and url
8 years ago
ibuler acd98365c1 Fix translation
8 years ago
liuzheng712 32c49c080c update
8 years ago
liuzheng712 d371c0c5ae mkdirp
8 years ago
ibuler 47171174b5 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
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
lijiejie cec5a7f2c6 create the restframework url
8 years ago
lijiejie 829df26b0f create the api
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 5350f83275 Add celery usage more
8 years ago
广宏伟 dd80b94b43 Update README.md
8 years ago
广宏伟 4cbadbd941 Update README.rst
8 years ago
广宏伟 e61341df79 Update README.md to README.rst
8 years ago
ibuler f7ab26a5da Add celery broker
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
wangyong d0d433db1a add asset_list
8 years ago
yumaojun03 e8d8f7c406 ops: ansible_api add ansible api 2.0 adhoc runner
8 years ago
yumaojun03 f6b2abb1fb add ansible 2.0
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
yumaojun03 363ddb70e2 add celery support (not use django-celery)
8 years ago
ibuler bb76f6c652 Add api authentication
8 years ago
ibuler 641e998504 Update context name path1, path2 => app, action
8 years ago
ibuler 0a9e4a5e85 Modify urls.conf: Merge to single
8 years ago
ibuler 8aa92bb688 Add api: UserApi And UserGroupApi
8 years ago
ibuler 1d5faa3101 Delete Model: Role
8 years ago
ibuler b97b34961c Modify api: complete some setting
8 years ago
ibuler a43ac90b21 Modify CRLF to LF
8 years ago
ibuler bbecbc8578 Merge with webternimal
8 years ago
ibuler 6458231946 Add api file
8 years ago
yumaojun03 97a2e8bb50 test add celery
8 years ago
liuzheng712 400d744938 add api redirect
8 years ago
liuzheng712 7cebc4efe8 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
liuzheng712 91f0800e26 add webterminal
8 years ago
ibuler a99a6b6946 Split tests file in tests module
8 years ago
ibuler c37dea2079 Add user add view Test Case
8 years ago
ibuler b55b516fc3 Update foot_js.html add active
8 years ago
ibuler 1f3c0d004f Change update batch, add _list_base.html
8 years ago
ibuler 3c3fda8064 Change chosen To select2 lib
8 years ago
ibuler ae9bbb40fd Add flash message template
8 years ago
ibuler 8e5e788bcd Test case added
8 years ago
liuzheng712 c50cdd2976 add webterminal
8 years ago
ibuler f45690b34f Add test case
8 years ago
ibuler f0b0e41d33 Update user edit
8 years ago
wangyong 3771b2ff70 add asset detail and list
8 years ago
ibuler 8b0f31c43a modify list, edit url error
8 years ago
ibuler 8ba7b078fd Finish expaire date
8 years ago
ibuler 57f0b04387 Modify project statucure guide and init data
8 years ago
ibuler 24d7cb3d5d add init data dir fixture
8 years ago
ibuler 85cf2169d4 Modify readme
8 years ago
ibuler 0427d406b9 Add init data file
8 years ago
ibuler e355c7b8ef Modify pagination and Role model
8 years ago
ibuler 6e46a17d98 Useradd group change
8 years ago
ibuler e48f36397e Modify url
8 years ago
ibuler cf15b7eaff Add UserGroup some View
8 years ago
ibuler 651e89994e modify list and sort
8 years ago
ibuler 342298ad3e reslove conflict
8 years ago
ibuler a76191ffdc Change view detail template
8 years ago
ibuler 279987925a Modify user detail of usergroup
8 years ago
ibuler 824b1c7f6f update user update view
8 years ago
ibuler bcae7beae6 upload avatar
8 years ago
ibuler 9353022627 add context
8 years ago
ibuler 35abf16f7d Modify panel color
8 years ago
ibuler c14eb42186 reslove conflict add user detail template
8 years ago
ibuler 98d6043f2d merged
8 years ago
ibuler 7a8d4a3a59 Add delete view
8 years ago
ibuler 3bf0d4aabb Add common app
8 years ago
ibuler edd60cad11 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
广宏伟 e3223f745a app users
8 years ago
wangyong fcd39370ed add asset some cbv
8 years ago
广宏伟 86ffcc973c Add user template
8 years ago
ibuler 9493fb07cb Add user list view
8 years ago
ibuler 9303415b89 modify some issues
8 years ago
ibuler 234684c875 Rename dir name dashboard to apps
8 years ago