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

1802 Commits (4f7daa96a7cfcde3089086c155b1f94babb87b3e)

Author SHA1 Message Date
yumaojun03 806d38bbb2 模拟数据测试 2016-12-11 20:50:26 +08:00
yumaojun03 84613e51d8 为了防止循环导入，采用__all__导出模块变量 2016-12-11 12:05:11 +08:00
ibuler 69767e978d Add fake 2016-12-06 10:40:17 +08:00
yumaojun03 baba65ad43 修改url模块, 匹配整体架构风格. 2016-12-05 23:02:08 +08:00
yumaojun03 d0460d8691 修改url模块, 匹配整体架构风格. 2016-12-05 22:54:38 +08:00
ibuler a7476222a9 Update import 2016-11-27 23:36:35 +08:00
Administrator 61ac9129b0 url少加了下划线 2016-11-27 22:45:53 +08:00
ibuler 3aea994101 asset import 2016-11-27 14:37:50 +08:00
Administrator 8e0afb2cc4 调整模型 2016-11-27 11:30:23 +08:00
ibuler c1c9c7b68a update asset 2016-11-25 22:45:47 +08:00
ibuler 6e843533cb Base finish user 2016-11-25 11:00:51 +08:00
ibuler d8a229c09b to Commpany 2016-11-25 08:39:24 +08:00
Administrator 2494fa5846 修改url 2016-11-24 22:34:55 +08:00
Administrator 984391e2b2 同步Master分支上的代码, 解决部分冲突问题 2016-11-24 22:10:04 +08:00
ibuler 72ad4b44ce update bug 2016-11-24 19:36:49 +08:00
Administrator 1bc88e5b11 Merge branch 'ansible_api' into ops_dev 
# Conflicts:
#	apps/jumpserver/urls.py
#	apps/locale/zh/LC_MESSAGES/django.po
#	apps/templates/_nav.html
#	requirements.txt
#	run_server.py
 2016-11-24 18:22:36 +08:00
Administrator c289d6a4c5 Merge branch 'ansible_api' into ops_dev 
# Conflicts:
#	apps/jumpserver/urls.py
#	apps/locale/zh/LC_MESSAGES/django.po
#	apps/templates/_nav.html
#	requirements.txt
#	run_server.py
 2016-11-24 17:57:50 +08:00
