Commit Graph

453 Commits (b6523da60378088416741d4202829ca55aaf5db6)

Author SHA1 Message Date
ibuler 8b3b517bab [Update] 修改授权规则详情列表页面
7 years ago
ibuler bbaa35c773 [Update] 修改Perms
7 years ago
ibuler 0fa8287811 Merge branch 'dev' into perms
7 years ago
ibuler 78f4e5a89a [Update] 修改用户Opt
7 years ago
ibuler 3193c5549d Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler ed71e7d2d9 [Update] 修改用户Opt
7 years ago
ibuler 84634eb8c0 [Update] 修改Permr认证
7 years ago
ibuler a4ff2181c5 [Update] 修改用户view的api
7 years ago
ibuler fffa0def9e [Update] 修改api和view
7 years ago
ibuler d0ede246e7 [Update] 修改授权
7 years ago
BaiJiangJie b8b78ffeb2
Merge pull request #1162 from BaiJiangJie/dev
7 years ago
ibuler 6a88fd2d60 [Update] 修改api权限
7 years ago
BaiJiangjie b63999f385 创建用户发送邮件
7 years ago
BaiJiangjie ec6103448e 使终端管理的应用用户不显示在用户组里
7 years ago
ibuler b959f1f68b Merge branch 'bugfix_ip_lookup' into dev
7 years ago
ibuler e1cab35db0 [Bugfix] 修改获取城市
7 years ago
ibuler 5f0b4a4b63 [Update] 修改一些翻译
7 years ago
ibuler c5af4d47eb Merge branch 'some_auth_api' into dev
7 years ago
ibuler c37bfb682a [Update] 添加设置认证api和创建用户时可以不选择组
7 years ago
ibuler f85e5b6f75 [Bugfix] 修改添加用户的bug
7 years ago
ibuler 759760e7d9 [Update] 服务器可以生成用户密钥
7 years ago
ibuler faf6a7b623 [Update] 删掉token api调用次数限制
7 years ago
ibuler 8e4ab9f3a9 [Update] 支持获取token的用户
7 years ago
ibuler fe03011177 [Update] 不允许添加应用程序类型的用户
7 years ago
liuzheng712 9162f4a226
revert: add the old apps/users/migrations/0002_auto_20171225_1157.py
7 years ago
fit2cloud-fengyi 094e862abf fix bug
7 years ago
fit2cloud-fengyi 8e09151a02 Merge branch 'docs' of https://github.com/jumpserver/jumpserver into docs
7 years ago
fit2cloud-fengyi 18841d6c21 add ignore
7 years ago
ibuler d3e77b09ef [Merge] with doc
7 years ago
ibuler 86c0a2d28b [Update] 修改部分翻译和文档
7 years ago
ibuler e123599735 [Update] 修改一些bug和文案
7 years ago
ibuler bd4f96134f [Update] 修改一些文案
7 years ago
ibuler d284c2175d [Update] 修改一些小问题
7 years ago
ibuler 1018deda96 [Update] 支持拖拽更新
7 years ago
ibuler 5a0068d86a [Update] 修改文案
7 years ago
ibuler 31629fc975 [Bugfix] 修复资产禁用还可以登录
7 years ago
ibuler 521a5c57a2 [Update] 统一copyright
7 years ago
ibuler 870b863136 [Update] 修改设置的一些require
7 years ago
ibuler 9292e48554 [Bugfix] 用户csv导入编码问题
7 years ago
ibuler c68da5898a [Update] 修改初始
7 years ago
ibuler 08edda35e1 [Update] 完成资产书
7 years ago
ibuler c8728cace4 [Update] 完成树形改造
7 years ago
ibuler c7296c2498 [Update] 修改系统用户推送,拆分assets的部分模块
7 years ago
ibuler f82d939d15 [Update] 使用资产树,去掉集群和资产组
7 years ago
ibuler bd4768c147 [Update] 拆分asset api module
7 years ago
ibuler 2d3967872b [Feature] 完成资产授权和资产添加
7 years ago
ibuler 9e09a962af [Feature] 支持popover
7 years ago
ibuler 012614562f [Update] 修改小bug
7 years ago
ibuler 6d552f4680 [Feature] 添加链接token
7 years ago
ibuler f0b9a11482 [Update] ansible disk bug
7 years ago
ibuler b0fab2453a [Merge] 合并标签功能
7 years ago
ibuler d74c2e8466 [Model] 修改create_by字段
7 years ago
ibuler f37b331630 Merge with dev
7 years ago
ibuler 9dbf498322 [Update] 修改copyright
7 years ago
ibuler 8e6efac6db [Update] 修改copyrite
7 years ago
ibuler 579e74dd5d [Bugfix] 修复一些bug
7 years ago
ibuler f40fbaf602 [Feature] 添加修改用户密码api
7 years ago
ibuler 968b395bce Merge branch 'es' into dev
7 years ago
ibuler 0a931bbf77 [Feature] es support
7 years ago
ibuler 57e508f331 [update] 修改用户创建时 姓名和用户名的位置
7 years ago
ibuler 681ddb5af2 [Bugfix] for login ip
7 years ago
ibuler 29061aa088 [Bugfix] user login ip
7 years ago
ibuler b2f97a263d [Feature] 添加后端paging
7 years ago
ibuler 59a69f0253 [Bugfix] 修复title显示Jumpserver
7 years ago
ibuler 39fff235d1 [Bugfix] 修复cluster创建的bug
7 years ago
ibuler abb1a40a4f [Feature] 添加basic settings
7 years ago
ibuler 121f56f44b [Feature] 添加setting页面
7 years ago
ibuler 3223d3b74d [Bugfix] 修复了一些显示上的bug
7 years ago
ibuler b2b123b41e [Bugfix] 用户添加报错
7 years ago
ibuler 7e23d2c234 [Bugfix] 修复重置密码bug
7 years ago
ibuler a4d02adb22 [Update] system user form add label
7 years ago
ibuler 72a82c41ee [Update] 修改 success message, 添加资产组时可以添加资产
7 years ago
ibuler 450a9495ec [Bug&Update] 以下bug和功能
7 years ago
ibuler c0829194dc [Update] 修改一些bug, 增加执行task的按钮
7 years ago
ibuler 07a70311df [Bugfix] 修复以下bug
7 years ago
ibuler 9a6bc9fec5 [Update] session添加登陆ip
7 years ago
ibuler 1888c698f1 [Bugfix] 修复一些bug
7 years ago
ibuler 28223421b1 [Bugfix] 修复一下bug
7 years ago
ibuler 3b6403b2f2 [Update] 修改一些翻译
7 years ago
ibuler c48531c586 [Update] 添加和修改部分翻译
7 years ago
ibuler 0916757eb8 [Bugfix] 修复一些bug
7 years ago
ibuler 0b299344a7 [Update] 修改database 表现
7 years ago
ibuler a755882100 [Bugfix] 修复打印中文报错异常
7 years ago
ibuler e0a3fafbd5 [Bugfix] 详见trello
7 years ago
ibuler 158678c2db [Bugfix] 修改bug,显示cluster
7 years ago
ibuler e20444983d [Bugfix] 修改html bug
7 years ago
ibuler 1c20f519a9 [Bugfix] 修改小的bug
7 years ago
ibuler 0848893f1e [Bugfix] 修复时间日期搜索的bug,select2模块自适应长度
7 years ago
ibuler 22b7b84a45 [Update] 修改创建默认集群,组等名称为Default
7 years ago
ibuler 6a6d0cf279 [Update] Change user model
7 years ago
ibuler f4beccddae [Update] 修改注册流程
7 years ago
ibuler d0ef1e715e [Add] Add initial migrations
7 years ago
ibuler bf9bb1b973 [Update] 修改ops task运行
7 years ago
ibuler 47040a61c8 [Bugfix] User first login
7 years ago
ibuler d33ae9d9d9 [Update] login add cookie test
7 years ago
ibuler d51b3eff6a [Update] 修改settings和配置文件
7 years ago
ibuler e1b23a7cb4 [Bugfix] 修复无法记录日志的bug
7 years ago
ibuler 76df1de634 [Bugfix] 修复一些明显的bug
7 years ago
ibuler b0eace6ad8 [Bugfix] 基本完成assets模块
7 years ago
ibuler b4e1ac1953 [Bugfix] 修复资产模块中一些bug
7 years ago