github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,412 Commits
66 Branches
247 Tags
108 MiB
Commit Graph

1652 Commits (1b1c91bab01f1f874c5a76541aa55f44b4c8502b)

Author SHA1 Message Date
ibuler 40d2934de0 [Bugfix] 修复首页无法显示数据的bug 2018-03-07 16:04:13 +08:00
ibuler cd9000e7e9 [Update] 修改Node value唯一 2018-03-07 12:13:03 +08:00
ibuler d3e77b09ef [Merge] with doc 2018-03-06 18:04:03 +08:00
ibuler 86c0a2d28b [Update] 修改部分翻译和文档 2018-03-05 17:14:42 +08:00
ibuler e123599735 [Update] 修改一些bug和文案 2018-03-05 12:59:14 +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 1018deda96 [Update] 支持拖拽更新 2018-03-01 12:40:41 +08:00
ibuler 31629fc975 [Bugfix] 修复资产禁用还可以登录 2018-03-01 10:44:55 +08:00
ibuler f886e7c2f5 [Update] 修改授权api, windows资产只有rdp协议，linux只有ssh协议 2018-02-27 19:39:27 +08:00
ibuler 91863107d7 [Bugfix] 修复管理用户无法查看的bug 2018-02-27 15:32:30 +08:00
ibuler 870b863136 [Update] 修改设置的一些require 2018-02-27 15:04:05 +08:00
ibuler 9292e48554 [Bugfix] 用户csv导入编码问题 2018-02-27 12:18:36 +08:00
ibuler e2cb128794 [Update] 修改翻译 2018-02-26 16:57:34 +08:00
q4speed 66b8e8bcf8 增加隐藏树功能 2018-02-26 16:31:51 +08:00
ibuler f1c386714d [Update]一些修改 2018-02-25 22:36:42 +08:00
ibuler f0dd7d54c8 [Update] 修改资产model 2018-02-25 18:40:15 +08:00
ibuler 08edda35e1 [Update] 完成资产书 2018-02-25 18:08:00 +08:00
ibuler c8728cace4 [Update] 完成树形改造 2018-02-09 15:24:44 +08:00
ibuler c7296c2498 [Update] 修改系统用户推送，拆分assets的部分模块 2018-02-09 11:12:40 +08:00
ibuler f82d939d15 [Update] 使用资产树，去掉集群和资产组 2018-02-08 11:34:21 +08:00
ibuler 3bb6e08985 [Feature] 更改perms api 2018-02-07 23:25:15 +08:00
ibuler 6104acae8f [Update] 资产列表选中和移除资产 2018-02-07 13:39:45 +08:00
ibuler bd4768c147 [Update] 拆分asset api module 2018-02-06 18:32:02 +08:00
ibuler d047ff3b3a Merge branch 'dev' into tree 2018-02-06 13:02:30 +08:00
liuzheng712 6edd3f6cf8
feat: rdp support 2018-02-05 21:54:57 +08:00
ibuler 114289edaf [Bugfix] 修改创建系统用户的bug 2018-02-02 19:04:09 +08:00
ibuler 2d3967872b [Feature] 完成资产授权和资产添加 2018-02-02 17:06:08 +08:00
ibuler 653c328e84 [Abandon] ... 2018-02-01 17:14:15 +08:00
ibuler 2bc5e882fd [Update] 更改授权规则前commit 2018-02-01 15:06:44 +08:00
ibuler 21a7202587 [Bugfix] 修复ldap认证bug 2018-02-01 12:33:05 +08:00
ibuler a10ff5930f [Update] 修改资产创建 2018-02-01 10:22:20 +08:00
ibuler 017c3ae36a [Update] 修改ztrr 2018-02-01 01:03:31 +08:00
ibuler c4b52cb2a3 [Update] 去掉资产组添加 2018-02-01 00:33:00 +08:00
ibuler 5f2ca58d62 [Bugfix] 修改label api bug 2018-01-31 18:59:43 +08:00
ibuler 1c7212014b [Bugfix] 修改创建label时报错的bug 2018-01-31 18:48:07 +08:00
ibuler 97dd411ab8 [Bugfix] 修复组详情bug 2018-01-31 17:06:04 +08:00
ibuler d2ad10af9a [Bugfix] 修复组详情bug 2018-01-31 17:04:15 +08:00
ibuler 2f06a2b1d3 [Feature] tree增删功能 2018-01-31 17:01:21 +08:00
ibuler 1ac30ed09c [Feature] 使用ztree 2018-01-31 12:46:33 +08:00
ibuler 3603b33a42 [Feature] 添加资产树 2018-01-31 10:46:26 +08:00
ibuler 460fa8e8a9 [Feature] tree 2018-01-30 19:57:47 +08:00
ibuler 9e09a962af [Feature] 支持popover 2018-01-30 18:07:51 +08:00
ibuler 3e62a7f5b7 [Update] 修改认证 2018-01-30 16:12:33 +08:00
ibuler b4f833740e [Bugfix] 资产批量便捷 2018-01-30 14:54:27 +08:00
ibuler 1fbf4ac08c [Update] 删除部分资产属性 2018-01-30 14:46:02 +08:00
ibuler da4c5f48a1 [Update] 修改获取资产信息产生的异常 2018-01-30 12:09:33 +08:00
ibuler 1192e8cdad [Bugfix] 修复系统用户上传秘钥的bug 2018-01-30 11:56:41 +08:00
ibuler bad397e2e6 [Update] 修复获取资产信息异常bug 2018-01-30 10:38:40 +08:00
ibuler 58d22b72ec [Feature] Label 删除修改 2018-01-29 16:25:30 +08:00
ibuler 6d4e9c7d30 [Bugfix] 资产model 太长 2018-01-26 17:17:37 +08:00
ibuler 723805d395 [Bugfix] 修复bsd获取cpu数量bug 2018-01-26 16:28:40 +08:00
ibuler 41756b06e1 [Bugfix] 修复获取kvmcpu的bug 2018-01-26 16:21:14 +08:00
ibuler 9e36a2cbb1 [Update] ansible disk bug 2018-01-26 16:06:36 +08:00
ibuler f0b9a11482 [Update] ansible disk bug 2018-01-26 16:06:23 +08:00
ibuler f6d21585ab [Bugfix] 修复资产搜索bug 2018-01-26 15:53:43 +08:00
ibuler b0fab2453a [Merge] 合并标签功能 2018-01-26 15:49:09 +08:00
ibuler b2d6645f46 [Feature] 添加资产详情标签 2018-01-26 15:32:23 +08:00
ibuler cb902362b5 [Feature] 资产列表标签搜索 2018-01-26 14:47:10 +08:00
ibuler 070c3d73cc [Bugfix] git status 2018-01-25 12:16:26 +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 b936d54a48 [Feature] 添加es支持 2018-01-20 22:22:09 +08:00
ibuler ce9ff67b24 [Bugfix] 读取不到prefix 2018-01-17 16:18:33 +08:00
ibuler 5bbad01909 [Feature] 增加标签 2018-01-16 16:32:06 +08:00
ibuler f1ec53d1bc [Remove] labels 2018-01-16 11:26:30 +08:00
ibuler d3109a03b2 [Bugfix] 修复资产列表显示bug 2018-01-16 11:20:26 +08:00
ibuler 7e2d627d3f [Bugfix] 资产列表选择别的页会报错 2018-01-15 18:14:58 +08:00
ibuler b2f97a263d [Feature] 添加后端paging 2018-01-15 17:41:49 +08:00
ibuler 39fff235d1 [Bugfix] 修复cluster创建的bug 2018-01-14 18:02:11 +08:00
ibuler abb1a40a4f [Feature] 添加basic settings 2018-01-12 15:43:26 +08:00
ibuler 121f56f44b [Feature] 添加setting页面 2018-01-11 20:10:27 +08:00
ibuler b49e3b8f84 [Update] api 返回platform, 并增加web terminal nav 2018-01-10 19:39:22 +08:00
ibuler 3223d3b74d [Bugfix] 修复了一些显示上的bug 2018-01-10 17:38:10 +08:00
ibuler b2b123b41e [Bugfix] 用户添加报错 2018-01-10 15:15:29 +08:00
ibuler 99cd685194 [Bugfix] 默认default cluster 2018-01-10 12:03:35 +08:00
ibuler b4080be5be [Update] 修改一些翻译 2018-01-10 00:38:21 +08:00
ibuler 22af44211d [Update] set default cluster 2018-01-09 23:33:14 +08:00
ibuler a4d02adb22 [Update] system user form add label 2018-01-09 23:14:25 +08:00
ibuler 72a82c41ee [Update] 修改 success message, 添加资产组时可以添加资产 2018-01-09 23:07:53 +08:00
ibuler 450a9495ec [Bug&Update] 以下bug和功能 
- 修复新建资产不选管理用户和集群异常bug
- profile下拉增加icon
- 授权api增加os和platform
 2018-01-09 13:10:28 +08:00