Administrator 7c4aefd959 兼容py3测试 2016-11-24 17:10:43 +08:00
ibuler c1a74aebc5 [BugFix] update some user import bug 2016-11-24 17:08:20 +08:00
ibuler eae580e51f Update user import and export 2016-11-24 15:45:08 +08:00
ibuler e28f7a3bec Add export and import 2016-11-24 00:48:57 +08:00
ibuler be99eb82e8 udpate some bug 2016-11-23 19:37:47 +08:00
ibuler 5af97c969b export csv 2016-11-23 19:09:11 +08:00
ibuler 7dfde3a3c5 Update 2016-11-23 16:17:23 +08:00
Administrator cd22c39078 [future] 将Task移到一个包内管理 2016-11-23 11:45:50 +08:00
Administrator 32a5aec34e [future] 调整app架构 2016-11-22 23:02:12 +08:00
Administrator fea76178ee 添加作业中心i18n 2016-11-22 21:40:05 +08:00
Administrator 3abe2196dd [future] 添加作业中心 i18n相关 2016-11-22 21:38:38 +08:00
Administrator 18e0fee1a7 [future] 添加作业中心基础框架 2016-11-22 21:08:45 +08:00
Administrator 954814da65 [future] 添加Cron相关的基础API框架 2016-11-22 10:41:18 +08:00
ibuler 180af7e0bd Update csv 2016-11-22 00:59:49 +08:00
Administrator 79971d677d [future] 使用mixin去掉重复多余代码 2016-11-20 18:12:18 +08:00
Administrator 1e835d2fa9 [future] 增加503和501的自定义异常 2016-11-20 16:23:45 +08:00
Administrator 76f72dfb58 [future] 添加路由, 增加api认证, 测试所有添加的api 2016-11-20 16:22:41 +08:00
Administrator 5ae2711c6e sudo privilege删除走api 2016-11-20 14:48:18 +08:00
Administrator 39ae4a3a10 [future] url 调整 2016-11-20 12:22:56 +08:00
Administrator 961ecb3ee8 [future] 添加sudo相关的api方法 2016-11-20 12:18:44 +08:00
ibuler 205c11dfba Finish list paganation 2016-11-18 12:00:23 +08:00
ibuler e89d3b3807 Update asset 2016-11-17 19:28:45 +08:00
ibuler aff37092bf Rename urls 2016-11-16 18:12:14 +08:00
ibuler 5745c8cc4a Finish url namespace change 2016-11-16 17:45:46 +08:00
ibuler a5e487441f prepare change api name 2016-11-16 17:38:03 +08:00
Administrator c588436d55 初始化模板和api模块 2016-11-16 15:00:46 +08:00
Administrator 82412831d5 initial sudo views 2016-11-16 14:20:44 +08:00
ibuler aa08f0aa48 Merge branch 'audits' of code.jumpserver.org:Jumpserver/jumpserver into audits 2016-11-16 12:34:01 +08:00
ibuler 32d12b7f78 Update user group asset permission 2016-11-16 12:33:54 +08:00
ibuler 3b30eb3278 Weiteng 2016-11-15 23:09:36 +08:00
ibuler 99c36f2a2c Fix bug 2016-11-15 19:44:08 +08:00
ibuler db8b0022fc Update usergroup detail 2016-11-15 19:33:04 +08:00
ibuler bd882c8bef User group detail 2016-11-15 00:48:48 +08:00
ibuler 8d358a7a68 UPdate some 2016-11-14 19:28:21 +08:00
ibuler 419876b575 Update heatbeat 2016-11-13 22:34:38 +08:00
ibuler 2635217421 Update celery 2016-11-11 09:48:47 +08:00
ibuler c6fc3dfe91 Update terminal interval 2016-11-11 02:13:13 +08:00
ibuler 10aa8c40a7 Add login log 2016-11-10 23:54:21 +08:00
ibuler f70abec5ef Finish user detail 2016-11-10 22:06:23 +08:00
ibuler 69f2bf664b Finish user permission revoke 2016-11-10 16:59:50 +08:00
ibuler dde9ffb2ae Update perm api 2016-11-10 00:18:57 +08:00
ibuler 47090eb0f7 update some user api 2016-11-09 23:49:10 +08:00
ibuler c5d625e261 Merge branch 'audits' of code.jumpserver.org:Jumpserver/jumpserver into audits 2016-11-09 19:29:26 +08:00
ibuler 8d7759d22f change user api 2016-11-09 19:29:15 +08:00
ibuler 0d4d64c274 Update api 2016-11-09 00:36:23 +08:00
ibuler ea3f8af161 Fix pubkey auth bug 2016-11-07 16:59:52 +08:00
ibuler a75e1db970 Add form validate 2016-11-07 00:39:26 +08:00
ibuler 072da114db Finish system user list 2016-11-06 22:45:26 +08:00
ibuler 968b1b4cb6 Stash 2016-11-06 21:29:04 +08:00
ibuler afb923737c Merge with audits 2016-11-06 11:52:25 +08:00
ibuler 79c8f2275c Update perm api 2016-11-05 23:34:45 +08:00
Administrator d9278c2c24 [future] 添加sudo相关的表，以及实现生成sudo内容的方法 2016-11-05 13:10:44 +08:00
ibuler 5b0f897118 Update proxy log and command log view 2016-11-05 12:45:59 +08:00
ibuler 41337d28c3 add proxy log search 2016-11-05 01:15:25 +08:00
ibuler 1d29c52a43 Update datatable 2016-11-04 19:25:10 +08:00
ibuler 53e97dac40 stash it 2016-11-04 18:33:16 +08:00
Administrator 8716d9c725 [future] 添加用于记录sudo相关的表 2016-11-04 18:12:10 +08:00
ibuler 2a65e81316 detail page add update 2016-11-03 23:16:16 +08:00
ibuler f437d3f883 update 2016-11-03 19:42:47 +08:00
Administrator 1fd0f8fdde [future] 添加sudo的配置模板 2016-11-03 18:26:10 +08:00
ibuler 61eadf6891 Modify asset detail 2016-11-03 00:09:38 +08:00
ibuler 3448f3eb0a Modify init data 2016-11-02 23:00:47 +08:00
ibuler 05a5e9cc69 Finish some bug 2016-11-02 19:44:11 +08:00
ibuler 34a0a37b63 Add token 2016-11-01 19:31:35 +08:00
ibuler 1159d9494c Update signer 2016-11-01 17:21:16 +08:00
Administrator 92f396761c [future] 完成获取硬件和链接测试的第一版v1 
1. 完成数据结果的封装, 添加数据结构样列
2. 完成硬件和链接测试接口v1版
 2016-11-01 10:37:03 +08:00
ibuler f1dfba6a93 Update some asset issues 2016-10-31 19:31:56 +08:00
ibuler 315af35296 Finish token access api 2016-10-31 18:58:23 +08:00
Administrator 97b8bcd5ca [future] 
1. settings 添加ops 的logger, 关于Ansible的log单独记录
2. models 增加Tasker模型, 添加AnsibleHostReuslt 对于数据处理的方法
3. ansible_api, callback 类，增加保存Tasker的逻辑,i其他兼容
4. taskers, 实现获取硬件信息和ping的 tasker接口。
 2016-10-31 17:41:26 +08:00
