github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
2,319 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

2319 Commits (5984b0b57959684d3a53e4082380cca939899cab)

Author SHA1 Message Date
yumaojun03 046c7e21e9 Merge remote-tracking branch 'origin/master' into ops_dev 
# Conflicts:
#	requirements.txt
 2016-12-19 23:55:54 +08:00
yumaojun03 47d87e38a6 补充task需要的一些接口 2016-12-19 23:46:03 +08:00
ibuler 2ab8e92bf4 Add black line 2016-12-19 23:10:16 +08:00
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
ibuler d964221689 Update api 2016-12-16 19:32:05 +08:00
wangjun5 87eed2e59b add asset tool 2016-12-15 19:55:15 +08:00
广宏伟 a737564a6c Add new file 2016-12-14 19:58:20 +08:00
广宏伟 6374a9772c Add new file 2016-12-14 19:57:47 +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
ibuler 0e4804b59f Merge branch 'audits' 2016-12-06 10:43:05 +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