ibuler c0829194dc [Update] 修改一些bug, 增加执行task的按钮 2018-01-08 19:16:28 +08:00
ibuler dfaf029a68 [Bugfix] 资产导入bugfix 2018-01-08 15:51:08 +08:00
ibuler 3f1863151a [Bugfix] 修复session搜索bug 2018-01-08 15:15:21 +08:00
ibuler 676d640e70 [Bugfix] 修复导出csv和更新资产环境变量冲突 2018-01-08 14:58:07 +08:00
ibuler 07a70311df [Bugfix] 修复以下bug 
- 删除用户报错，上次更新带来的
- 管理员用户页面会看到所有主机的，而不是授权给自己的
- 授权详情页面 资产显示无效
 2018-01-08 11:22:19 +08:00
ibuler c16471d54f [Bugfix] 资产导入中下载模板异常 2018-01-05 19:09:42 +08:00
ibuler 1888c698f1 [Bugfix] 修复一些bug 2018-01-05 17:57:02 +08:00
ibuler 28223421b1 [Bugfix] 修复一下bug 
1. 添加管理用户时同名的异常
2. 添加授权规则的检查
 2018-01-05 14:36:49 +08:00
ibuler 56fd18241d [Update] 修改一些翻译 2018-01-04 09:29:54 +08:00
ibuler 239a829c20 [Bugfix] support xvdx disk 2018-01-02 14:49:52 +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 0b299344a7 [Update] 修改database 表现 2017-12-31 12:20:08 +08:00
ibuler a755882100 [Bugfix] 修复打印中文报错异常 2017-12-30 22:26:05 +08:00
ibuler 6586bef84c [Modify] Add access log 2017-12-30 20:45:54 +08:00
ibuler e0a3fafbd5 [Bugfix] 详见trello 2017-12-30 02:29:29 +08:00
ibuler 3804ab532d [Update] 修改信号 2017-12-29 23:53:45 +08:00
ibuler 158678c2db [Bugfix] 修改bug，显示cluster 2017-12-28 18:01:15 +08:00
ibuler 69f723c8f5 [Bugfix] requirements 添加openssh-cleints 2017-12-28 16:06:07 +08:00
ibuler f992347fc5 [Update] 修改become信息 2017-12-28 14:25:56 +08:00
ibuler e20444983d [Bugfix] 修改html bug 2017-12-28 12:25:43 +08:00
ibuler 0848893f1e [Bugfix] 修复时间日期搜索的bug，select2模块自适应长度 2017-12-27 01:29:23 +08:00
ibuler 3d705dbeaa [Bugfix] 修复一些bug 2017-12-27 00:14:46 +08:00
ibuler 22b7b84a45 [Update] 修改创建默认集群，组等名称为Default 2017-12-26 22:14:37 +08:00
ibuler a39e0a1db9 [Docker] For docker update 2017-12-26 01:54:10 +08:00
ibuler d0ef1e715e [Add] Add initial migrations 2017-12-24 23:21:05 +08:00
ibuler bf9bb1b973 [Update] 修改ops task运行 2017-12-24 18:53:07 +08:00
ibuler 30efec1b09 [Update] 修改 task 运行机制 2017-12-22 21:42:12 +08:00
ibuler 4893c4664d [Update] 修改task定时运行机制 2017-12-22 02:08:29 +08:00
ibuler 76df1de634 [Bugfix] 修复一些明显的bug 2017-12-21 11:31:13 +08:00
ibuler 5a92972120 [Bugfix] 修复ops一些功能的bug 2017-12-20 11:30:15 +08:00
ibuler 3f89701b84 [Bugfix] 修复授权和资产的一部分bug 2017-12-19 19:38:09 +08:00
ibuler b0eace6ad8 [Bugfix] 基本完成assets模块 2017-12-19 12:41:00 +08:00
ibuler b4e1ac1953 [Bugfix] 修复资产模块中一些bug 2017-12-18 22:48:19 +08:00
ibuler a308000d2e [Bugfix] 修改users模块一些bug 2017-12-18 18:38:30 +08:00
ibuler e1163895e2 [Update] 系统用户api允许app user获取 2017-12-16 17:21:30 +08:00
ibuler 1b6fd4d13a [Bugfix] 修改普通用户获取资产详情的bug 2017-12-16 17:16:40 +08:00
ibuler 2d0be8f996 [git status 2017-12-15 17:07:52 +08:00
ibuler b97d5b0960 [Feature] assets task 修改 2017-12-15 15:50:15 +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 18fbfb449d [Feature] 修改url pattern 精确匹配uuid 2017-12-12 15:45:01 +08:00
ibuler cb57002682 [Change] 去掉前端html中的hardcode 99991937 2017-12-12 14:38:51 +08:00
ibuler 722863428d [Feature] 添加context_processor 2017-12-12 14:28:12 +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 18fd04d63c [Stash] Test case 通不过，import error 2017-12-08 10:15:27 +08:00
ibuler 27a1849b1d [Change] 修改idc => cluster 2017-12-07 16:25:50 +08:00
ibuler 2b3551f1fc [Feature] 修改ansible和ops 2017-12-07 13:01:33 +08:00
ibuler e57121a780 [Feature] 优化Ops ansible api 2017-12-06 18:31:51 +08:00
ibuler 19051d36dc [Update] 修改一些bug 2017-12-01 17:00:55 +08:00
ibuler 7910292e0f [Feature] 修改命令上传api 2017-11-29 19:27:04 +08:00
ibuler e7f38ec894 [Change] 全部使用uuid作为主键 2017-11-23 14:08:01 +08:00
ibuler d80cbe270a [Update] 修改用户获取自己授权资产的api，和查询用户授权资产组等api的Url和结构 2017-11-23 11:26:17 +08:00
ibuler 7f9ce57318 修改 terminal上报接口和api 2017-11-14 09:44:16 +08:00
ibuler 3639b190e3 Update perm api 2017-11-01 23:23:11 +08:00
ibuler da5b9be5ca [Bugfix] Update some translation and set warning, partial fix #646 2017-09-28 20:52:33 +08:00
ibuler 5446196471 [Bugfix] #695 Asset detail add or delete system user or group mixed 2017-09-27 07:20:16 +08:00
ibuler 0f9ae9efbb Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2017-09-25 22:15:42 +08:00
ibuler 4aef5b8229 [Bugfix] export asset pof error when none of assets 2017-09-25 22:15:22 +08:00
Caijun 43a0c4fe51 Fix importing csv bugs (#717) 
* Fix exporting csv bugs

1. auto detect the encoding of csv
2. if id in csv is empty, let it equal 0
3. if hostname exists, give up this asset

* Add chardet to requirements.txt
 2017-09-24 09:16:47 +08:00
ibuler e6537699fd [Bugfix] Update asset create template bug 2017-09-13 10:09:17 +08:00
ibuler d73d6e943b update user model charfield max length more than 767 bug 2017-08-31 16:04:57 +08:00
ibuler cd1d690fd3 [Bugfix] 修复一些bug 2017-07-28 21:52:43 +08:00
ibuler 5ffd1f99fd [Bugfix] 修复更新bug 2017-07-24 22:42:01 +08:00
ibuler cc1a339142 [bugfix] system user update bug 2017-07-24 21:59:55 +08:00
ibuler 477d23ea37 fix some bug 2017-07-20 07:55:24 +08:00
Eli 7c154abf70 fix bug: variable i should be the host name (#538) 
fix bug: variable i is not the host name, because summary['failed'] is something like [("hostname1", "error message 1"),("hostname1", "error message 1")]
 2017-07-13 14:00:17 +08:00
Eli 370cdc275a 添加一个资产，然后推送系统用户时出现（Asset实例无法序列化） (#477) 
* error while push systemuser. error while create assets with adminuser(ssh key)

* fix errors in case of config.py dose not exist.

* change sign_t return from bytes to str. (#480)

* fix id_dsa check error (#458)

* fix id_dsa check error

* fix 邮件修改密码 token错误

* fix 3c8aec9 add )

* Dockerfile 优化 (#453)
 2017-07-10 11:01:20 +08:00
ibuler 4e67749eef [Docs] 添加api dockers 2017-07-10 10:26:17 +08:00
ibuler 29095a869c [Demo] update demo mode code 2017-06-19 17:59:13 +08:00
Caijun b502b06e82 Support i18n for asset `platform` field (#494) 2017-06-13 16:38:33 +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 41633be1aa [Bugfix] 修复无法删除资产组 2017-05-22 20:30:31 +08:00
ibuler d2620a655c [Bugfix] 修复模板bug, 修复getattr bug 2017-05-22 20:18:13 +08:00
GuangHongwei 458989328e [Bugfix] 修改bug，使用py3编程 2017-05-15 23:39:54 +08:00
ibuler 2ec0ab871a Fix form bug 2017-04-12 18:06:32 +08:00
ibuler 695e4da85e [Fixture] 完成批量更新 2017-04-12 11:50:15 +08:00
ibuler 2aa9aafdf6 [Change] Bulk update asset 2017-04-11 17:29:53 +08:00
ibuler 071d1922d0 stash it 2017-04-10 22:55:15 +08:00
ibuler 95e64d7809 [Change] 修改导出和更新逻辑 2017-04-09 17:59:14 +08:00
ibuler 5418d0b44c [Change] Using csv replace xlsx 2017-04-09 00:45:28 +08:00
ibuler bcc065eb8f [Compat] compat py3 change bootstrap form to bootstrap3 2017-04-07 23:52:46 +08:00
ibuler a320b9e05e [Bugfix] 兼容py3 2017-04-07 19:11:27 +08:00
ibuler c11374ae39 [Bugfix] 修改翻译 2017-04-07 16:59:09 +08:00
ibuler 92ebe85a3f [Fixture] 详情页添加system user 推送 2017-04-05 19:09:51 +08:00
ibuler be09db059d Update some bug 2017-04-04 21:47:58 +08:00
ibuler 5a5d5bdd51 [Fixture] 添加更新硬件信息api 2017-04-04 19:16:34 +08:00
ibuler 992af0f1cb [Fixture] 拆分asset view 2017-04-04 11:37:52 +08:00
ibuler ac3553babb [Fixture] 修改asset detail 2017-04-04 11:14:59 +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 135899608e Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver 2017-03-31 18:48:11 +08:00
ibuler 61a481f427 [Fixture] 添加用户连接终端 2017-03-31 11:25:25 +08:00
ibuler 4e7b665ea8 [Change] 添加翻译，并添加用户登陆页面 2017-03-29 15:26:32 +08:00
右书僮 b34c5dde40 Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver 
# Conflicts:
#	apps/assets/templates/assets/asset_list.html
 2017-03-27 08:03:23 +08:00
右书僮 9de2ff2052 修复idc_list删除时重新加载table 2017-03-27 07:58:35 +08:00
ibuler 49f6ed524d Merge with master 2017-03-26 11:54:46 +08:00
ibuler 10eb13920b [Delete] 删除资产tag 2017-03-24 14:48:18 +08:00
右书僮 e0179ea332 删除资产HTML页面中SystemUser相关内容(视图中的相关API暂时未动) 2017-03-24 11:13:40 +08:00
右书僮 c931d3179b 修复资产组更新中 用户己选择的资产项不全问题 2017-03-24 11:02:55 +08:00
右书僮 c5666f1357 fix some files 2017-03-24 10:37:05 +08:00
ibuler b60e5a7ee3 [Change] 修改一些view 2017-03-24 00:27:33 +08:00
ibuler c940a4c0fb [Fixture] 增加 task list 删除按钮 2017-03-23 00:15:25 +08:00
ibuler 3f72ce4b1f [Update] 更新生成fake数据脚本 2017-03-22 23:36:43 +08:00
ibuler 2ae57a7970 [Delete] 删除 system user一些属性 2017-03-22 22:15:15 +08:00
ibuler 610c9c5149 Pull it 2017-03-22 22:05:24 +08:00
ibuler caec9709ef [Fixture] 添加task list 搜索，重试 2017-03-22 21:57:05 +08:00
ibuler 0fbd9843bd [Change] 修改runner, inventory位置 2017-03-16 00:19:47 +08:00
ibuler 915873135e [Fixture] 添加runner run record 2017-03-14 00:58:25 +08:00
ibuler a822f667af [Fixture] 完成用户推送task 2017-03-09 14:55:33 +08:00
xiaokong1937@gmail.com 694899799b trivial changes 2017-03-06 21:05:00 +08:00
ibuler 01e50d592e 完成AdHoc JMSHost JMSInventory 2017-03-05 11:38:02 +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
右书僮 dd5dd9d7e1 fixed html files 2017-02-25 23:20:20 +08:00
Webb 63fd3cfff2 fixed asset_group delete html 2017-02-25 20:18:13 +08:00
Webb a6825ac91e fixed asset_list html and asset_update 2017-02-25 17:25:27 +08:00
Webb 8ee9d02ffc fixed html 2017-02-24 21:29:11 +08:00
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es 2017-02-06 23:13:27 +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 25cb47d2f5 [Change] 拆分user view为多个view 2017-01-17 16:34:47 +08:00
ibuler 87bbb6afde [Bugfix] 修改添加系统用户view 2017-01-10 23:41:14 +08:00
ibuler 8916221bba [Bugfix] 紧急修复url解析失败错误 2017-01-10 18:03:00 +08:00
ibuler 17657deb0e [Bugfix] 和Master分支合并后，修复冲突，DRF 新版本要求 fields和exclude 2017-01-08 13:35:59 +08:00
ibuler 49861b6a84 Merge with master 2017-01-07 22:34:12 +08:00
ibuler 3da33a57e2 [Bugfix] 修改tab -> space, 删除system user的 as default 2017-01-07 20:17:22 +08:00
右书僮 dbdb8a58fe 资产相关API及Web 2017-01-06 20:34:24 +08:00
ibuler 70da177ed7 Update api 2016-12-29 19:17:00 +08:00
ibuler d80fec6e60 Update some api 2016-12-28 00:28:52 +08:00
ibuler 775cd523eb Update app terminal name to applications 2016-12-25 23:10:53 +08:00
ibuler 2707012325 Finish access key auth 2016-12-25 13:15:28 +08:00
ibuler 5b4ce709af Add private token and change user group 2016-12-22 00:36:31 +08:00
ibuler 589b6d7cfe update 2016-12-21 01:03:52 +08:00
ibuler 649509dec1 Change models dir 2016-12-21 00:43:52 +08:00
ibuler a448fd02e2 merged 2016-12-20 23:07:33 +08:00
ibuler 4d71c2d1ff 修改token获取，拆分认证文件和权限文件 2016-12-20 01:19:50 +08:00
ibuler 2ab8e92bf4 Add black line 2016-12-19 23:10:16 +08:00
wangjun5 87eed2e59b add asset tool 2016-12-15 19:55:15 +08:00
ibuler a7476222a9 Update import 2016-11-27 23:36:35 +08:00
ibuler 3aea994101 asset import 2016-11-27 14:37:50 +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
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
ibuler db8b0022fc Update usergroup detail 2016-11-15 19:33:04 +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 8d7759d22f change user api 2016-11-09 19:29:15 +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 2a65e81316 detail page add update 2016-11-03 23:16:16 +08:00
ibuler f437d3f883 update 2016-11-03 19:42:47 +08:00
ibuler 61eadf6891 Modify asset detail 2016-11-03 00:09:38 +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
ibuler f1dfba6a93 Update some asset issues 2016-10-31 19:31:56 +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
ibuler 92251f2a45 Merge with master 2016-10-28 15:09:38 +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 5d3f9b4a03 Add command list 2016-10-26 19:10:14 +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 45dcb26123 Merge branch 'audits' 2016-10-19 15:14:07 +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
江世峰 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
江世峰 2829445f4f assets:add tag 2016-10-07 23:04:37 +08:00
江世峰 fd52a85dbb fix #25 2016-09-30 18:25:50 +08:00
江世峰 e83ecb1254 assets_group_forbug 2016-09-28 12:05:34 +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 88bb620af2 Modify ignore 2016-09-24 11:50:25 +08:00
ibuler 1f3d763490 Add requirement 2016-09-24 11:44:59 +08:00
江世峰 5bf414ffb5 update add_assets-group 2016-09-23 20:22:45 +08:00
江世峰 d2e989403f update assets-group 2016-09-22 18:31:04 +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
江世峰 98757aa428 update assets_group 2016-09-19 17:25:41 +08:00
ibuler d323c9df88 Modify asset create 2016-09-19 00:07:52 +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
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 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
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 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
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
ibuler 6d736d7309 Finish permission create and list 2016-09-11 22:45:24 +08:00
ibuler 70cae93a4b Add user perm model and form 2016-09-11 09:50:42 +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
ibuler 239dd0567f Finish admin user view 2016-09-08 20:39:06 +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 6f4a832389 Add admin user list view 2016-09-08 00:40:59 +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 d0ba17374e Finish asset group create 2016-09-07 20:05:42 +08:00
ibuler 30fd51c268 Asset group detail 2016-09-06 21:39:21 +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 170b49428c change date_added -> date_created 2016-09-06 16:50:19 +08:00
ibuler 25d9dbe93c Merge with cmdb 2016-09-06 15:09:00 +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 2f5b7ad654 Modify asset model 2016-09-05 22:57:43 +08:00
ibuler 8827fd2d74 Modify translation 2016-09-05 20:17:45 +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 0ab015abfd Asset add traslation 2016-09-04 17:15:26 +08:00
ibuler 11d06b5e2b Add asset group view and url 2016-09-04 16:02:51 +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
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 ffed46175d update .gitignore 2016-08-30 17:26:33 +08:00
wangyong d0d433db1a add asset_list 2016-08-30 13:50:30 +08:00
wangyong 3771b2ff70 add asset detail and list 2016-08-21 22:12:17 +08:00
wangyong fcd39370ed add asset some cbv 2016-08-14 22:10:10 +08:00
ibuler 234684c875 Rename dir name dashboard to apps 
It's may be well
 2016-08-13 21:59:08 +08:00