Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Jan 22, 2014
  1. Bumped version and added .pypirc config to gitignore

    Kyle Rimkus authored
Commits on Dec 17, 2013
  1. Merge branch 'master' of github.com:davidmiller/django-tastypie-swagg…

    Kyle Rimkus authored
    …er into davidmiller-master
    
    Conflicts:
    	tastypie_swagger/views.py
  2. Merge branch 'extra_actions' of github.com:joshkehn/django-tastypie-s…

    Kyle Rimkus authored
    …wagger into joshkehn-extra_actions
  3. Merge commit '6d0baa4eeca5d6a14a8fcdb79c242644bce9a053'

    Kyle Rimkus authored
    Conflicts:
    	tastypie_swagger/templates/tastypie_swagger/index.html
    	tastypie_swagger/views.py
Commits on Dec 13, 2013
  1. @joshkehn
Commits on Dec 12, 2013
  1. @joshkehn
Commits on May 16, 2013
  1. Merge pull request #28 from Azd325/master

    authored
    Fixed backwards compatibility Django < 1.5 in the Template
Commits on May 9, 2013
  1. @Azd325

    Fix backward compality from the url tag Fixes #26

    Azd325 authored
    Load for the earlier version of Django the url from future libary
Commits on Apr 23, 2013
  1. bump version to v0.1.1

    authored
  2. Merge pull request #24 from algrs/master

    authored
    Fix for django 1.5 and tastypie 0.9.14
Commits on Apr 17, 2013
  1. @algrs

    Removed view from context before rendering to json.

    algrs authored
    With Django 1.5.1 and tastypie 0.9.14, the tastypie_swagger.views.ResourceView object is in the context and can't be json serialized.
  2. @algrs

    Django 1.5 changed the url tag slightly such that we need to put quot…

    algrs authored
    …es around namespaced urls.
Commits on Mar 14, 2013
  1. update package metadata

    authored
  2. update to version 0.1

    authored
  3. Merge pull request #23 from stefanw/django-1.5

    authored
    Keep support for Django < 1.5
Commits on Mar 3, 2013
  1. @stefanw
Commits on Mar 2, 2013
  1. @davidmiller
  2. @davidmiller

    Obvious typo

    davidmiller authored
  3. @davidmiller

    merge upstream changes

    davidmiller authored
Commits on Feb 20, 2013
  1. Merge pull request #21 from wolever/master

    authored
    Fix a couple crashing bugs with TastyPie==0.9.11 and Django==1.4.2
Commits on Feb 15, 2013
  1. @wolever
Commits on Feb 11, 2013
  1. @wolever

    Fix bug which causes JSON serialization error

    wolever authored
    The ``help_text`` is a Django proxy, and without this fix (on
    Django==1.4.2, TastyPie==0.9.11) a JSON serialization error is raised::
    
        TypeError: <django.utils.functional.__proxy__ object at 0x103c09450> is not JSON serializable
  2. @wolever
Commits on Feb 8, 2013
  1. minor context fix

    authored
Commits on Feb 7, 2013
  1. bump to 0.0.4

    authored
  2. Merge pull request #15 from johnraz/master

    authored
    Several improvements and additions
Something went wrong with that request. Please try again.