江世峰 6b6fdcd5fd asset:add assets_bulk_update 2016-10-28 21:24:01 +08:00
江世峰 3d4f79ca59 asset:add assets_bulk_update 2016-10-28 21:19:37 +08:00
Administrator ccf3851d81 [future] 初步添加测试链接的接口 2016-10-28 17:43:56 +08:00
Administrator 97d7e6cb9b [future] 修改celery 使用eventlet 作为concurrent pool, 添加获取资产硬件信息的 初步接口 2016-10-28 17:28:32 +08:00
Administrator fd945513ac [fix] 修改模型的显示, 因为字段默认会加上Class的Name 2016-10-28 15:47:37 +08:00
ibuler 92251f2a45 Merge with master 2016-10-28 15:09:38 +08:00
Administrator 51c530c123 [future] ansible运行结果存入数据库 2016-10-28 14:58:09 +08:00
Administrator 96bc1cd8f1 [future]ansible运行结果存入数据库中... 2016-10-28 13:41:11 +08:00
ibuler 374dfbdac2 Force merge 2016-10-28 11:36:37 +08:00
ibuler 534321d1aa Merge with master 2016-10-28 11:34:07 +08:00
ibuler 69c6f81c31 Add fake to 2016-10-28 00:21:11 +08:00
ibuler 9e3d740b43 Add fake to 2016-10-28 00:17:10 +08:00
ibuler 5cdc80ec11 Add init data 2016-10-27 23:59:54 +08:00
ibuler 217586b536 Add fake 2016-10-27 23:55:19 +08:00
ibuler 2abec15691 Rm ws4redis 2016-10-27 23:50:44 +08:00
ibuler 688bfa556c Merge with audits 2016-10-27 23:04:02 +08:00
ibuler 589d0d0fac Finish command log list 2016-10-27 22:58:19 +08:00
ibuler 3c00c578c3 Update some vie 2016-10-27 19:35:02 +08:00
Administrator eb5f0fcf68 [future] 在主机层面支持多种sudo, 以及回调结果的分类 2016-10-27 15:20:16 +08:00
ibuler c0de35a683 Add layer and layer open command log 2016-10-27 00:52:44 +08:00
ibuler d19b47a427 add command log modal 2016-10-27 00:03:05 +08:00
ibuler 573b3a8743 Update log_command modal 2016-10-26 19:31:54 +08:00
ibuler 5d3f9b4a03 Add command list 2016-10-26 19:10:14 +08:00
ibuler c2aab50c7b Add proxy log list 2016-10-25 23:23:01 +08:00
Administrator 13f34a8bdd ops: [future]完成ansible2.0 API 的基本封装. 2016-10-25 18:15:02 +08:00
江世峰 f88c149076 asset:add assets_bulk 2016-10-25 02:16:20 +08:00
ibuler 6a510dad6c Update some bug 2016-10-24 19:32:53 +08:00
江世峰 cdb1602e06 asset:add assets_bulk 2016-10-22 20:21:36 +08:00
江世峰 80baecc8be Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver 
Merge
 2016-10-21 21:15:04 +08:00
江世峰 73f0199dc0 asset:add assets_bulk 2016-10-21 21:14:49 +08:00
ibuler 6b161d5971 Update import 2016-10-20 19:01:57 +08:00
ibuler 67ecc108bd Command parser 2016-10-20 00:26:53 +08:00
ibuler df380c343e Update api 2016-10-19 19:30:55 +08:00
ibuler 6164896793 Update some thing 2016-10-19 18:33:14 +08:00
ibuler 45dcb26123 Merge branch 'audits' 2016-10-19 15:14:07 +08:00
ibuler bb9a067293 Finish command log 2016-10-19 01:05:28 +08:00
ibuler 961abad14b Add heatbeat 2016-10-18 23:49:04 +08:00
ibuler 17ade287ab Add proxy log api 2016-10-18 19:28:36 +08:00
ibuler 7513474366 Finish terminal app 2016-10-17 17:28:07 +08:00
ibuler 303659cb0e Change app name apps => terrminal 2016-10-17 15:24:41 +08:00
江世峰 4e1f9c97a5 asset:update assets_list by tag 2016-10-16 22:35:25 +08:00
ibuler 4531157c72 may be some wrong 2016-10-16 22:12:13 +08:00
ibuler 26a8bce2c3 Change auto_now to auto_now_add 2016-10-15 23:34:02 +08:00
ibuler 3383b2b535 Add terminal mode 2016-10-15 18:28:49 +08:00
ibuler 9960a6cd21 Plan create a new app: terminal 2016-10-15 17:14:56 +08:00
ibuler 0446f449e9 Add auth and permission backends 2016-10-15 16:04:54 +08:00
ibuler a62a2178d0 Add user backend 2016-10-15 00:49:59 +08:00
ibuler f038423ce2 Add isdangerous 2016-10-14 20:18:34 +08:00
江世峰 a3683f184e Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver 
Merge
 2016-10-14 19:29:15 +08:00
江世峰 abe09e2a85 asset:update assets_list by tag 2016-10-14 19:28:58 +08:00
ibuler 3efad338eb Merge branch 'connect' 2016-10-13 14:49:04 +08:00
江世峰 73f5891f87 asset:update assets_list by tag 2016-10-12 18:57:51 +08:00
ibuler 081af2f953 Add proxy log api for create or update 2016-10-10 00:39:24 +08:00
ibuler 0c8922e30f Modify some bug 2016-10-09 19:27:49 +08:00
ibuler 0954f6d7e8 Add audits api 2016-10-09 00:12:18 +08:00
江世峰 b99b88a30f asset:update tag 2016-10-08 18:33:00 +08:00
ibuler 59727656c3 Update table desgin doc and audit log 2016-10-07 23:54:29 +08:00
江世峰 0c611b6429 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 
merage
 2016-10-07 23:04:48 +08:00
