mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Upgrade autocomplete a reversion, padá import urls

Browse source
This commit is contained in:
Matěj Kocián 2016-01-09 17:03:40 +01:00
parent 896ed2d928
commit 9c8e8b80f2
8 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
galerie/admin.py
View file

@ -5,7 +5,7 @@ from django.contrib import admin
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django import forms from django import forms
from django.db import models from django.db import models
import autocomplete_light from autocomplete_light import shortcuts as autocomplete_light
# akction # akction

2
galerie/autocomplete_light_registry.py
View file

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import autocomplete_light from autocomplete_light import shortcuts as autocomplete_light
from models import Obrazek, Galerie from models import Obrazek, Galerie
from views import cesta_od_korene from views import cesta_od_korene

2
korektury/models.py
View file

@ -23,7 +23,7 @@ from django_countries.fields import CountryField
from solo.models import SingletonModel from solo.models import SingletonModel
from taggit.managers import TaggableManager from taggit.managers import TaggableManager
import reversion from reversion import revisions as reversion
# PrilohaReseni method # PrilohaReseni method
def generate_filename(self, filename): def generate_filename(self, filename):

68
requirements.txt
View file

@ -1,48 +1,48 @@
# basic libs # basic libs
psycopg2==2.6.1 psycopg2
html5lib==0.9999999 html5lib
ipython==4.0.0 ipython
Pillow==2.9.0 Pillow
pytz==2014.10 pytz
six==1.9.0 six
pexpect==3.3 pexpect
traitlets==4.0.0 traitlets
# Django and modules # Django and modules
Django==1.7.10 # Updatable to 1.9 (possibly incompatible) Django
django-bootstrap-sass==0.0.6a0 django-bootstrap-sass
django-mptt==0.7.3 django-mptt
django-reversion==1.9.3 django-reversion
django-sekizai==0.8.1 django-sekizai
django-countries==3.2 django-countries
django-solo==1.1.0 django-solo
django-ckeditor==4.4.7 # Updatable to 5.0 (some incompatible changes) django-ckeditor
django-flat-theme==0.9.3 django-flat-theme
django-taggit==0.17 django-taggit
django-autocomplete-light==2.2.6 django-autocomplete-light
django-crispy-forms==1.4.0 django-crispy-forms
django-imagekit==3.2.7 django-imagekit
# Comments # Comments
akismet==0.2.0 akismet
django-fluent-comments==1.0.2 django-fluent-comments
django-threadedcomments==1.0b1 django-threadedcomments
django-contrib-comments==1.6.1 django-contrib-comments
# debug tools/extensions # debug tools/extensions
django-debug-toolbar==1.4 django-debug-toolbar
django-extensions==1.5.6 django-extensions
sqlparse==0.1.16 sqlparse
Werkzeug==0.10.4 Werkzeug
# G+, FB authorisation # G+, FB authorisation
# django-allauth==0.19.1 # django-allauth
# oauthlib==0.7.2 # oauthlib
# python-openid==2.2.5 # python-openid
# requests==2.5.3 # requests
# requests-oauthlib==0.4.2 # requests-oauthlib

2
seminar/admin.py
View file

@ -12,7 +12,7 @@ from django.db import models
from django.contrib.auth.models import User from django.contrib.auth.models import User
from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Novinky, Organizator from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Novinky, Organizator
import autocomplete_light from autocomplete_light import shortcuts as autocomplete_light
class UserModelChoiceField(forms.ModelChoiceField): class UserModelChoiceField(forms.ModelChoiceField):

2
seminar/autocomplete_light_registry.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import autocomplete_light from autocomplete_light import shortcuts as autocomplete_light
from models import Skola, Resitel, Problem, Organizator from models import Skola, Resitel, Problem, Organizator
from taggit.models import Tag from taggit.models import Tag

2
seminar/models.py
View file

@ -24,7 +24,7 @@ from django_countries.fields import CountryField
from solo.models import SingletonModel from solo.models import SingletonModel
from taggit.managers import TaggableManager from taggit.managers import TaggableManager
import reversion from reversion import revisions as reversion
from seminar.utils import roman from seminar.utils import roman

2
seminar/tools.py
View file

@ -2,7 +2,7 @@
import logging as log import logging as log
from .models import Resitel from .models import Resitel
import reversion from reversion import revisions as reversion
def merge_props(r1, r2, prop, pretend=True, smaller=False, equal=True): def merge_props(r1, r2, prop, pretend=True, smaller=False, equal=True):
"""Merge r2.`prop` into r1.`prop`. """Merge r2.`prop` into r1.`prop`.