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

353 Commits (bb30fcd7fdec98168a6361d60a62e55876bc58c4)

Author SHA1 Message Date
ibuler e3aa18ff2d [Update] 修改get_current_org 为 proxy对象 current_org 2018-07-20 17:49:47 +08:00
ibuler 8883e0090f [Update] 更改版本号 2018-07-17 17:12:28 +08:00
ibuler 7412bdcba7 [Update] 完成基本框架 2018-07-13 15:05:46 +08:00
ibuler d6ec92d82d [Update] 修改url 2018-07-13 00:31:50 +08:00
ibuler 73f9f54620 [Update] 修改版本号 2018-06-11 11:23:32 +08:00
BaiJiangJie 842841128f Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-06-06 15:35:40 +08:00
xiaodong 6b2a38c78d remove useless image 2018-06-06 08:17:45 +08:00
BaiJiangJie ee35ca3643 [Feature] 增加功能，安全设置（全局MFA设置，密码强度校验） 2018-06-05 17:26:31 +08:00
ibuler b9d0d89f66 [Update] 更改版本好 2018-05-24 13:32:20 +08:00
ibuler 0b89ff17fd [Update] 修改版本号 2018-05-02 10:48:39 +08:00
BaiJiangjie ea2863a51b [Update] 创建用户、资产成功的提示信息可关闭 2018-04-24 22:10:52 +08:00
老广 7aa2bb06e8
Merge pull request #1228 from wojiushixiaobai/dev 
添加升级脚本
 2018-04-24 10:41:23 +08:00
BaiJiangjie b5fc76d6a5 [Update] 修改用户首次登录页 2018-04-23 21:04:46 +08:00
wojiushixiaobai 5c7acae018 更改版本号 2018-04-22 20:18:10 +08:00
ibuler 071d14c639 [Update] 修改资产获取select 2018-04-13 21:26:10 +08:00
ibuler 823e879432 [Update] 更新节点移动交互 2018-04-13 15:48:10 +08:00
ibuler 7d14e1f248 [Update] 更改版本号 2018-04-12 09:49:44 +08:00
ibuler cb8e59edf2 [Update] 修改文案 2018-04-06 13:23:15 +08:00
ibuler 37c0062fae [Update] 添加审计模块 2018-04-06 11:27:52 +08:00
ibuler 7f4f67aa8d [Update] 支持网域 2018-03-23 19:46:46 +08:00
ibuler a58db9826e [Update] 升级版本号 2018-03-14 19:57:35 +08:00
q4speed 4d7fbcc49b 修复文字过长bug 2018-03-14 18:01:37 +08:00
ibuler f2251bbb32 [Update] index 2018-03-07 22:38:37 +08:00
ibuler 2def25cae6 [Update] 修改文档地址 2018-03-07 19:08:42 +08:00
ibuler 0aa4755565 [Update] 修改链接 2018-03-06 21:09:40 +08:00
ibuler 25ebb5c442 [Update] 修改一些bug 2018-03-06 17:05:36 +08:00
ibuler bc230e0ea5 [Update] 更新文档地址 2018-03-05 15:25:49 +08:00
ibuler bd4f96134f [Update] 修改一些文案 2018-03-04 13:01:33 +08:00
ibuler d284c2175d [Update] 修改一些小问题 2018-03-02 15:39:01 +08:00
ibuler f7ab13952e [Bugfix] 修复bug，修改celery beat版本依赖 2018-03-02 09:36:17 +08:00
ibuler 5dcdeddf22 Merge remote-tracking branch 'github/dev' into dev 2018-03-01 13:39:52 +08:00
ibuler 521a5c57a2 [Update] 统一copyright 2018-02-28 11:23:04 +08:00
q4speed 05255f850f Merge remote-tracking branch 'origin/dev' into dev 2018-02-26 17:28:18 +08:00
q4speed c96a107e0a 对齐菜单文字。修改英文 2018-02-26 17:28:03 +08:00
ibuler e2cb128794 [Update] 修改翻译 2018-02-26 16:57:34 +08:00
ibuler f1c386714d [Update]一些修改 2018-02-25 22:36:42 +08:00
ibuler 08edda35e1 [Update] 完成资产书 2018-02-25 18:08:00 +08:00
ibuler 2d3967872b [Feature] 完成资产授权和资产添加 2018-02-02 17:06:08 +08:00
ibuler b0fab2453a [Merge] 合并标签功能 2018-01-26 15:49:09 +08:00
ibuler 17f91f7f53 [Update] 修改位置 2018-01-25 15:43:52 +08:00
ibuler 7433327d75 [Feature] 标签管理功能 2018-01-23 19:37:22 +08:00
ibuler f37b331630 Merge with dev 2018-01-23 15:13:24 +08:00
ibuler 9dbf498322 [Update] 修改copyright 2018-01-23 12:40:22 +08:00
ibuler 8e6efac6db [Update] 修改copyrite 2018-01-23 12:39:19 +08:00
ibuler 579e74dd5d [Bugfix] 修复一些bug 2018-01-23 12:22:25 +08:00
ibuler 2f136800c7 [Update] 修改默认头像和logo 2018-01-22 23:47:41 +08:00
ibuler 5bbad01909 [Feature] 增加标签 2018-01-16 16:32:06 +08:00
ibuler 39fff235d1 [Bugfix] 修复cluster创建的bug 2018-01-14 18:02:11 +08:00
ibuler d48f8dceb5 [Update] 修改翻译 2018-01-12 15:55:08 +08:00
ibuler abb1a40a4f [Feature] 添加basic settings 2018-01-12 15:43:26 +08:00
ibuler b49e3b8f84 [Update] api 返回platform, 并增加web terminal nav 2018-01-10 19:39:22 +08:00
ibuler 6aaa106aff [Bugfix] 修复以下bug 
1. 查看执行历史异常
2. 用户授权资产页显示message
 2018-01-10 18:08:27 +08:00