江世峰 2829445f4f assets:add tag 2016-10-07 23:04:37 +08:00
ibuler aa02c211fe Modify inital data 2016-10-02 22:16:15 +08:00
ibuler 6b6105491c Add migrations 2016-10-02 22:13:08 +08:00
ibuler 45df58114c Merge branch 'connect' 2016-10-02 21:45:44 +08:00
ibuler a04d772501 Merge with master 2016-10-02 21:45:26 +08:00
ibuler 820d608b18 Rm teminal app 2016-10-02 21:43:22 +08:00
xiaokong1937@gmail.com 6856fad0c0 integrate the user-group list page with its api; 2016-10-02 11:09:27 +08:00
xiaokong1937@gmail.com d40aa49d8c user bulk import through Excel and close #20 2016-10-01 20:26:43 +08:00
xiaokong1937@gmail.com 05e961f29f user-group detail: fix #15 2016-09-30 20:50:40 +08:00
江世峰 474f7e0f68 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 
merge
 2016-09-30 18:26:02 +08:00
江世峰 fd52a85dbb fix #25 2016-09-30 18:25:50 +08:00
xiaokong1937@gmail.com d8143a67cd user-group-detail: user-adding frontend integration 2016-09-29 21:14:55 +08:00
ibuler acf51238d0 Modify ssh server bug for using public key 2016-09-29 18:01:26 +08:00
xiaoyu e7fddf80ae user-group-detail: add users support 2016-09-29 16:41:55 +08:00
xiaokong1937@gmail.com f9b49605e4 user-group detail page: users op 2016-09-28 21:11:43 +08:00
江世峰 0dec647116 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 
rollback user_list.html
 2016-09-28 13:45:03 +08:00
江世峰 3201853cdf rollback user_list.html 2016-09-28 13:44:51 +08:00
江世峰 e83ecb1254 assets_group_forbug 2016-09-28 12:05:34 +08:00
xiaokong1937@gmail.com 2522f0d80f trivial changes: refactor the jumpserver DataTable api 2016-09-27 21:28:02 +08:00
xiaokong1937@gmail.com 70a6ddc897 fix #27 2016-09-27 20:16:46 +08:00
xiaokong1937@gmail.com 49f007601f add user-list-delete support for user-group detail page 2016-09-26 21:22:48 +08:00
xiaokong1937@gmail.com 74cdd2d0f3 user list groups bulk update 2016-09-26 19:39:43 +08:00
xiaoyu 15dcc760b4 user list bulk update modal 2016-09-26 16:33:10 +08:00
xiaoyu d2197d99c2 fix #26 2016-09-26 11:30:43 +08:00
ibuler d3e9c8c9c0 Replace ssh server dir 2016-09-25 00:21:32 +08:00
ibuler cfef374454 Update ssh server 2016-09-25 00:11:31 +08:00
ibuler 0d4ca9717e Merge branch 'master' into connect 2016-09-24 22:18:07 +08:00
ibuler 7ab47916f2 add __init__.py 2016-09-24 22:12:49 +08:00
ibuler 283c53fddf Update gitignore 2016-09-24 22:11:53 +08:00
ibuler da56310db9 update .gitignore 2016-09-24 22:09:20 +08:00
ibuler 4925f3227a update .gitignore 2016-09-24 21:57:24 +08:00
ibuler ab18fe466b stash 2016-09-24 21:47:10 +08:00
ibuler 88bb620af2 Modify ignore 2016-09-24 11:50:25 +08:00
ibuler 1f3d763490 Add requirement 2016-09-24 11:44:59 +08:00
江世峰 184ac728db Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 
update:add_assets-group
 2016-09-23 20:23:02 +08:00
江世峰 5bf414ffb5 update add_assets-group 2016-09-23 20:22:45 +08:00
xiaoyu 22163173fe user bulk delete view 2016-09-23 16:30:59 +08:00
江世峰 18341717a1 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 
"assets-group"
 2016-09-22 18:31:15 +08:00
