decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

inline django 1.9 version of ox.django

Browse source
This commit is contained in:
j 2016-02-20 09:06:41 +00:00
commit 051a3578b4
74 changed files with 712 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/clip/managers.py
View file

@ -5,7 +5,7 @@ import unicodedata
from django.db.models import Q, Manager
from django.conf import settings
from ox.django.query import QuerySet
from oxdjango.query import QuerySet
from item.utils import decode_id, get_by_id

4
pandora/clip/views.py
View file

@ -4,9 +4,9 @@ from __future__ import division
from django.conf import settings
from ox.utils import json
from ox.django.shortcuts import render_to_json_response, json_response
from oxdjango.shortcuts import render_to_json_response, json_response
from ox.django.api import actions
from oxdjango.api import actions
from annotation.models import Annotation
from item.models import Item