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 |