ibuler 450a9495ec [Bug&Update] 以下bug和功能 
- 修复新建资产不选管理用户和集群异常bug
- profile下拉增加icon
- 授权api增加os和platform
 2018-01-09 13:10:28 +08:00
ibuler 07a70311df [Bugfix] 修复以下bug 
- 删除用户报错，上次更新带来的
- 管理员用户页面会看到所有主机的，而不是授权给自己的
- 授权详情页面 资产显示无效
 2018-01-08 11:22:19 +08:00
ibuler 1888c698f1 [Bugfix] 修复一些bug 2018-01-05 17:57:02 +08:00
ibuler afce4c81a8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-01-05 14:56:50 +08:00
ibuler 28223421b1 [Bugfix] 修复一下bug 
1. 添加管理用户时同名的异常
2. 添加授权规则的检查
 2018-01-05 14:36:49 +08:00
q4speed 9a2fbba956 修改访问官网链接 2018-01-03 15:07:46 +08:00
ibuler a327c46229 Merge remote-tracking branch 'github/dev' into dev 2018-01-02 19:37:56 +08:00
ibuler 720dc9ab05 [Bugfix] 修复以下bug 
- session时区
- 切换管理和用户页面cookie问题
- 创建权限时验证
- 一些翻译
 2018-01-02 19:36:13 +08:00
