github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
471 Commits
68 Branches
249 Tags
110 MiB
Commit Graph

392 Commits (150e1030c32a76656a072bfc457366fe4fff5b86)

Author SHA1 Message Date
yumaojun03 150e1030c3 ansible Task接口更上层抽象的基本实现 2016-12-19 14:07:21 +08:00
yumaojun03 86c5f0d3d3 完成cron和sudo的list和detail基础，ansible Task接口更上层抽象中 2016-12-19 00:24:51 +08:00
yumaojun03 b348f7f1ce 添加了部分cron的list页面 2016-12-14 09:54:16 +08:00
yumaojun03 a0c9e3d117 添加了部分sudo的页面 2016-12-14 00:06:16 +08:00
yumaojun03 3eb8a702c8 为模型生成fake数据 2016-12-12 11:08:10 +08:00
yumaojun03 806d38bbb2 模拟数据测试 2016-12-11 20:50:26 +08:00
yumaojun03 84613e51d8 为了防止循环导入，采用__all__导出模块变量 2016-12-11 12:05:11 +08:00
yumaojun03 baba65ad43 修改url模块, 匹配整体架构风格. 2016-12-05 23:02:08 +08:00
yumaojun03 d0460d8691 修改url模块, 匹配整体架构风格. 2016-12-05 22:54:38 +08:00
Administrator 61ac9129b0 url少加了下划线 2016-11-27 22:45:53 +08:00
Administrator 8e0afb2cc4 调整模型 2016-11-27 11:30:23 +08:00
Administrator 2494fa5846 修改url 2016-11-24 22:34:55 +08:00
Administrator 984391e2b2 同步Master分支上的代码, 解决部分冲突问题 2016-11-24 22:10:04 +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
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
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 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