Commit Graph

1045 Commits (a41909ec8dcff80a0371ead4f3625028b48e5f35)

Author SHA1 Message Date
ibuler dc01833a5b Forget to forgot
8 years ago
ibuler 170b49428c change date_added -> date_created
8 years ago
xiaoyu c6f875c517 temp commit
8 years ago
ibuler 07dd6d1192 Reslove conflict
8 years ago
ibuler 25d9dbe93c Merge with cmdb
8 years ago
xiaoyu 8cc09f0e5a move login and logout view back to CBV
8 years ago
ibuler 02b5483d81 Update add->create edit->update and assetgrou->asset-grou etc format
8 years ago
ibuler 3c6f50b788 Modify some bug
8 years ago
ibuler 2f5b7ad654 Modify asset model
8 years ago
xiaokong1937@gmail.com 6aedfb5219 fix small template erros
8 years ago
xiaokong1937@gmail.com 397da7d676 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
xiaokong1937@gmail.com e75d33439a fix captcha not valid bug of login view; use django's default login and logout view to enhance robustness
8 years ago
ibuler 7241f7509f Update nav
8 years ago
ibuler 8827fd2d74 Modify translation
8 years ago
ibuler 508bda37f5 Modify form datetime valid error, because form format
8 years ago
ibuler a0ef3cfc34 Update locale dir name to zh
8 years ago
ibuler 4855e86a3f Add asset group view
8 years ago
ibuler 3972bd3ff3 Add asset traslation
8 years ago
wangyong 0e8e88fac0 add admin|sys user model
8 years ago
wangyong 426c3c4062 add asset amdin|sys user model
8 years ago
ibuler 8d0334e003 Add translation
8 years ago
ibuler 0ab015abfd Asset add traslation
8 years ago
ibuler 7350e150c8 Merge branch 'master' into cmdb
8 years ago
ibuler 61f0205529 Modify users url to singular
8 years ago
ibuler acd98365c1 Fix translation
8 years ago
ibuler f274684473 Add translation for support i18n
8 years ago
wangyong d96ac56460 merge master
8 years ago
wangyong 77f3a1f146 add asset add
8 years ago
ibuler ba3f46fbd6 i18n
8 years ago
ibuler 0b406b6988 Add captch login using
8 years ago
ibuler 6f0cfd23c1 Rm logout.html
8 years ago
ibuler 10d51ada37 Update login error message
8 years ago
ibuler 90ca5a8bb7 start capcha support
8 years ago
ibuler 9803dd9547 Add ico, Modify forget_password
8 years ago
ibuler 3a9cf6c360 Add forget password and reset password
8 years ago
ibuler 8ff872f41d Add ls config
8 years ago
ibuler 5940cec0e6 Add user and send mail
8 years ago
ibuler 5359da3ce2 Finish user login
8 years ago
ibuler c9369db578 Add new login page
8 years ago
ibuler b31f8d5867 Add user generate reset password token
8 years ago
ibuler 0d3bde1191 User add confirmed
8 years ago
ibuler c143735393 Add ssh-key-gen function
8 years ago
ibuler 43af5383e3 Add model user method: get_token set_token
8 years ago
ibuler ffed46175d update .gitignore
8 years ago
ibuler 31a39be9ea Resolve conflicts
8 years ago
ibuler 2022ca8e10 Add test code
8 years ago
ibuler 011c125564 Modify user active api And Add Token authorization
8 years ago
ibuler 1a9f90a08e Modify api
8 years ago
ibuler 3eb4897bd3 Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api
8 years ago
ibuler 3c9dbaf860 Fix some bug
8 years ago
ibuler d918d5b466 Add Logger setting .
8 years ago
ibuler d95ffdfbf7 Test permmision
8 years ago
ibuler bb76f6c652 Add api authentication
8 years ago
ibuler 641e998504 Update context name path1, path2 => app, action
8 years ago
ibuler 0a9e4a5e85 Modify urls.conf: Merge to single
8 years ago
ibuler 8aa92bb688 Add api: UserApi And UserGroupApi
8 years ago
ibuler 1d5faa3101 Delete Model: Role
8 years ago
ibuler b97b34961c Modify api: complete some setting
8 years ago
ibuler a43ac90b21 Modify CRLF to LF
8 years ago
ibuler 6458231946 Add api file
8 years ago
ibuler a99a6b6946 Split tests file in tests module
8 years ago
ibuler c37dea2079 Add user add view Test Case
8 years ago
ibuler 1f3c0d004f Change update batch, add _list_base.html
8 years ago
ibuler 3c3fda8064 Change chosen To select2 lib
8 years ago
ibuler ae9bbb40fd Add flash message template
8 years ago
ibuler 8e5e788bcd Test case added
8 years ago
ibuler f45690b34f Add test case
8 years ago
ibuler f0b0e41d33 Update user edit
8 years ago
wangyong 3771b2ff70 add asset detail and list
8 years ago
ibuler 8b0f31c43a modify list, edit url error
8 years ago
ibuler 8ba7b078fd Finish expaire date
8 years ago
ibuler 57f0b04387 Modify project statucure guide and init data
8 years ago
ibuler 85cf2169d4 Modify readme
8 years ago
ibuler 0427d406b9 Add init data file
8 years ago
ibuler e355c7b8ef Modify pagination and Role model
8 years ago
ibuler 6e46a17d98 Useradd group change
8 years ago
ibuler e48f36397e Modify url
8 years ago
ibuler cf15b7eaff Add UserGroup some View
8 years ago
ibuler 651e89994e modify list and sort
8 years ago
ibuler 342298ad3e reslove conflict
8 years ago
ibuler a76191ffdc Change view detail template
8 years ago
ibuler 279987925a Modify user detail of usergroup
8 years ago
ibuler 824b1c7f6f update user update view
8 years ago
ibuler bcae7beae6 upload avatar
8 years ago
ibuler 9353022627 add context
8 years ago
ibuler 35abf16f7d Modify panel color
8 years ago
ibuler c14eb42186 reslove conflict add user detail template
8 years ago
ibuler 98d6043f2d merged
8 years ago
ibuler 7a8d4a3a59 Add delete view
8 years ago
ibuler 3bf0d4aabb Add common app
8 years ago
广宏伟 e3223f745a app users
8 years ago
广宏伟 86ffcc973c Add user template
8 years ago
ibuler 9493fb07cb Add user list view
8 years ago
ibuler 9303415b89 modify some issues
8 years ago
ibuler 234684c875 Rename dir name dashboard to apps
8 years ago