q4speed 25fa392dda 修复图片高度和大小 2018-01-02 17:51:25 +08:00
q4speed ad3297ff2f 显示个人头像 2018-01-02 17:40:49 +08:00
q4speed ab27d1c193 修改菜单折叠起来时Logo 2018-01-02 17:31:20 +08:00
q4speed 8160425672 修改Logo 2018-01-02 17:07:00 +08:00
ibuler 68ccec6b9c [UPdate] 修改cookie设置 2018-01-02 17:02:03 +08:00
ibuler 3b6403b2f2 [Update] 修改一些翻译 2018-01-01 15:08:33 +08:00
ibuler c48531c586 [Update] 添加和修改部分翻译 2018-01-01 00:45:12 +08:00
ibuler 0916757eb8 [Bugfix] 修复一些bug 2017-12-31 21:51:25 +08:00
ibuler e0a3fafbd5 [Bugfix] 详见trello 2017-12-30 02:29:29 +08:00
ibuler e20444983d [Bugfix] 修改html bug 2017-12-28 12:25:43 +08:00
ibuler 825edadc13 [Update] Add build no 2017-12-28 01:08:39 +08:00
ibuler bf9bb1b973 [Update] 修改ops task运行 2017-12-24 18:53:07 +08:00
ibuler 76df1de634 [Bugfix] 修复一些明显的bug 2017-12-21 11:31:13 +08:00
ibuler 6cee62696c [Feature] 翻译，并增加设置导航 2017-12-15 17:38:46 +08:00
ibuler 08e1788426 [Feature] 打算拆分下载和上传为独立模块，时间有限暂时放弃 2017-12-14 21:27:14 +08:00
ibuler 17ddb3bbbd [Feture] 使用信号解耦 2017-12-13 17:21:08 +08:00
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码 2017-12-12 12:19:45 +08:00
ibuler cbc000696e [Feature] 修改adminuser systemuser cluster及他们的关系 2017-12-11 17:08:43 +08:00
ibuler 0c9e24dc59 [Feture] 添加ops 页面 2017-12-11 00:29:25 +08:00
ibuler 27a1849b1d [Change] 修改idc => cluster 2017-12-07 16:25:50 +08:00
ibuler e57121a780 [Feature] 优化Ops ansible api 2017-12-06 18:31:51 +08:00
ibuler ec8106e43d [Feature] 完成登陆日志 2017-12-05 12:24:31 +08:00
ibuler a5f9735906 [Update] 更新index view 2017-12-04 20:15:47 +08:00
ibuler 71a3079221 [Feature] 离线session完成 2017-12-04 16:41:00 +08:00
ibuler bf8fa95597 [Update] 修改session 2017-12-01 21:22:32 +08:00
ibuler 1920a0f03d [Bugfix] 修改nav小bug 2017-12-01 17:37:46 +08:00
ibuler 3120cef335 [Change] 修改导航列表 2017-12-01 17:29:57 +08:00
ibuler 61a8d95f46 [Change] Rename applications -> terminal 2017-12-01 17:28:47 +08:00
ibuler 26607bc327 [Copyright] 修改copyrite 2017-11-23 14:35:16 +08:00
ibuler 688a836bbe [Copywriting] Copywriting change fixes #733 2017-09-28 07:15:36 +08:00
njqaaa dd6c82b168 fix left's users logout (#446) 
* fix left's users logout

* fix issues 445
 2017-05-25 14:12:16 +08:00
