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 |
lijiejie
|
829df26b0f
|
create the api
|
2016-09-02 22:49:51 +08:00 |
ibuler
|
ffed46175d
|
update .gitignore
|
2016-08-30 17:26:33 +08:00 |
wangyong
|
d0d433db1a
|
add asset_list
|
2016-08-30 13:50:30 +08:00 |
wangyong
|
3771b2ff70
|
add asset detail and list
|
2016-08-21 22:12:17 +08:00 |
wangyong
|
fcd39370ed
|
add asset some cbv
|
2016-08-14 22:10:10 +08:00 |
ibuler
|
234684c875
|
Rename dir name dashboard to apps
It's may be well
|
2016-08-13 21:59:08 +08:00 |