江世峰 d2e989403f update assets-group 2016-09-22 18:31:04 +08:00
xiaoyu af713672fb user list page bulk action 2016-09-22 16:06:46 +08:00
xiaoyu 515406c05d temp: deactive test 2016-09-21 16:43:41 +08:00
xiaoyu 61d1d9ec90 temp 2016-09-21 15:48:21 +08:00
ibuler c7f3aaa654 Change appname webterminal to terminal 2016-09-20 23:34:37 +08:00
ibuler 220892824c Finish some bug 2016-09-20 01:13:50 +08:00
ibuler ce5950ca73 Merge with asset 2016-09-20 00:43:30 +08:00
ibuler 24e31a69cb finish asset 2016-09-20 00:39:33 +08:00
xiaokong1937@gmail.com 65461a09a7 user-group edit implement 2016-09-19 21:08:08 +08:00
江世峰 6c7e51041f update assets_group 2016-09-19 18:01:13 +08:00
江世峰 98757aa428 update assets_group 2016-09-19 17:25:41 +08:00
xiaoyu 9a81057d95 fix a typo 2016-09-19 15:51:28 +08:00
xiaoyu f00da20764 user-group delete implement 2016-09-19 15:47:58 +08:00
ibuler d323c9df88 Modify asset create 2016-09-19 00:07:52 +08:00
xiaokong1937@gmail.com 4e2a41f4cf user-group draft 2016-09-18 21:00:07 +08:00
xiaoyu 8a5a4f3362 fix #14 2016-09-18 14:28:34 +08:00
xiaoyu 8cdc4674d7 update toastr js and close #8 2016-09-18 10:32:23 +08:00
ibuler acfe8950b8 MOdify asset create 2016-09-18 00:10:08 +08:00
ibuler 502c7e756b Modify asset 2016-09-17 23:43:41 +08:00
ibuler 7fd224e690 Merge with user-perm 2016-09-17 19:15:14 +08:00
ibuler dc4d388d9a Merge with master 2016-09-17 18:53:11 +08:00
ibuler df281defd8 Finish user detail asset grant .. 2016-09-17 18:51:19 +08:00
ibuler 7d3474aeea Add user permission user list 2016-09-17 15:20:33 +08:00
wangyong 343f139904 alter asset add and detail 2016-09-17 14:52:14 +08:00
wangyong b95c1deee1 alter asset add and detail 2016-09-17 14:50:14 +08:00
ibuler b5abb17568 Jiu zhe yang ba 2016-09-17 13:04:26 +08:00
ibuler ab2eeb0da3 Finish user asset form 2016-09-17 01:04:52 +08:00
ibuler e232962649 Update some template 2016-09-16 20:53:10 +08:00
wangyong 42012d7bfe merge master 2016-09-16 17:32:35 +08:00
ibuler 06b2c623cb Modify some bug 2016-09-16 17:23:47 +08:00
wangyong 792908eb35 asset add 2016-09-16 17:23:23 +08:00
ibuler a091036744 Add user permission select 2016-09-16 16:09:11 +08:00
ibuler d9812e2bdb Remove action from asset permission 2016-09-16 09:55:26 +08:00
ibuler 74b8ee8c10 Pre delete action 2016-09-16 09:38:07 +08:00
xiaokong1937@gmail.com db5d04c37f fix #13 2016-09-16 08:45:29 +08:00
xiaokong1937@gmail.com 7984806b38 change user ssh reset type from private key to public key 2016-09-15 16:54:00 +08:00
ibuler 766bd3b76d Move js to jumpserver.js 2016-09-15 13:09:24 +08:00
ibuler b2444c2aca Add fake data to init.json 2016-09-15 12:21:34 +08:00
ibuler bb8852d57e Modify some style 2016-09-15 12:20:53 +08:00
ibuler 037d9323a4 Modify and code review 2016-09-15 11:19:36 +08:00
ibuler f253d2ea69 Merge with master 2016-09-14 23:31:22 +08:00
ibuler a4dc27f073 Finish permissin detail asset list and user list 2016-09-14 23:29:39 +08:00
ibuler 812df7b07b Restore settings.py 2016-09-14 16:52:09 +08:00
unknown c237f82e51 restore settings 2016-09-14 16:10:15 +08:00
unknown e7c20f0707 add assets manage Sweet Alert" 2016-09-14 15:51:09 +08:00
unknown 0f9bdab108 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-09-14 15:40:47 +08:00
unknown 1005fbabbd add assets manage 
Sweet Alert
 2016-09-14 15:38:54 +08:00
unknown 8490583d73 add assets manage 
Sweet Alert
 2016-09-14 15:19:27 +08:00
