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

6
pandora/app/views.py
View file

@ -7,8 +7,8 @@ from django.shortcuts import render, redirect
from django.conf import settings
from django.http import HttpResponse
from ox.django.shortcuts import json_response, render_to_json_response
from ox.django.decorators import login_required_json
from oxdjango.shortcuts import json_response, render_to_json_response
from oxdjango.decorators import login_required_json
import ox
from ox.utils import json, ET
@ -18,7 +18,7 @@ import models
from user.models import init_user
from changelog.models import add_changelog
from ox.django.api import actions
from oxdjango.api import actions
def intro(request):
return render(request, 'intro.html', {'settings': settings})