ibuler 1719eee264 [Bugfix] 修复py3 bytes bug 2017-05-24 20:12:50 +08:00
ibuler 071d1922d0 stash it 2017-04-10 22:55:15 +08:00
ibuler 5418d0b44c [Change] Using csv replace xlsx 2017-04-09 00:45:28 +08:00
ibuler b913bce398 [Bugfix] 修改翻译bug 2017-04-07 17:09:25 +08:00
ibuler c11374ae39 [Bugfix] 修改翻译 2017-04-07 16:59:09 +08:00
ibuler 97fb2a4fe6 [Fixture] 修改index页面 2017-04-03 00:27:18 +08:00
ibuler 709552f14c [Fixture] 添加首页 2017-04-02 18:09:40 +08:00
ibuler 7720e9f3fd [Change] 修改图片 2017-03-31 18:47:50 +08:00
ibuler 61a481f427 [Fixture] 添加用户连接终端 2017-03-31 11:25:25 +08:00
ibuler 3fa5ce5404 [Fixture] 添加用户信息更改 2017-03-30 16:28:00 +08:00
ibuler 0983f294b7 [Fixture] 添加用户profile 2017-03-30 00:51:36 +08:00
ibuler 4e7b665ea8 [Change] 添加翻译，并添加用户登陆页面 2017-03-29 15:26:32 +08:00
ibuler 1f9dbb6bdc [Change] 修复验证码模糊度 2017-03-24 23:13:17 +08:00
ibuler 10eb13920b [Delete] 删除资产tag 2017-03-24 14:48:18 +08:00
ibuler a57dac0706 [Fixture] 拆分proxy log 为在线和离线 2017-03-24 14:23:51 +08:00
ibuler b60e5a7ee3 [Change] 修改一些view 2017-03-24 00:27:33 +08:00
ibuler caec9709ef [Fixture] 添加task list 搜索，重试 2017-03-22 21:57:05 +08:00
ibuler 240c7db416 [Fixture] 添加 rerun function 2017-03-14 14:15:13 +08:00
ibuler 915873135e [Fixture] 添加runner run record 2017-03-14 00:58:25 +08:00
ibuler ab62bfca7e [Bugfix] 修改一些bug 2017-03-04 16:38:26 +08:00
ibuler b055144908 Merge with audits 2017-03-01 15:35:11 +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
ibuler 0869931e67 [Bugfix] 修改了一些issue上的bug 2017-01-20 20:13:22 +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
yumaojun03 150e1030c3 ansible Task接口更上层抽象的基本实现 2016-12-19 14:07:21 +08:00
Administrator 8e0afb2cc4 调整模型 2016-11-27 11:30:23 +08:00
Administrator 984391e2b2 同步Master分支上的代码, 解决部分冲突问题 2016-11-24 22:10:04 +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 18e0fee1a7 [future] 添加作业中心基础框架 2016-11-22 21:08:45 +08:00
ibuler 8d358a7a68 UPdate some 2016-11-14 19:28:21 +08:00
ibuler 10aa8c40a7 Add login log 2016-11-10 23:54:21 +08:00
ibuler 8d7759d22f change user api 2016-11-09 19:29:15 +08:00
ibuler 968b1b4cb6 Stash 2016-11-06 21:29:04 +08:00
ibuler 41337d28c3 add proxy log search 2016-11-05 01:15:25 +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 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 c2aab50c7b Add proxy log list 2016-10-25 23:23:01 +08:00
ibuler 45dcb26123 Merge branch 'audits' 2016-10-19 15:14:07 +08:00
ibuler 303659cb0e Change app name apps => terrminal 2016-10-17 15:24:41 +08:00
ibuler 4531157c72 may be some wrong 2016-10-16 22:12:13 +08:00
江世峰 abe09e2a85 asset:update assets_list by tag 2016-10-14 19:28:58 +08:00
江世峰 73f5891f87 asset:update assets_list by tag 2016-10-12 18:57:51 +08:00
江世峰 b99b88a30f asset:update tag 2016-10-08 18:33:00 +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 f9b49605e4 user-group detail page: users op 2016-09-28 21:11:43 +08:00
xiaokong1937@gmail.com 70a6ddc897 fix #27 2016-09-27 20:16:46 +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
xiaoyu af713672fb user list page bulk action 2016-09-22 16:06:46 +08:00
ibuler ce5950ca73 Merge with asset 2016-09-20 00:43:30 +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 8a5a4f3362 fix #14 2016-09-18 14:28:34 +08:00
ibuler 502c7e756b Modify asset 2016-09-17 23:43:41 +08:00
ibuler 766bd3b76d Move js to jumpserver.js 2016-09-15 13:09:24 +08:00
ibuler bb8852d57e Modify some style 2016-09-15 12:20:53 +08:00
ibuler f253d2ea69 Merge with master 2016-09-14 23:31:22 +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
xiaokong1937@gmail.com 6751c5a63a reset user password and ssh pk implement 2016-09-13 21:45:10 +08:00
ibuler 6d736d7309 Finish permission create and list 2016-09-11 22:45:24 +08:00
ibuler 324bb68667 user-pserm 2016-09-11 16:59:19 +08:00
ibuler 4fc9274e00 Add asset system user 2016-09-09 00:09:49 +08:00
ibuler 6f4a832389 Add admin user list view 2016-09-08 00:40:59 +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
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
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 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
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 508bda37f5 Modify form datetime valid error, because form format 2016-09-05 19:37:37 +08:00
ibuler 4855e86a3f Add asset group view 2016-09-04 21:47:10 +08:00
ibuler 3972bd3ff3 Add asset traslation 2016-09-04 19:05:47 +08:00
ibuler acd98365c1 Fix translation 2016-09-04 12:31:20 +08:00
ibuler f274684473 Add translation for support i18n 2016-09-04 00:51:36 +08:00
ibuler 0b406b6988 Add captch login using 2016-09-03 14:37:01 +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 c9369db578 Add new login page 2016-08-31 20:39:25 +08:00
ibuler 3c9dbaf860 Fix some bug 2016-08-28 23:58:22 +08:00
ibuler d95ffdfbf7 Test permmision 2016-08-26 00:51:05 +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 1d5faa3101 Delete Model: Role 2016-08-24 17:14:21 +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 ae9bbb40fd Add flash message template 2016-08-23 12:18:19 +08:00
ibuler e355c7b8ef Modify pagination and Role model 2016-08-20 18:33:18 +08:00
ibuler cf15b7eaff Add UserGroup some View 2016-08-19 01:39:08 +08:00
ibuler 279987925a Modify user detail of usergroup 2016-08-18 00:47:34 +08:00
ibuler 7a8d4a3a59 Add delete view 2016-08-16 22:13:06 +08:00