ibuler
|
d323c9df88
|
Modify asset create
|
2016-09-19 00:07:52 +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
|
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 |
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 |
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
|
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
|
e232962649
|
Update some template
|
2016-09-16 20:53:10 +08:00 |
wangyong
|
42012d7bfe
|
merge master
|
2016-09-16 17:32:35 +08:00 |
ibuler
|
06b2c623cb
|
Modify some bug
|
2016-09-16 17:23:47 +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
|
d9812e2bdb
|
Remove action from asset permission
|
2016-09-16 09:55:26 +08:00 |
ibuler
|
74b8ee8c10
|
Pre delete action
|
2016-09-16 09:38:07 +08:00 |
xiaokong1937@gmail.com
|
db5d04c37f
|
fix #13
|
2016-09-16 08:45:29 +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
|
766bd3b76d
|
Move js to jumpserver.js
|
2016-09-15 13:09:24 +08:00 |
ibuler
|
b2444c2aca
|
Add fake data to init.json
|
2016-09-15 12:21:34 +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 |
ibuler
|
a4dc27f073
|
Finish permissin detail asset list and user list
|
2016-09-14 23:29:39 +08:00 |
ibuler
|
812df7b07b
|
Restore settings.py
|
2016-09-14 16:52:09 +08:00 |
unknown
|
c237f82e51
|
restore settings
|
2016-09-14 16:10:15 +08:00 |
unknown
|
e7c20f0707
|
add assets manage Sweet Alert"
|
2016-09-14 15:51:09 +08:00 |
unknown
|
0f9bdab108
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-14 15:40:47 +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 |
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 |
ibuler
|
4c4f598552
|
Finish asset permission detail and add user or user group list
|
2016-09-13 00:37:24 +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
|
7b99a33a2f
|
permission update and delete finished
|
2016-09-11 23:20:14 +08:00 |
ibuler
|
6d736d7309
|
Finish permission create and list
|
2016-09-11 22:45:24 +08:00 |
ibuler
|
f558ded5bb
|
Plan delete some view
|
2016-09-11 20:13:56 +08:00 |
ibuler
|
324bb68667
|
user-pserm
|
2016-09-11 16:59:19 +08:00 |
ibuler
|
70cae93a4b
|
Add user perm model and form
|
2016-09-11 09:50:42 +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 |
ibuler
|
6069b8946b
|
Start asset extend
|
2016-09-10 00:29:57 +08:00 |