Commit Graph

423 Commits (c5ab49c5159292909899d7442e8226bf5cb78dba)

Author SHA1 Message Date
ibuler 05a5e9cc69 Finish some bug
8 years ago
ibuler 34a0a37b63 Add token
8 years ago
ibuler 1159d9494c Update signer
8 years ago
Administrator 92f396761c [future] 完成获取硬件和链接测试的第一版v1
8 years ago
ibuler f1dfba6a93 Update some asset issues
8 years ago
ibuler 315af35296 Finish token access api
8 years ago
Administrator 97b8bcd5ca [future]
8 years ago
江世峰 6b6fdcd5fd asset:add assets_bulk_update
8 years ago
江世峰 3d4f79ca59 asset:add assets_bulk_update
8 years ago
Administrator ccf3851d81 [future] 初步添加测试链接的接口
8 years ago
Administrator 97d7e6cb9b [future] 修改celery 使用eventlet 作为concurrent pool, 添加获取资产硬件信息的 初步接口
8 years ago
Administrator fd945513ac [fix] 修改模型的显示, 因为字段默认会加上Class的Name
8 years ago
ibuler 92251f2a45 Merge with master
8 years ago
Administrator 51c530c123 [future] ansible运行结果存入数据库
8 years ago
Administrator 96bc1cd8f1 [future]ansible运行结果存入数据库中...
8 years ago
ibuler 374dfbdac2 Force merge
8 years ago
ibuler 534321d1aa Merge with master
8 years ago
ibuler 69c6f81c31 Add fake to
8 years ago
ibuler 9e3d740b43 Add fake to
8 years ago
ibuler 5cdc80ec11 Add init data
8 years ago
ibuler 217586b536 Add fake
8 years ago
ibuler 2abec15691 Rm ws4redis
8 years ago
ibuler 688bfa556c Merge with audits
8 years ago
ibuler 589d0d0fac Finish command log list
8 years ago
ibuler 3c00c578c3 Update some vie
8 years ago
Administrator eb5f0fcf68 [future] 在主机层面支持多种sudo, 以及回调结果的分类
8 years ago
ibuler c0de35a683 Add layer and layer open command log
8 years ago
ibuler d19b47a427 add command log modal
8 years ago
ibuler 573b3a8743 Update log_command modal
8 years ago
ibuler 5d3f9b4a03 Add command list
8 years ago
ibuler c2aab50c7b Add proxy log list
8 years ago
Administrator 13f34a8bdd ops: [future]完成ansible2.0 API 的基本封装.
8 years ago
江世峰 f88c149076 asset:add assets_bulk
8 years ago
ibuler 6a510dad6c Update some bug
8 years ago
江世峰 cdb1602e06 asset:add assets_bulk
8 years ago
江世峰 80baecc8be Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
8 years ago
江世峰 73f0199dc0 asset:add assets_bulk
8 years ago
ibuler 6b161d5971 Update import
8 years ago
ibuler 67ecc108bd Command parser
8 years ago
ibuler df380c343e Update api
8 years ago
ibuler 6164896793 Update some thing
8 years ago
ibuler 45dcb26123 Merge branch 'audits'
8 years ago
ibuler bb9a067293 Finish command log
8 years ago
ibuler 961abad14b Add heatbeat
8 years ago
ibuler 17ade287ab Add proxy log api
8 years ago
ibuler 7513474366 Finish terminal app
8 years ago
ibuler 303659cb0e Change app name apps => terrminal
8 years ago
江世峰 4e1f9c97a5 asset:update assets_list by tag
8 years ago
ibuler 4531157c72 may be some wrong
8 years ago
ibuler 26a8bce2c3 Change auto_now to auto_now_add
8 years ago
ibuler 3383b2b535 Add terminal mode
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 f038423ce2 Add isdangerous
8 years ago
江世峰 a3683f184e Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
8 years ago
江世峰 abe09e2a85 asset:update assets_list by tag
8 years ago
ibuler 3efad338eb Merge branch 'connect'
8 years ago
江世峰 73f5891f87 asset:update assets_list by tag
8 years ago
ibuler 081af2f953 Add proxy log api for create or update
8 years ago
ibuler 0c8922e30f Modify some bug
8 years ago
ibuler 0954f6d7e8 Add audits api
8 years ago
江世峰 b99b88a30f asset:update tag
8 years ago
ibuler 59727656c3 Update table desgin doc and audit log
8 years ago
江世峰 0c611b6429 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
江世峰 2829445f4f assets:add tag
8 years ago
ibuler aa02c211fe Modify inital data
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
ibuler 820d608b18 Rm teminal app
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
江世峰 474f7e0f68 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
江世峰 fd52a85dbb fix #25
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
江世峰 0dec647116 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
江世峰 3201853cdf rollback user_list.html
8 years ago
江世峰 e83ecb1254 assets_group_forbug
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 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