лет %!s(int64=8): %!d(string=назад) · a396f2d82e
--- a/account/admin.py
+++ b/account/admin.py
@@ -1,7 +1,7 @@
 
                 # -*- coding: utf-8 -*-
              
 
                 
              
 
                -from djadmin import ReadonlyModelAdmin
              
 
                 from django.contrib import admin
              
 
                +from django_admin import ReadonlyModelAdmin
              
 
                 
              
 
                 from account.models import UserInfo
              
 
                 
              
--- a/api/oauth_views.py
+++ b/api/oauth_views.py
@@ -6,8 +6,8 @@ from django.conf import settings
 
                 from django.core.urlresolvers import reverse
              
 
                 from django.db import transaction
              
 
                 from django.shortcuts import redirect
              
 
                +from django_logit import logit
              
 
                 from furl import furl
              
 
                -from logit import logit
              
 
                 
              
 
                 from account.models import UserInfo
              
 
                 from utils.redis.connect import r
              
--- a/codes/admin.py
+++ b/codes/admin.py
@@ -1,7 +1,7 @@
 
                 # -*- coding: utf-8 -*-
              
 
                 
              
 
                -from djadmin import ExportExcelModelAdmin, ReadonlyModelAdmin
              
 
                 from django.contrib import admin
              
 
                +from django_admin import ExportExcelModelAdmin, ReadonlyModelAdmin
              
 
                 
              
 
                 from codes.models import CourseCodeInfo
              
 
                 
              
--- a/courses/admin.py
+++ b/courses/admin.py
@@ -1,7 +1,7 @@
 
                 # -*- coding: utf-8 -*-
              
 
                 
              
 
                -from djadmin import ExportExcelModelAdmin, ReadonlyModelAdmin
              
 
                 from django.contrib import admin
              
 
                +from django_admin import ExportExcelModelAdmin, ReadonlyModelAdmin
              
 
                 
              
 
                 from courses.models import CourseInfo, CourseVideoInfo
              
 
                 
              
--- a/courses/models.py
+++ b/courses/models.py
@@ -2,7 +2,7 @@
 
                 
              
 
                 from django.db import models
              
 
                 from django.utils.translation import ugettext_lazy as _
              
 
                -from models_ext import upload_path
              
 
                +from django_models_ext import upload_path
              
 
                 from shortuuidfield import ShortUUIDField
              
 
                 
              
 
                 from course.basemodels import CreateUpdateMixin
              
--- a/page/models.py
+++ b/page/models.py
@@ -2,7 +2,7 @@
 
                 
              
 
                 from django.db import models
              
 
                 from django.utils.translation import ugettext_lazy as _
              
 
                -from models_ext import upload_path
              
 
                +from django_models_ext import upload_path
              
 
                 
              
 
                 from course.basemodels import CreateUpdateMixin
              
 
                 from utils.url_utils import upload_file_url
              
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,42 +1,41 @@
 
                 -e git+https://github.com/Brightcells/django-q.git#egg=django-q
              
 
                -CodeConvert==2.0.4
              
 
                -Django==1.11.3
              
 
                +CodeConvert==2.0.5
              
 
                +Django==1.11.11
              
 
                 MySQL-python==1.2.5
              
 
                 Pillow==5.0.0
              
 
                 StatusCode==1.0.0
              
 
                -TimeConvert==1.4.1
              
 
                -cryptography==2.0.3
              
 
                -django-admin==1.1.1
              
 
                -django-curtail-uuid==1.0.0
              
 
                +TimeConvert==1.4.3
              
 
                +cryptography==2.2.1
              
 
                +django-admin==1.2.0
              
 
                +django-curtail-uuid==1.0.4
              
 
                 django-detect==1.0.5
              
 
                -django-file-md5==1.0.1
              
 
                +django-file-md5==1.0.2
              
 
                 django-ip==1.0.2
              
 
                 django-json-response==1.1.5
              
 
                -django-logit==1.0.6
              
 
                -django-models-ext==1.1.0
              
 
                +django-logit==1.1.2
              
 
                +django-models-ext==1.1.1
              
 
                 django-multidomain==1.1.4
              
 
                 django-paginator2==1.0.3
              
 
                 django-rlog==1.0.7
              
 
                 django-shortuuidfield==0.1.3
              
 
                 django-six==1.0.4
              
 
                 django-uniapi==1.0.1
              
 
                -django-we==1.1.2
              
 
                -djangorestframework==3.7.3
              
 
                +django-we==1.2.1
              
 
                +djangorestframework==3.7.7
              
 
                 furl==1.0.1
              
 
                 hiredis==0.2.0
              
 
                 isoweek==1.3.3
              
 
                 jsonfield==2.0.2
              
 
                 mock==2.0.0
              
 
                -pysnippets==1.0.4
              
 
                -pywe-miniapp==1.0.0
              
 
                -pywe-oauth==1.0.5
              
 
                +pysnippets==1.0.5
              
 
                +pywe-miniapp==1.0.2
              
 
                +pywe-oauth==1.0.6
              
 
                 pywe-response==1.0.1
              
 
                -qiniu==7.1.9
              
 
                +qiniu==7.2.0
              
 
                 redis==2.10.6
              
 
                -redis-extensions==1.1.6
              
 
                +redis-extensions==1.2.1
              
 
                 requests==2.18.4
              
 
                 rlog==0.3
              
 
                 shortuuid==0.5.0
              
 
                -uWSGI==2.0.15
              
 
                 versions==0.10.0
              
 
                 xlrd==1.1.0