ibuler
|
9518672ad2
|
Add
|
2017-03-02 18:29:29 +08:00 |
ibuler
|
b055144908
|
Merge with audits
|
2017-03-01 15:35:11 +08:00 |
xiaokong1937@gmail.com
|
548d7ef99a
|
fix #13;fix `user` context conflict problem in user-detail page
|
2017-02-09 21:19:49 +08:00 |
ibuler
|
a79c3dd156
|
[Fixture] 添加command log backends, 未来支持es
|
2017-02-06 23:13:27 +08:00 |
xiaokong1937@gmail.com
|
fe01f92545
|
user profile: update ssh pk
|
2017-02-03 13:37:05 +08:00 |
xiaokong1937@gmail.com
|
8a5d0b2d92
|
remove unused templatetags: users_tags and common_tags
|
2017-01-26 20:24:50 +08:00 |
xiaokong1937@gmail.com
|
f3647ea46d
|
user-profile page
|
2017-01-25 21:19:16 +08:00 |
ibuler
|
0869931e67
|
[Bugfix] 修改了一些issue上的bug
|
2017-01-20 20:13:22 +08:00 |
ibuler
|
df94d11f53
|
[Fix] 修改一些api bug
|
2017-01-20 13:59:53 +08:00 |
ibuler
|
ffed28c9c7
|
[Change] 修改perm的代码, 强制79个字符内
|
2017-01-17 17:11:01 +08:00 |
ibuler
|
25cb47d2f5
|
[Change] 拆分user view为多个view
|
2017-01-17 16:34:47 +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
|
9c6c6d6b4c
|
[Feature] 添加Dockerfile
|
2017-01-07 20:07:33 +08:00 |
ibuler
|
b670259ab6
|
Modify terminal reqject templatte
|
2017-01-03 00:11:44 +08:00 |
ibuler
|
301e02bcd8
|
Update some api
|
2016-12-30 00:19:47 +08:00 |
ibuler
|
70da177ed7
|
Update api
|
2016-12-29 19:17:00 +08:00 |
ibuler
|
92d854b971
|
Update api
|
2016-12-29 00:29:59 +08:00 |
ibuler
|
d80fec6e60
|
Update some api
|
2016-12-28 00:28:52 +08:00 |
ibuler
|
d56f030dc4
|
Finish terminal accept
|
2016-12-27 00:59:52 +08:00 |
ibuler
|
775cd523eb
|
Update app terminal name to applications
|
2016-12-25 23:10:53 +08:00 |
ibuler
|
a8fa4d2f0c
|
update terminal regist
|
2016-12-25 17:44:39 +08:00 |
ibuler
|
2707012325
|
Finish access key auth
|
2016-12-25 13:15:28 +08:00 |
ibuler
|
fe17bec752
|
Add access key auth
|
2016-12-22 01:07:05 +08:00 |
ibuler
|
5b4ce709af
|
Add private token and change user group
|
2016-12-22 00:36:31 +08:00 |
ibuler
|
875aaa0029
|
update user model for create application user
|
2016-12-21 01:17:36 +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
|
96d32f2e3e
|
prepare merge ops
|
2016-12-20 23:06:27 +08:00 |
ibuler
|
4d71c2d1ff
|
修改token获取,拆分认证文件和权限文件
|
2016-12-20 01:19:50 +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 |
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
|
72ad4b44ce
|
update bug
|
2016-11-24 19:36:49 +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 |
ibuler
|
180af7e0bd
|
Update csv
|
2016-11-22 00:59:49 +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
|
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
|
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
|
47090eb0f7
|
update some user api
|
2016-11-09 23:49:10 +08:00 |
ibuler
|
8d7759d22f
|
change user api
|
2016-11-09 19:29:15 +08:00 |
ibuler
|
ea3f8af161
|
Fix pubkey auth bug
|
2016-11-07 16:59:52 +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
|
41337d28c3
|
add proxy log search
|
2016-11-05 01:15:25 +08:00 |
ibuler
|
53e97dac40
|
stash it
|
2016-11-04 18:33:16 +08:00 |
ibuler
|
f437d3f883
|
update
|
2016-11-03 19:42:47 +08:00 |
ibuler
|
3448f3eb0a
|
Modify init data
|
2016-11-02 23:00:47 +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 |
ibuler
|
315af35296
|
Finish token access api
|
2016-10-31 18:58:23 +08:00 |
ibuler
|
6a510dad6c
|
Update some bug
|
2016-10-24 19:32:53 +08:00 |
ibuler
|
df380c343e
|
Update api
|
2016-10-19 19:30:55 +08:00 |
ibuler
|
6164896793
|
Update some thing
|
2016-10-19 18:33:14 +08:00 |
ibuler
|
303659cb0e
|
Change app name apps => terrminal
|
2016-10-17 15:24:41 +08:00 |
ibuler
|
4531157c72
|
may be some wrong
|
2016-10-16 22:12:13 +08:00 |
ibuler
|
9960a6cd21
|
Plan create a new app: terminal
|
2016-10-15 17:14:56 +08:00 |
ibuler
|
0446f449e9
|
Add auth and permission backends
|
2016-10-15 16:04:54 +08:00 |
ibuler
|
a62a2178d0
|
Add user backend
|
2016-10-15 00:49:59 +08:00 |
ibuler
|
0c8922e30f
|
Modify some bug
|
2016-10-09 19:27:49 +08:00 |
ibuler
|
0954f6d7e8
|
Add audits api
|
2016-10-09 00:12:18 +08:00 |
ibuler
|
59727656c3
|
Update table desgin doc and audit log
|
2016-10-07 23:54:29 +08:00 |
ibuler
|
6b6105491c
|
Add migrations
|
2016-10-02 22:13:08 +08:00 |
ibuler
|
45df58114c
|
Merge branch 'connect'
|
2016-10-02 21:45:44 +08:00 |
ibuler
|
a04d772501
|
Merge with master
|
2016-10-02 21:45:26 +08:00 |
xiaokong1937@gmail.com
|
6856fad0c0
|
integrate the user-group list page with its api;
|
2016-10-02 11:09:27 +08:00 |
xiaokong1937@gmail.com
|
d40aa49d8c
|
user bulk import through Excel and close #20
|
2016-10-01 20:26:43 +08:00 |
xiaokong1937@gmail.com
|
05e961f29f
|
user-group detail: fix #15
|
2016-09-30 20:50:40 +08:00 |
xiaokong1937@gmail.com
|
d8143a67cd
|
user-group-detail: user-adding frontend integration
|
2016-09-29 21:14:55 +08:00 |
ibuler
|
acf51238d0
|
Modify ssh server bug for using public key
|
2016-09-29 18:01:26 +08:00 |
xiaoyu
|
e7fddf80ae
|
user-group-detail: add users support
|
2016-09-29 16:41:55 +08:00 |
xiaokong1937@gmail.com
|
f9b49605e4
|
user-group detail page: users op
|
2016-09-28 21:11:43 +08:00 |
xiaokong1937@gmail.com
|
2522f0d80f
|
trivial changes: refactor the jumpserver DataTable api
|
2016-09-27 21:28:02 +08:00 |
xiaokong1937@gmail.com
|
70a6ddc897
|
fix #27
|
2016-09-27 20:16:46 +08:00 |
xiaokong1937@gmail.com
|
49f007601f
|
add user-list-delete support for user-group detail page
|
2016-09-26 21:22:48 +08:00 |
xiaokong1937@gmail.com
|
74cdd2d0f3
|
user list groups bulk update
|
2016-09-26 19:39:43 +08:00 |
xiaoyu
|
15dcc760b4
|
user list bulk update modal
|
2016-09-26 16:33:10 +08:00 |
xiaoyu
|
d2197d99c2
|
fix #26
|
2016-09-26 11:30:43 +08:00 |
ibuler
|
cfef374454
|
Update ssh server
|
2016-09-25 00:11:31 +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 |
xiaoyu
|
22163173fe
|
user bulk delete view
|
2016-09-23 16:30:59 +08:00 |
xiaoyu
|
af713672fb
|
user list page bulk action
|
2016-09-22 16:06:46 +08:00 |
xiaoyu
|
515406c05d
|
temp: deactive test
|
2016-09-21 16:43:41 +08:00 |
xiaoyu
|
61d1d9ec90
|
temp
|
2016-09-21 15:48:21 +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 |
xiaokong1937@gmail.com
|
65461a09a7
|
user-group edit implement
|
2016-09-19 21:08:08 +08:00 |
xiaoyu
|
9a81057d95
|
fix a typo
|
2016-09-19 15:51:28 +08:00 |
xiaoyu
|
f00da20764
|
user-group delete implement
|
2016-09-19 15:47:58 +08:00 |
xiaokong1937@gmail.com
|
4e2a41f4cf
|
user-group draft
|
2016-09-18 21:00:07 +08:00 |
xiaoyu
|
8a5a4f3362
|
fix #14
|
2016-09-18 14:28:34 +08:00 |
xiaoyu
|
8cdc4674d7
|
update toastr js and close #8
|
2016-09-18 10:32:23 +08:00 |
ibuler
|
502c7e756b
|
Modify asset
|
2016-09-17 23:43:41 +08:00 |
ibuler
|
dc4d388d9a
|
Merge with master
|
2016-09-17 18:53:11 +08:00 |
ibuler
|
df281defd8
|
Finish user detail asset grant ..
|
2016-09-17 18:51:19 +08:00 |
ibuler
|
7d3474aeea
|
Add user permission user list
|
2016-09-17 15:20:33 +08:00 |
ibuler
|
b5abb17568
|
Jiu zhe yang ba
|
2016-09-17 13:04:26 +08:00 |
ibuler
|
ab2eeb0da3
|
Finish user asset form
|
2016-09-17 01:04:52 +08:00 |
ibuler
|
06b2c623cb
|
Modify some bug
|
2016-09-16 17:23:47 +08:00 |
xiaokong1937@gmail.com
|
7984806b38
|
change user ssh reset type from private key to public key
|
2016-09-15 16:54:00 +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
|
0f9bdab108
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-14 15:40:47 +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 |
xiaokong1937@gmail.com
|
6751c5a63a
|
reset user password and ssh pk implement
|
2016-09-13 21:45:10 +08:00 |
xiaoyu
|
00502ce33d
|
trivial js style changes; bugfix for patch method
|
2016-09-13 16:38:43 +08:00 |
unknown
|
7cff5cbf61
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-12 15:36:13 +08:00 |
unknown
|
12831a7d21
|
text
|
2016-09-12 15:35:50 +08:00 |
ibuler
|
6d736d7309
|
Finish permission create and list
|
2016-09-11 22:45:24 +08:00 |
ibuler
|
324bb68667
|
user-pserm
|
2016-09-11 16:59:19 +08:00 |
ibuler
|
627a5825f4
|
Add user perm
|
2016-09-10 21:08:10 +08:00 |
xiaokong1937@gmail.com
|
899233338d
|
#8 user first login view
|
2016-09-10 13:20:34 +08:00 |
xiaokong1937@gmail.com
|
a7e3f9c465
|
#8 user first login view
|
2016-09-10 13:16:58 +08:00 |
xiaokong1937@gmail.com
|
d8fe59debb
|
temp save for issue 8
|
2016-09-08 21:51:44 +08:00 |
ibuler
|
409fac3ef1
|
Merge branch 'admin-user'
|
2016-09-08 20:39:25 +08:00 |
ibuler
|
239dd0567f
|
Finish admin user view
|
2016-09-08 20:39:06 +08:00 |
xiaokong1937@gmail.com
|
62cac20ba7
|
fix #9
|
2016-09-08 19:30:22 +08:00 |
ibuler
|
ff30435eb4
|
Finish adin user add
|
2016-09-08 18:12:53 +08:00 |
ibuler
|
ccfe9b9d08
|
Merge branch 'admin-user'
|
2016-09-08 00:41:22 +08:00 |
ibuler
|
6f4a832389
|
Add admin user list view
|
2016-09-08 00:40:59 +08:00 |
xiaokong1937@gmail.com
|
8acbcb2ed2
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-07 21:53:33 +08:00 |
xiaokong1937@gmail.com
|
04151b9957
|
user group quickedit frontend and rest API
|
2016-09-07 21:53:27 +08:00 |
ibuler
|
4db352f55b
|
Add idc
|
2016-09-07 20:51:33 +08:00 |
ibuler
|
d8e6433404
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-07 20:06:01 +08:00 |
ibuler
|
d0ba17374e
|
Finish asset group create
|
2016-09-07 20:05:42 +08:00 |
xiaokong1937@gmail.com
|
7f09b486d9
|
user-group edit serializer and url implement
|
2016-09-06 21:44:23 +08:00 |