ibuler 5bca783e12 permission user search 2016-09-14 01:08:26 +08:00
xiaokong1937@gmail.com 6751c5a63a reset user password and ssh pk implement 2016-09-13 21:45:10 +08:00
xiaoyu 00502ce33d trivial js style changes; bugfix for patch method 2016-09-13 16:38:43 +08:00
ibuler 4c4f598552 Finish asset permission detail and add user or user group list 2016-09-13 00:37:24 +08:00
unknown 7cff5cbf61 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-09-12 15:36:13 +08:00
unknown 12831a7d21 text 2016-09-12 15:35:50 +08:00
ibuler 7b99a33a2f permission update and delete finished 2016-09-11 23:20:14 +08:00
ibuler 6d736d7309 Finish permission create and list 2016-09-11 22:45:24 +08:00
ibuler f558ded5bb Plan delete some view 2016-09-11 20:13:56 +08:00
ibuler 324bb68667 user-pserm 2016-09-11 16:59:19 +08:00
ibuler 70cae93a4b Add user perm model and form 2016-09-11 09:50:42 +08:00
ibuler 627a5825f4 Add user perm 2016-09-10 21:08:10 +08:00
xiaokong1937@gmail.com 899233338d #8 user first login view 2016-09-10 13:20:34 +08:00
xiaokong1937@gmail.com a7e3f9c465 #8 user first login view 2016-09-10 13:16:58 +08:00
ibuler 6069b8946b Start asset extend 2016-09-10 00:29:57 +08:00
ibuler c58725dbc0 Finish system user view 2016-09-09 23:19:39 +08:00
ibuler 292179d41d system-user 2016-09-09 21:48:44 +08:00
ibuler a89ae94d85 Update system user create template script 2016-09-09 00:34:23 +08:00
ibuler 4fc9274e00 Add asset system user 2016-09-09 00:09:49 +08:00
ibuler 5259dd8054 Asset form: Add some comment 2016-09-08 22:54:05 +08:00
xiaokong1937@gmail.com d8fe59debb temp save for issue 8 2016-09-08 21:51:44 +08:00
ibuler 409fac3ef1 Merge branch 'admin-user' 2016-09-08 20:39:25 +08:00
ibuler 239dd0567f Finish admin user view 2016-09-08 20:39:06 +08:00
xiaokong1937@gmail.com 62cac20ba7 fix #9 2016-09-08 19:30:22 +08:00
ibuler ff30435eb4 Finish adin user add 2016-09-08 18:12:53 +08:00
ibuler 5a0b119410 Stash it 2016-09-08 00:59:00 +08:00
ibuler ccfe9b9d08 Merge branch 'admin-user' 2016-09-08 00:41:22 +08:00
ibuler 6f4a832389 Add admin user list view 2016-09-08 00:40:59 +08:00
xiaokong1937@gmail.com 8acbcb2ed2 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-09-07 21:53:33 +08:00
xiaokong1937@gmail.com 04151b9957 user group quickedit frontend and rest API 2016-09-07 21:53:27 +08:00
ibuler dfc628a397 modify idc 2016-09-07 21:03:18 +08:00
ibuler 4db352f55b Add idc 2016-09-07 20:51:33 +08:00
ibuler d8e6433404 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-09-07 20:06:01 +08:00
ibuler d0ba17374e Finish asset group create 2016-09-07 20:05:42 +08:00
xiaokong1937@gmail.com 7f09b486d9 user-group edit serializer and url implement 2016-09-06 21:44:23 +08:00
ibuler 30fd51c268 Asset group detail 2016-09-06 21:39:21 +08:00
xiaokong1937@gmail.com 556fb4e09f refactor `is_active` trigger view and `enable_otp` trigger view in UserDetail page;trivial changes 2016-09-06 21:03:51 +08:00
xiaokong1937@gmail.com a3096689b5 Merge branch 'xiaoyu' 2016-09-06 19:14:16 +08:00
wangyong bc232c4f77 merge cmdb 2016-09-06 18:45:40 +08:00
wangyong 342e4bdee8 change some html 2016-09-06 18:43:13 +08:00
ibuler dc01833a5b Forget to forgot 2016-09-06 16:55:57 +08:00
ibuler 170b49428c change date_added -> date_created 2016-09-06 16:50:19 +08:00
xiaoyu c6f875c517 temp commit 2016-09-06 16:40:44 +08:00
ibuler 07dd6d1192 Reslove conflict 2016-09-06 15:56:03 +08:00
ibuler 25d9dbe93c Merge with cmdb 2016-09-06 15:09:00 +08:00
xiaoyu 8cc09f0e5a move login and logout view back to CBV 2016-09-06 15:03:37 +08:00
ibuler 02b5483d81 Update add->create edit->update and assetgrou->asset-grou etc format 2016-09-06 14:38:19 +08:00
ibuler b8c10a0350 Add assetgroup form save action 2016-09-06 01:09:03 +08:00
ibuler 126d7fd62c Add asset group add Form m2m 2016-09-06 00:49:42 +08:00
ibuler 3c6f50b788 Modify some bug 2016-09-05 23:42:10 +08:00
ibuler 2cb6b15bc3 set textarea rows 2016-09-05 23:12:01 +08:00
ibuler 2f5b7ad654 Modify asset model 2016-09-05 22:57:43 +08:00
xiaokong1937@gmail.com 6aedfb5219 fix small template erros 2016-09-05 22:20:50 +08:00
xiaokong1937@gmail.com 397da7d676 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-09-05 21:38:37 +08:00
xiaokong1937@gmail.com e75d33439a fix captcha not valid bug of login view; use django's default login and logout view to enhance robustness 2016-09-05 21:38:21 +08:00
ibuler 7241f7509f Update nav 2016-09-05 20:27:44 +08:00
ibuler 8827fd2d74 Modify translation 2016-09-05 20:17:45 +08:00
ibuler 6fc3bbb97d Update initial data: fixtures dir 2016-09-05 19:41:34 +08:00
ibuler 508bda37f5 Modify form datetime valid error, because form format 2016-09-05 19:37:37 +08:00
ibuler a0ef3cfc34 Update locale dir name to zh 2016-09-05 19:17:18 +08:00
ibuler 1b9c9c48b6 Merge branch 'cmdb' 2016-09-04 21:54:17 +08:00
ibuler 22e20d29f5 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-09-04 21:50:39 +08:00
ibuler 0604f76f56 Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb 2016-09-04 21:47:20 +08:00
ibuler 4855e86a3f Add asset group view 2016-09-04 21:47:10 +08:00
wangyong 69349368bf cmdb merge model and url 2016-09-04 19:15:31 +08:00
wangyong b531d9eeb2 asset add html 2016-09-04 19:12:31 +08:00
ibuler 3972bd3ff3 Add asset traslation 2016-09-04 19:05:47 +08:00
ibuler d1c96cd4b2 Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb 2016-09-04 18:07:19 +08:00
ibuler 154783a974 Modify some and pull from server 2016-09-04 18:07:15 +08:00
wangyong fa07f4ee8a fix null 2016-09-04 18:06:14 +08:00
wangyong 0e8e88fac0 add admin|sys user model 2016-09-04 17:50:30 +08:00
wangyong 426c3c4062 add asset amdin|sys user model 2016-09-04 17:43:03 +08:00
ibuler 8d0334e003 Add translation 2016-09-04 17:34:48 +08:00
ibuler 0ab015abfd Asset add traslation 2016-09-04 17:15:26 +08:00
ibuler 7350e150c8 Merge branch 'master' into cmdb 2016-09-04 16:39:27 +08:00
ibuler 61f0205529 Modify users url to singular 2016-09-04 16:05:58 +08:00
ibuler 11d06b5e2b Add asset group view and url 2016-09-04 16:02:51 +08:00
ibuler acd98365c1 Fix translation 2016-09-04 12:31:20 +08:00
liuzheng712 32c49c080c update 2016-09-04 07:04:15 +08:00
liuzheng712 d371c0c5ae mkdirp 2016-09-04 06:55:12 +08:00
ibuler 47171174b5 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-09-04 00:52:04 +08:00
ibuler f274684473 Add translation for support i18n 2016-09-04 00:51:36 +08:00
wangyong d96ac56460 merge master 2016-09-03 23:01:36 +08:00
wangyong 77f3a1f146 add asset add 2016-09-03 19:05:50 +08:00
ibuler ba3f46fbd6 i18n 2016-09-03 19:02:18 +08:00
ibuler 0b406b6988 Add captch login using 2016-09-03 14:37:01 +08:00
ibuler 6f0cfd23c1 Rm logout.html 2016-09-03 00:39:52 +08:00
ibuler 10d51ada37 Update login error message 2016-09-03 00:39:06 +08:00
lijiejie cec5a7f2c6 create the restframework url 2016-09-02 22:51:10 +08:00
lijiejie 829df26b0f create the api 2016-09-02 22:49:51 +08:00
ibuler 90ca5a8bb7 start capcha support 2016-09-02 22:23:15 +08:00
ibuler 9803dd9547 Add ico, Modify forget_password 2016-09-02 18:10:26 +08:00
ibuler 3a9cf6c360 Add forget password and reset password 2016-09-01 23:09:58 +08:00
ibuler 8ff872f41d Add ls config 2016-09-01 16:05:14 +08:00
ibuler 5940cec0e6 Add user and send mail 2016-09-01 01:12:02 +08:00
ibuler 5359da3ce2 Finish user login 2016-08-31 23:42:06 +08:00
ibuler c9369db578 Add new login page 2016-08-31 20:39:25 +08:00
ibuler b31f8d5867 Add user generate reset password token 2016-08-31 19:28:06 +08:00
ibuler 5350f83275 Add celery usage more 2016-08-31 16:48:12 +08:00
广宏伟 dd80b94b43 Update README.md 2016-08-31 16:43:44 +08:00
广宏伟 4cbadbd941 Update README.rst 2016-08-31 16:43:18 +08:00
广宏伟 e61341df79 Update README.md to README.rst 2016-08-31 16:33:05 +08:00
ibuler f7ab26a5da Add celery broker 2016-08-31 15:54:04 +08:00
ibuler 0d3bde1191 User add confirmed 2016-08-31 12:14:25 +08:00
ibuler c143735393 Add ssh-key-gen function 2016-08-31 01:00:20 +08:00
ibuler 43af5383e3 Add model user method: get_token set_token 2016-08-30 20:30:47 +08:00
ibuler ffed46175d update .gitignore 2016-08-30 17:26:33 +08:00
ibuler 31a39be9ea Resolve conflicts 2016-08-30 17:22:06 +08:00
ibuler 2022ca8e10 Add test code 2016-08-30 17:20:39 +08:00
wangyong d0d433db1a add asset_list 2016-08-30 13:50:30 +08:00
yumaojun03 e8d8f7c406 ops: ansible_api add ansible api 2.0 adhoc runner 2016-08-30 13:00:06 +08:00
yumaojun03 f6b2abb1fb add ansible 2.0 2016-08-30 01:16:14 +08:00
ibuler 011c125564 Modify user active api And Add Token authorization 2016-08-30 00:10:27 +08:00
ibuler 1a9f90a08e Modify api 2016-08-29 21:09:32 +08:00
ibuler 3eb4897bd3 Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api 2016-08-29 19:27:23 +08:00
ibuler 3c9dbaf860 Fix some bug 2016-08-28 23:58:22 +08:00
ibuler d918d5b466 Add Logger setting . 2016-08-26 16:56:50 +08:00
ibuler d95ffdfbf7 Test permmision 2016-08-26 00:51:05 +08:00
yumaojun03 363ddb70e2 add celery support (not use django-celery) 2016-08-25 19:52:03 +08:00
ibuler bb76f6c652 Add api authentication 2016-08-25 19:29:59 +08:00
ibuler 641e998504 Update context name path1, path2 => app, action 2016-08-25 13:56:49 +08:00
ibuler 0a9e4a5e85 Modify urls.conf: Merge to single 2016-08-25 13:28:02 +08:00
ibuler 8aa92bb688 Add api: UserApi And UserGroupApi 2016-08-24 19:42:16 +08:00
ibuler 1d5faa3101 Delete Model: Role 2016-08-24 17:14:21 +08:00
ibuler b97b34961c Modify api: complete some setting 2016-08-24 12:29:19 +08:00
ibuler a43ac90b21 Modify CRLF to LF 2016-08-24 00:13:58 +08:00
ibuler bbecbc8578 Merge with webternimal 2016-08-24 00:12:46 +08:00
ibuler 6458231946 Add api file 2016-08-24 00:11:13 +08:00
yumaojun03 97a2e8bb50 test add celery 2016-08-23 23:51:39 +08:00
liuzheng712 400d744938 add api redirect 2016-08-23 23:29:33 +08:00
liuzheng712 7cebc4efe8 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-08-23 22:35:00 +08:00
liuzheng712 91f0800e26 add webterminal 2016-08-23 22:34:52 +08:00
ibuler a99a6b6946 Split tests file in tests module 2016-08-23 22:19:39 +08:00
ibuler c37dea2079 Add user add view Test Case 2016-08-23 19:36:15 +08:00
ibuler b55b516fc3 Update foot_js.html add active 2016-08-23 17:34:52 +08:00
ibuler 1f3c0d004f Change update batch, add _list_base.html 2016-08-23 17:14:08 +08:00
ibuler 3c3fda8064 Change chosen To select2 lib 2016-08-23 14:44:06 +08:00
ibuler ae9bbb40fd Add flash message template 2016-08-23 12:18:19 +08:00
ibuler 8e5e788bcd Test case added 2016-08-23 00:39:07 +08:00
liuzheng712 c50cdd2976 add webterminal 2016-08-22 23:53:14 +08:00
ibuler f45690b34f Add test case 2016-08-22 19:53:01 +08:00
ibuler f0b0e41d33 Update user edit 2016-08-21 22:37:55 +08:00
wangyong 3771b2ff70 add asset detail and list 2016-08-21 22:12:17 +08:00
ibuler 8b0f31c43a modify list, edit url error 2016-08-21 21:32:20 +08:00
ibuler 8ba7b078fd Finish expaire date 2016-08-21 21:31:25 +08:00
ibuler 57f0b04387 Modify project statucure guide and init data 2016-08-21 20:59:39 +08:00
ibuler 24d7cb3d5d add init data dir fixture 2016-08-21 15:03:57 +08:00
ibuler 85cf2169d4 Modify readme 2016-08-21 13:59:44 +08:00
ibuler 0427d406b9 Add init data file 2016-08-21 01:16:30 +08:00
ibuler e355c7b8ef Modify pagination and Role model 2016-08-20 18:33:18 +08:00
ibuler 6e46a17d98 Useradd group change 2016-08-20 00:42:50 +08:00
ibuler e48f36397e Modify url 2016-08-20 00:18:44 +08:00
ibuler cf15b7eaff Add UserGroup some View 2016-08-19 01:39:08 +08:00
ibuler 651e89994e modify list and sort 2016-08-18 22:29:35 +08:00
ibuler 342298ad3e reslove conflict 2016-08-18 14:43:10 +08:00
ibuler a76191ffdc Change view detail template 2016-08-18 10:20:37 +08:00
ibuler 279987925a Modify user detail of usergroup 2016-08-18 00:47:34 +08:00
ibuler 824b1c7f6f update user update view 2016-08-17 22:17:16 +08:00
ibuler bcae7beae6 upload avatar 2016-08-17 00:36:54 +08:00
ibuler 9353022627 add context 2016-08-17 00:23:52 +08:00
ibuler 35abf16f7d Modify panel color 2016-08-17 00:22:33 +08:00
ibuler c14eb42186 reslove conflict add user detail template 2016-08-17 00:14:56 +08:00
ibuler 98d6043f2d merged 2016-08-16 23:25:30 +08:00
ibuler 7a8d4a3a59 Add delete view 2016-08-16 22:13:06 +08:00
ibuler 3bf0d4aabb Add common app 
common app used as write public api or templatetags

modify user list view and user edit view
 2016-08-16 00:09:48 +08:00
ibuler edd60cad11 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-08-15 22:54:56 +08:00
广宏伟 e3223f745a app users 
Modify user list view
Modify user add view
 2016-08-15 21:10:30 +08:00
wangyong fcd39370ed add asset some cbv 2016-08-14 22:10:10 +08:00
广宏伟 86ffcc973c Add user template 2016-08-14 19:18:41 +08:00
ibuler 9493fb07cb Add user list view 2016-08-14 17:21:04 +08:00
ibuler 9303415b89 modify some issues 2016-08-14 00:40:21 +08:00
ibuler 234684c875 Rename dir name dashboard to apps 
It's may be well
 2016-08-13 21:59:08 +08:00