xiaoyu
|
8a5a4f3362
|
fix #14
|
2016-09-18 14:28:34 +08:00 |
ibuler
|
766bd3b76d
|
Move js to jumpserver.js
|
2016-09-15 13:09:24 +08:00 |
ibuler
|
bb8852d57e
|
Modify some style
|
2016-09-15 12:20:53 +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
|
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 |
xiaokong1937@gmail.com
|
6751c5a63a
|
reset user password and ssh pk implement
|
2016-09-13 21:45:10 +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
|
4fc9274e00
|
Add asset system user
|
2016-09-09 00:09:49 +08:00 |
ibuler
|
6f4a832389
|
Add admin user list view
|
2016-09-08 00:40:59 +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 |
xiaokong1937@gmail.com
|
7f09b486d9
|
user-group edit serializer and url implement
|
2016-09-06 21:44:23 +08:00 |
ibuler
|
30fd51c268
|
Asset group detail
|
2016-09-06 21:39:21 +08:00 |
xiaokong1937@gmail.com
|
556fb4e09f
|
refactor `is_active` trigger view and `enable_otp` trigger view in UserDetail page;trivial changes
|
2016-09-06 21:03:51 +08:00 |
xiaoyu
|
c6f875c517
|
temp commit
|
2016-09-06 16:40:44 +08:00 |
ibuler
|
07dd6d1192
|
Reslove conflict
|
2016-09-06 15:56:03 +08:00 |
ibuler
|
25d9dbe93c
|
Merge with cmdb
|
2016-09-06 15:09:00 +08:00 |
xiaoyu
|
8cc09f0e5a
|
move login and logout view back to CBV
|
2016-09-06 15:03:37 +08:00 |
ibuler
|
02b5483d81
|
Update add->create edit->update and assetgrou->asset-grou etc format
|
2016-09-06 14:38:19 +08:00 |
ibuler
|
3c6f50b788
|
Modify some bug
|
2016-09-05 23:42:10 +08:00 |
ibuler
|
2cb6b15bc3
|
set textarea rows
|
2016-09-05 23:12:01 +08:00 |
xiaokong1937@gmail.com
|
397da7d676
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-05 21:38:37 +08:00 |
xiaokong1937@gmail.com
|
e75d33439a
|
fix captcha not valid bug of login view; use django's default login and logout view to enhance robustness
|
2016-09-05 21:38:21 +08:00 |
ibuler
|
7241f7509f
|
Update nav
|
2016-09-05 20:27:44 +08:00 |
ibuler
|
8827fd2d74
|
Modify translation
|
2016-09-05 20:17:45 +08:00 |
ibuler
|
508bda37f5
|
Modify form datetime valid error, because form format
|
2016-09-05 19:37:37 +08:00 |
ibuler
|
4855e86a3f
|
Add asset group view
|
2016-09-04 21:47:10 +08:00 |
ibuler
|
3972bd3ff3
|
Add asset traslation
|
2016-09-04 19:05:47 +08:00 |
ibuler
|
acd98365c1
|
Fix translation
|
2016-09-04 12:31:20 +08:00 |
ibuler
|
f274684473
|
Add translation for support i18n
|
2016-09-04 00:51:36 +08:00 |
ibuler
|
0b406b6988
|
Add captch login using
|
2016-09-03 14:37:01 +08:00 |
ibuler
|
8ff872f41d
|
Add ls config
|
2016-09-01 16:05:14 +08:00 |
ibuler
|
5940cec0e6
|
Add user and send mail
|
2016-09-01 01:12:02 +08:00 |
ibuler
|
c9369db578
|
Add new login page
|
2016-08-31 20:39:25 +08:00 |
ibuler
|
3c9dbaf860
|
Fix some bug
|
2016-08-28 23:58:22 +08:00 |
ibuler
|
d95ffdfbf7
|
Test permmision
|
2016-08-26 00:51:05 +08:00 |
ibuler
|
bb76f6c652
|
Add api authentication
|
2016-08-25 19:29:59 +08:00 |
ibuler
|
641e998504
|
Update context name path1, path2 => app, action
|
2016-08-25 13:56:49 +08:00 |
ibuler
|
1d5faa3101
|
Delete Model: Role
|
2016-08-24 17:14:21 +08:00 |
ibuler
|
c37dea2079
|
Add user add view Test Case
|
2016-08-23 19:36:15 +08:00 |
ibuler
|
b55b516fc3
|
Update foot_js.html add active
|
2016-08-23 17:34:52 +08:00 |
ibuler
|
1f3c0d004f
|
Change update batch, add _list_base.html
|
2016-08-23 17:14:08 +08:00 |
ibuler
|
ae9bbb40fd
|
Add flash message template
|
2016-08-23 12:18:19 +08:00 |
ibuler
|
e355c7b8ef
|
Modify pagination and Role model
|
2016-08-20 18:33:18 +08:00 |
ibuler
|
cf15b7eaff
|
Add UserGroup some View
|
2016-08-19 01:39:08 +08:00 |
ibuler
|
279987925a
|
Modify user detail of usergroup
|
2016-08-18 00:47:34 +08:00 |
ibuler
|
7a8d4a3a59
|
Add delete view
|
2016-08-16 22:13:06 +08:00 |