Skip to content
Commits on Jan 22, 2014
  1. Bumped version and added .pypirc config to gitignore

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

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

    …wagger into joshkehn-extra_actions
    Kyle Rimkus committed Dec 16, 2013
  3. Merge commit '6d0baa4eeca5d6a14a8fcdb79c242644bce9a053'

    Conflicts:
    	tastypie_swagger/templates/tastypie_swagger/index.html
    	tastypie_swagger/views.py
    Kyle Rimkus committed Dec 16, 2013
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

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

    Fix backward compality from the url tag Fixes #26

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

    committed Apr 23, 2013
  2. Merge pull request #24 from algrs/master

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

    Removed view from context before rendering to json.

    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.
    algrs committed Apr 17, 2013
  2. @algrs

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

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

    committed Mar 14, 2013
  2. update to version 0.1

    committed Mar 14, 2013
  3. add basic summaries to operations

    committed Mar 14, 2013
  4. Merge pull request #23 from stefanw/django-1.5

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

    Obvious typo

    davidmiller committed Mar 2, 2013
  3. @davidmiller

    merge upstream changes

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

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

    Fix bug which causes JSON serialization error

    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
    wolever committed Feb 11, 2013
  2. @wolever
Commits on Feb 8, 2013
  1. minor context fix

    committed Feb 8, 2013
Commits on Feb 7, 2013
  1. bump to 0.0.4

    committed Feb 7, 2013
  2. Merge pull request #15 from johnraz/master

    Several improvements and additions
    committed Feb 7, 2013
Something went wrong with that request. Please try again.