github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,822 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

748 Commits (148bf3b89472eabb19fa7c57e56a19305e34e25b)

Author SHA1 Message Date
xiaokong1937@gmail.com db5d04c37f fix #13 2016-09-16 08:45:29 +08:00
ibuler 766bd3b76d Move js to jumpserver.js 2016-09-15 13:09:24 +08:00
ibuler f253d2ea69 Merge with master 2016-09-14 23:31:22 +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 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 324bb68667 user-pserm 2016-09-11 16:59:19 +08:00
xiaokong1937@gmail.com a7e3f9c465 #8 user first login view 2016-09-10 13:16:58 +08:00
ibuler a0ef3cfc34 Update locale dir name to zh 2016-09-05 19:17:18 +08:00
ibuler 3972bd3ff3 Add asset traslation 2016-09-04 19:05:47 +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 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
wangyong 77f3a1f146 add asset add 2016-09-03 19:05:50 +08:00
ibuler ba3f46fbd6 i18n 2016-09-03 19:02:18 +08:00
ibuler 0b406b6988 Add captch login using 2016-09-03 14:37:01 +08:00
ibuler 90ca5a8bb7 start capcha support 2016-09-02 22:23:15 +08:00
ibuler 5940cec0e6 Add user and send mail 2016-09-01 01:12:02 +08:00
ibuler 5359da3ce2 Finish user login 2016-08-31 23:42:06 +08:00
ibuler b31f8d5867 Add user generate reset password token 2016-08-31 19:28:06 +08:00
ibuler f7ab26a5da Add celery broker 2016-08-31 15:54:04 +08:00
ibuler c143735393 Add ssh-key-gen function 2016-08-31 01:00:20 +08:00
ibuler 011c125564 Modify user active api And Add Token authorization 2016-08-30 00:10:27 +08:00
ibuler 3eb4897bd3 Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api 2016-08-29 19:27:23 +08:00
ibuler 3c9dbaf860 Fix some bug 2016-08-28 23:58:22 +08:00
ibuler d918d5b466 Add Logger setting . 2016-08-26 16:56:50 +08:00
ibuler d95ffdfbf7 Test permmision 2016-08-26 00:51:05 +08:00
yumaojun03 363ddb70e2 add celery support (not use django-celery) 2016-08-25 19:52:03 +08:00
ibuler bb76f6c652 Add api authentication 2016-08-25 19:29:59 +08:00
ibuler 0a9e4a5e85 Modify urls.conf: Merge to single 2016-08-25 13:28:02 +08:00
ibuler 1d5faa3101 Delete Model: Role 2016-08-24 17:14:21 +08:00
ibuler bbecbc8578 Merge with webternimal 2016-08-24 00:12:46 +08:00
ibuler 6458231946 Add api file 2016-08-24 00:11:13 +08:00
yumaojun03 97a2e8bb50 test add celery 2016-08-23 23:51:39 +08:00
liuzheng712 400d744938 add api redirect 2016-08-23 23:29:33 +08:00
liuzheng712 91f0800e26 add webterminal 2016-08-23 22:34:52 +08:00
ibuler 24d7cb3d5d add init data dir fixture 2016-08-21 15:03:57 +08:00
ibuler 0427d406b9 Add init data file 2016-08-21 01:16:30 +08:00
ibuler e355c7b8ef Modify pagination and Role model 2016-08-20 18:33:18 +08:00
ibuler e48f36397e Modify url 2016-08-20 00:18:44 +08:00
ibuler 824b1c7f6f update user update view 2016-08-17 22:17:16 +08:00
ibuler bcae7beae6 upload avatar 2016-08-17 00:36:54 +08:00
ibuler 3bf0d4aabb Add common app 
common app used as write public api or templatetags

modify user list view and user edit view
 2016-08-16 00:09:48 +08:00
wangyong fcd39370ed add asset some cbv 2016-08-14 22:10:10 +08:00
广宏伟 86ffcc973c Add user template 2016-08-14 19:18:41 +08:00
ibuler 234684c875 Rename dir name dashboard to apps 
It's may be well
 2016-08-13 21:59:08 +08:00