Merge branch 'master' of http://git.xfoto.com.cn/Tamron/tamrondb
променени са 6 файла, в които са добавени 18 реда и са изтрити 19 реда
+ 1
- 1
area/admin.py
@@ -1,7 +1,7 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 |
-from djadmin import ExportExcelModelAdmin, ReadonlyModelAdmin |
|
| 4 | 3 |
from django.contrib import admin |
| 4 |
+from django_admin import ExportExcelModelAdmin, ReadonlyModelAdmin |
|
| 5 | 5 |
|
| 6 | 6 |
from area.models import TamronCitiesInfo, TamronStoreCityInfo, TamronStoreProvinceInfo |
| 7 | 7 |
|
+ 1
- 1
config/admin.py
@@ -1,7 +1,7 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 |
-from djadmin import ExportExcelModelAdmin, ReadonlyModelAdmin |
|
| 4 | 3 |
from django.contrib import admin |
| 4 |
+from django_admin import ExportExcelModelAdmin, ReadonlyModelAdmin |
|
| 5 | 5 |
|
| 6 | 6 |
from config.models import TamronSysConfigInfo |
| 7 | 7 |
|
+ 1
- 1
msg/admin.py
@@ -1,7 +1,7 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 |
-from djadmin import ExportExcelModelAdmin, ReadonlyModelAdmin |
|
| 4 | 3 |
from django.contrib import admin |
| 4 |
+from django_admin import ExportExcelModelAdmin, ReadonlyModelAdmin |
|
| 5 | 5 |
|
| 6 | 6 |
from msg.models import TamronMsgInfo |
| 7 | 7 |
|
+ 13
- 14
requirements.txt
@@ -1,19 +1,19 @@ |
||
| 1 | 1 |
-e git+https://github.com/Brightcells/django-q.git#egg=django-q |
| 2 |
-CodeConvert==2.0.4 |
|
| 3 |
-Django==1.11.3 |
|
| 2 |
+CodeConvert==2.0.5 |
|
| 3 |
+Django==1.11.11 |
|
| 4 | 4 |
MySQL-python==1.2.5 |
| 5 | 5 |
Pillow==5.0.0 |
| 6 | 6 |
StatusCode==1.0.0 |
| 7 |
-TimeConvert==1.4.1 |
|
| 8 |
-cryptography==2.0.3 |
|
| 9 |
-django-admin==1.1.1 |
|
| 10 |
-django-curtail-uuid==1.0.0 |
|
| 7 |
+TimeConvert==1.4.3 |
|
| 8 |
+cryptography==2.2.1 |
|
| 9 |
+django-admin==1.2.0 |
|
| 10 |
+django-curtail-uuid==1.0.4 |
|
| 11 | 11 |
django-detect==1.0.5 |
| 12 |
-django-file-md5==1.0.1 |
|
| 12 |
+django-file-md5==1.0.2 |
|
| 13 | 13 |
django-ip==1.0.2 |
| 14 | 14 |
django-json-response==1.1.5 |
| 15 |
-django-logit==1.0.6 |
|
| 16 |
-django-models-ext==1.1.0 |
|
| 15 |
+django-logit==1.1.2 |
|
| 16 |
+django-models-ext==1.1.1 |
|
| 17 | 17 |
django-multidomain==1.1.4 |
| 18 | 18 |
django-paginator2==1.0.3 |
| 19 | 19 |
django-rlog==1.0.7 |
@@ -25,15 +25,14 @@ hiredis==0.2.0 |
||
| 25 | 25 |
isoweek==1.3.3 |
| 26 | 26 |
jsonfield==2.0.2 |
| 27 | 27 |
mock==2.0.0 |
| 28 |
-pysnippets==1.0.4 |
|
| 29 |
-pywe-miniapp==1.0.0 |
|
| 30 |
-pywe-oauth==1.0.5 |
|
| 28 |
+pysnippets==1.0.5 |
|
| 29 |
+pywe-miniapp==1.0.2 |
|
| 30 |
+pywe-oauth==1.0.6 |
|
| 31 | 31 |
pywe-response==1.0.1 |
| 32 | 32 |
qiniu==7.2.0 |
| 33 | 33 |
redis==2.10.6 |
| 34 |
-redis-extensions==1.1.6 |
|
| 34 |
+redis-extensions==1.2.1 |
|
| 35 | 35 |
requests==2.18.4 |
| 36 | 36 |
rlog==0.3 |
| 37 | 37 |
shortuuid==0.5.0 |
| 38 |
-uWSGI==2.0.15 |
|
| 39 | 38 |
versions==0.10.0 |
+ 1
- 1
tamron/admin.py
@@ -1,6 +1,6 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 |
-from djadmin import ExportExcelModelAdmin, ReadonlyModelAdmin |
|
| 3 | 2 |
from django.contrib import admin |
| 3 |
+from django_admin import ExportExcelModelAdmin, ReadonlyModelAdmin |
|
| 4 | 4 |
from TimeConvert import TimeConvert as tc |
| 5 | 5 |
|
| 6 | 6 |
from tamron.models import (TamronActivityInfo, TamronClassInfo, TamronNavEnInfo, TamronPhotographicWorkInfo, |
+ 1
- 1
tamron/models.py
@@ -4,7 +4,7 @@ import time |
||
| 4 | 4 |
|
| 5 | 5 |
from django.db import models |
| 6 | 6 |
from django.utils.translation import ugettext_lazy as _ |
| 7 |
-from models_ext import upload_path |
|
| 7 |
+from django_models_ext import upload_path |
|
| 8 | 8 |
|
| 9 | 9 |
|
| 10 | 10 |
class TamronSliderInfo(models.Model): |