Ecosyste.ms: OpenCollective

An open API service for software projects hosted on Open Collective.

DefectDojo

Open source vulnerability management and security orchestration.
Collective - Host: opensource - https://opencollective.com/django-defectdojo - Website: https://www.defectdojo.org/ - Code: https://github.com/DefectDojo

Improve CONTRIBUTORS.md

github.com/DefectDojo/django-tastypie-swagger - 774d22256b381ac086c69e9e70e664bfe7772a46 authored about 9 years ago by Marcelo Jorge Vieira <[email protected]>
Merge pull request #105 from Craym-/master

Improvment - Addition of custom model via extra-action

github.com/DefectDojo/django-tastypie-swagger - 874b064a368081ecce2bc1e1f1419005889c8c7a authored over 9 years ago by Jonathan Liuti <[email protected]>
Fixed commit according to comment + few extra fixes

On the doc (index.rst), I added the parameter "required" to the model so
that one could indicate...

github.com/DefectDojo/django-tastypie-swagger - 204394da8b292fc5e0a4008ec27a3bfff2116787 authored over 9 years ago by CHESSEL Sébastien <[email protected]>
Improvment - Addition of custom model via extra-action

I modified two places in the document: Around line 352 so that a two
news extra_actions elements...

github.com/DefectDojo/django-tastypie-swagger - efad9269b63e51f1e6594457788533adbda09a25 authored over 9 years ago by CHESSEL Sébastien <[email protected]>
Merge pull request #98 from jimlyndon/master

Update urls.py

github.com/DefectDojo/django-tastypie-swagger - c7f023acb1135933c691a7f48715b77d1c3eccd2 authored over 9 years ago by Jonathan Liuti <[email protected]>
bump version

github.com/DefectDojo/django-tastypie-swagger - 34d384d26d730ac76605dbc3d2cdfdbbd8190f37 authored over 9 years ago by austin <[email protected]>
Update urls.py

removed trailing slash to resolve tastypie endpoints correctly (not relying on append slash).
S...

github.com/DefectDojo/django-tastypie-swagger - 0d9bd877b6b928e8d5ad2f1a4d13f9413345859b authored almost 10 years ago by Jim Lyndon <[email protected]>
Merge pull request #37 from stefanw/python-3

Makes the project compatible with Python 3

github.com/DefectDojo/django-tastypie-swagger - 76b78748d4cd4661b305564bddc597e21c65be67 authored almost 10 years ago by Jonathan Liuti <[email protected]>
Fix force_text for Python 2/3 versions

github.com/DefectDojo/django-tastypie-swagger - 124d452af2391752519700bfffe2d5d2e13c32ce authored almost 10 years ago by Stefan Wehrmeyer <[email protected]>
Fix urljoin import for Python 3

github.com/DefectDojo/django-tastypie-swagger - 34deab0763cf078de6b4828d71d6cae81674156c authored almost 10 years ago by Stefan Wehrmeyer <[email protected]>
Merge pull request #92 from Novarg/swagger-1.2-2.0.22-2.0.37

Swagger-ui 2.0.22, swagger.js 2.0.37

github.com/DefectDojo/django-tastypie-swagger - 99189d395a55293ab7486348c7f799f1067e6181 authored over 10 years ago by Jonathan Liuti <[email protected]>
updated swagger-ui to 2.0.22 (current master)

updated swagger.js to 2.0.37 (bundled with swagger-ui)
updated swaggerVersion to 1.2

github.com/DefectDojo/django-tastypie-swagger - ca8ffedd1d27afabce4c6140721ae365e5b45e77 authored over 10 years ago by Vladislav Knopach <[email protected]>
merge upstream changes

github.com/DefectDojo/django-tastypie-swagger - 7e224aaac2934aa20b57e5e24c84527d946b1513 authored over 10 years ago by Vladislav Knopach <[email protected]>
Merge pull request #91 from fluffels/master

Added a check to see whether a field is really a foreign key before trying to fetch its relations.

github.com/DefectDojo/django-tastypie-swagger - c991a873d7a06b3f17b2133ce8daa3d90ed58548 authored over 10 years ago by Jonathan Liuti <[email protected]>
Changed field_is_fk variable to has_related_resource, as requested.

Also added comments to clarify the reason for the added checks.

github.com/DefectDojo/django-tastypie-swagger - a1652de21a5369b35e6d43e316cb73a085af9800 authored over 10 years ago by Jan CW Kroeze <[email protected]>
Added a check to see whether a field is really a foreign key before

trying to fetch its relations.

github.com/DefectDojo/django-tastypie-swagger - 62e2c76627abbc6c3003fcfbcaf0459f2623d9ca authored over 10 years ago by Jan CW Kroeze <[email protected]>
Merge pull request #84 from fradeve/FDV_resource_verbose

introduces plural resources name

github.com/DefectDojo/django-tastypie-swagger - 3d3b2b42a867fe60b2b204e06142e5164fe9e0b6 authored over 10 years ago by Jonathan Liuti <[email protected]>
Merge pull request #81 from willemt/patch-1

Added resourcePath as per Swagger spec

github.com/DefectDojo/django-tastypie-swagger - 4ceb1cd69983608d52cc864028116d49d286bbab authored over 10 years ago by Jonathan Liuti <[email protected]>
Merge pull request #86 from fredpalmer/bug/fix-broken-params

Changing params to the intended kwargs value used in the url parameter

github.com/DefectDojo/django-tastypie-swagger - b3c7a5984a21b624edc8a3b90c6f3f4c97e49be8 authored over 10 years ago by Jonathan Liuti <[email protected]>
Changing this to the intended kwargs value used in the url parameter and making it optional

github.com/DefectDojo/django-tastypie-swagger - 2a73e6ffaba1fccddbec8c93ccc0046d002a7645 authored over 10 years ago by Fred Palmer <[email protected]>
fixed typo

github.com/DefectDojo/django-tastypie-swagger - 5425b58b5f53db2e943c2e6319371d8cbd112297 authored over 10 years ago by Francesco de Virgilio <[email protected]>
added docs

github.com/DefectDojo/django-tastypie-swagger - 1d69bdb82a2c4b604e60b5a289bed99efab366b4 authored over 10 years ago by Francesco de Virgilio <[email protected]>
PyLint errors fixed

github.com/DefectDojo/django-tastypie-swagger - 5ed536f1135f8f8ec7df09ad9997fbf016140238 authored over 10 years ago by Francesco de Virgilio <[email protected]>
Using str.format()

github.com/DefectDojo/django-tastypie-swagger - c606a0c6be78cc21982c573ee59ccd6066ef0413 authored over 10 years ago by Willem Thiart <[email protected]>
Merge pull request #82 from willemt/swagger-codegen-friendly-nicknames

Changed nicknames to be swagger-codegen friendly

github.com/DefectDojo/django-tastypie-swagger - 1c08e8036fbd8ccdafdf0eacae7d9bd18b3cfa6a authored over 10 years ago by Jonathan Liuti <[email protected]>
Merge pull request #79 from fradeve/FDV_version

fix for Version not showing on index page, fixed typos

github.com/DefectDojo/django-tastypie-swagger - b398cc2cd47b3fdeb6dd71f478fdbae50618b132 authored over 10 years ago by Jonathan Liuti <[email protected]>
Merge pull request #83 from dAnjou/master

Prevent KeyError when popping 'tastypie_api_module' from context

github.com/DefectDojo/django-tastypie-swagger - d1eec5cbf74877a6d4a659a77bbced2368f47a83 authored over 10 years ago by Jonathan Liuti <[email protected]>
Prevent KeyError when popping 'tastypie_api_module' from context

github.com/DefectDojo/django-tastypie-swagger - e51f2760e67151c7687fbef62051ac3db1d5ca42 authored over 10 years ago by Max Ludwig <[email protected]>
Changed nicknames to be swagger-codegen friendly

github.com/DefectDojo/django-tastypie-swagger - 3a20d680eb07c35b6977c2f95ed90bb634ffbb75 authored over 10 years ago by Willem Thiart <[email protected]>
ADDED resourcePath as per Swagger spec

swagger-codegen gets upset when resourcePath isn't included within the schema

github.com/DefectDojo/django-tastypie-swagger - 7c5ee589701dc8d6e49fd83b08549af22d143a19 authored over 10 years ago by Willem <[email protected]>
introduces plural resources name

github.com/DefectDojo/django-tastypie-swagger - 5d9716b72c1aeaa7f4f2e1d65b761a719b9ed2c6 authored over 10 years ago by Francesco de Virgilio <[email protected]>
fixed docs, remove unused import in views

github.com/DefectDojo/django-tastypie-swagger - eed68c33a6d234ad99402d0a64e8fec9961fba8f authored over 10 years ago by Francesco de Virgilio <[email protected]>
loads per-api version from urls.py, updated docs

github.com/DefectDojo/django-tastypie-swagger - ffd482d3172d4c5b64827f57fa48aea23bb0077c authored over 10 years ago by Francesco de Virgilio <[email protected]>
fix for Version not showing on index page

github.com/DefectDojo/django-tastypie-swagger - 96760bd89ff4a79e10af9db09cc08c43c3ba9b84 authored over 10 years ago by Francesco de Virgilio <[email protected]>
Merge pull request #78 from fradeve/python-2.6

fixed compatibility with Python 2.6

github.com/DefectDojo/django-tastypie-swagger - cf97e2e1a9d2c49b9059b1b80c5c6da574870a27 authored over 10 years ago by Jonathan Liuti <[email protected]>
fixed compatibility with Python 2.6

github.com/DefectDojo/django-tastypie-swagger - d531a1d6b3ca92ae5f358511fc7256ec82881f10 authored over 10 years ago by Francesco de Virgilio <[email protected]>
Merge pull request #74 from johnraz/Issue73-IdAttributeSeemAbsentOnSomeResourceObject

Issue73 id attribute seem absent on some resource object

github.com/DefectDojo/django-tastypie-swagger - 1fa0a10b370e1ea6f067de64ff728c94fd3fe1cc authored over 10 years ago by Jonathan Liuti <[email protected]>
Compensate for missing User primary key on mongoengine User model

github.com/DefectDojo/django-tastypie-swagger - 1bb078bcf9f677e9b032c6da691f4ce7e2ff25d8 authored over 10 years ago by Jonathan Liuti <[email protected]>
Use getattr instead of a stupid if

github.com/DefectDojo/django-tastypie-swagger - 33de98b3440a9de9a2325d3cab88593ff0537ba7 authored over 10 years ago by Jonathan Liuti <[email protected]>
Attempt to fix #76, id attribute seem to be missing on some resource object (tastypie-mongodb)

github.com/DefectDojo/django-tastypie-swagger - 2554e66dff068260a6650f45c406d114e54f7113 authored over 10 years ago by Jonathan Liuti <[email protected]>
Leave me alone stupid file jquery

github.com/DefectDojo/django-tastypie-swagger - 021699544e55709d4c114381aa1841f6d60390a8 authored over 10 years ago by Jonathan Liuti <[email protected]>
Merge pull request #72 from johnraz/SmarterFieldTypeIntrospection

Fix #66, smarter way to detect native field type based on resource field instead of django field

github.com/DefectDojo/django-tastypie-swagger - f389bea4b417606f9df71c38eaabdd024f83155b authored over 10 years ago by Jonathan Liuti <[email protected]>
Fix #66, smarter way to detect native field type based on resource field instead of django field

github.com/DefectDojo/django-tastypie-swagger - e0b15cde647350d0214c9f2bb401795ca104913e authored over 10 years ago by Jonathan Liuti <[email protected]>
Merge pull request #70 from johnraz/master

Allow the tastypie_api_module param in url declaration to be a tastypie ...

github.com/DefectDojo/django-tastypie-swagger - 6e40dbafc5eba0bb74f1bc199eaa4533e9c490d1 authored over 10 years ago by Jonathan Liuti <[email protected]>
Allow the tastypie_api_module param in url declaration to be a tastypie instance and not only a full path string

github.com/DefectDojo/django-tastypie-swagger - 3ab3ac10c20dbc3000083c0d921b4954b3e2ffb4 authored over 10 years ago by Jonathan Liuti <[email protected]>
Merge pull request #69 from johnraz/master

Updated doc

github.com/DefectDojo/django-tastypie-swagger - 5d136314119aa3732f1eea2730f1aafa365541b0 authored over 10 years ago by Jonathan Liuti <[email protected]>
Updated doc

github.com/DefectDojo/django-tastypie-swagger - c43f24dec4960eb573329e6c9d395c1311e1e64a authored over 10 years ago by Jonathan Liuti <[email protected]>
Merge pull request #63 from johnraz/master

Fix #61, Compatibility code with django 1.5 + strenghten recursion prote...

github.com/DefectDojo/django-tastypie-swagger - 58f5c2ddf2c4d965859d5303fd2facb01d65e5f4 authored over 10 years ago by Jonathan Liuti <[email protected]>
Fix #61, Compatibility code with django 1.5 + strenghten recursion protection with related fields

github.com/DefectDojo/django-tastypie-swagger - f7310b9572ea9c68a05128ca78da7c113de06969 authored over 10 years ago by Jonathan Liuti <[email protected]>
Docs update

github.com/DefectDojo/django-tastypie-swagger - abd95187f0d967a0c582945a4bf134f1813fc220 authored over 10 years ago by krimkus <[email protected]>
Bumped version to 0.1.3

github.com/DefectDojo/django-tastypie-swagger - 917ae8ce103dcb47b0310f4e5e13840db1d1c3c1 authored over 10 years ago by krimkus <[email protected]>
Updated docs index with actual docs. Still need to expand docs and break out into a ToC.

github.com/DefectDojo/django-tastypie-swagger - aecde8d172054fe08d984a2d00378c12f0da2b24 authored over 10 years ago by krimkus <[email protected]>
Renamed README file, added a CONTRIBUTORS file and updated README to refer to Read The Docs

github.com/DefectDojo/django-tastypie-swagger - 5124c34a0aab6ed46372fc3a61438831ed16ea48 authored over 10 years ago by krimkus <[email protected]>
Renamed third party licenses file

github.com/DefectDojo/django-tastypie-swagger - 98782276c099bf8c1fea3842fe2d8817b631ad7a authored over 10 years ago by krimkus <[email protected]>
Renamed license file and updated to latest version

github.com/DefectDojo/django-tastypie-swagger - 17be8d6699bf53a4abeb292dcc8b94a601f4d943 authored over 10 years ago by krimkus <[email protected]>
respect Meta.excludes option when building resource schema

github.com/DefectDojo/django-tastypie-swagger - 9bd50b3d5621cc1c5355be5afbcbc15c4b5f7640 authored almost 11 years ago by Vladislav Knopach <[email protected]>
added support for paramType=body in extra actions

github.com/DefectDojo/django-tastypie-swagger - 9c4cb787c68599ed20552ea8f4685c1faf9a937b authored almost 11 years ago by Vladislav Knopach <[email protected]>
upgrade swagger-ui to 1.2

github.com/DefectDojo/django-tastypie-swagger - ec37802acb6f08c64b053c85d5a5606c3d01a88e authored almost 11 years ago by Vladislav Knopach <[email protected]>
docs directory for RTD

github.com/DefectDojo/django-tastypie-swagger - 6af11f6545f210674ef07065a2c8d1d6dc0857f4 authored almost 11 years ago by krimkus <[email protected]>
Fix line ending in index.html

github.com/DefectDojo/django-tastypie-swagger - 7b3eab8866d7fe80eb88d88c8b4a8d72f84392d3 authored almost 11 years ago by Jonathan Liuti <[email protected]>
Fix #49 - remove id field for extra action list view

github.com/DefectDojo/django-tastypie-swagger - 9a2b528bda81d288aae721b62010b425c1b664bd authored almost 11 years ago by Jonathan Liuti <[email protected]>
Fix #50, correctly detect the type of pk field and related fields

github.com/DefectDojo/django-tastypie-swagger - 2f8ed22dd40d09fed9fac54830b2ac3254890bd3 authored almost 11 years ago by Jonathan Liuti <[email protected]>
Fix #22, avoid infinite recursion for self referencing resources

github.com/DefectDojo/django-tastypie-swagger - 36feb6017f58623491208376e3a76a3307870752 authored almost 11 years ago by Jonathan Liuti <[email protected]>
The 'ALL' filtering type was broken (related to #41)

github.com/DefectDojo/django-tastypie-swagger - 0c70dd307a0da90909200ebc8317a7d3a15c869a authored almost 11 years ago by Jonathan Liuti <[email protected]>
Add git normalization setting

github.com/DefectDojo/django-tastypie-swagger - 7cb96e378886cc0783a188af6ae6ec9bffd8b7c9 authored almost 11 years ago by Jonathan Liuti <[email protected]>
fix readme formatting

github.com/DefectDojo/django-tastypie-swagger - 96b39e4fe7fb6221cd158e92c008db90c18b5611 authored almost 11 years ago by Jonathan Liuti <[email protected]>
Merge pull request #53 from johnraz/#35-accept-any-iterable-but-string

Allow fields to be declared as tuples

github.com/DefectDojo/django-tastypie-swagger - f9d3aa48a51e12f5b2aad4dc04fde69c0a35333b authored almost 11 years ago by Jonathan Liuti <[email protected]>
Allow fields to be declared as tuples

github.com/DefectDojo/django-tastypie-swagger - 9658c50f2ac2f4e7a4533843c9461447de8d1a63 authored almost 11 years ago by Jonathan Liuti <[email protected]>
Merge pull request #30 from johnraz/master

Fix issue 12 - multiple api support

github.com/DefectDojo/django-tastypie-swagger - c42257c34282323b390a1c2ba4d6fdfe5991cb5a authored almost 11 years ago by Jonathan Liuti <[email protected]>
Added documentation for multiple apis declaration

github.com/DefectDojo/django-tastypie-swagger - 74afb825942d9e760e2b0d06dfeacb9dc9bac7b2 authored almost 11 years ago by Jonathan Liuti <[email protected]>
Enable caching of the tastypie module property

github.com/DefectDojo/django-tastypie-swagger - 2bea2bb961a8e0ca3fbeda76cc51c70cbde4994d authored almost 11 years ago by Jonathan Liuti <[email protected]>
Fix issue #12, added multiple api support

github.com/DefectDojo/django-tastypie-swagger - ff916fa616b89934604c5822199acc60ea5fe766 authored almost 11 years ago by Jonathan Liuti <[email protected]>
Merge branch '51_make_fields_optional'

github.com/DefectDojo/django-tastypie-swagger - dba5496bc0f50b71943f8f3c5fb3c6af6178c905 authored almost 11 years ago by Joshua Kehn <[email protected]>
Fields are optional in `extra_actions`

Documentation updated to reflect. Fixes bug #51.

github.com/DefectDojo/django-tastypie-swagger - 0196b9dd58889341b0f179539716a29567738e69 authored almost 11 years ago by Joshua Kehn <[email protected]>
Merge pull request #47 from minism/patch-1

fix README formatting

github.com/DefectDojo/django-tastypie-swagger - 203fbd8168fa2c9aef7919c3ca30c3070d9fbdfd authored almost 11 years ago by krimkus <[email protected]>
fix README formatting

github.com/DefectDojo/django-tastypie-swagger - 41c8c9f3df66487e0ace3cf2d870d0d292e42a49 authored almost 11 years ago by Josh Bothun <[email protected]>
Bumped version and added .pypirc config to gitignore

github.com/DefectDojo/django-tastypie-swagger - a8924622b816668c797541fd99327ca9868b1f5e authored almost 11 years ago by Kyle Rimkus <[email protected]>
Merge branch 'master' of github.com:davidmiller/django-tastypie-swagger into davidmiller-master

Conflicts:
tastypie_swagger/views.py

github.com/DefectDojo/django-tastypie-swagger - 775e94cb3ee73ab1ed8c3e6ad939986358819a2a authored about 11 years ago by Kyle Rimkus <[email protected]>
Merge branch 'extra_actions' of github.com:joshkehn/django-tastypie-swagger into joshkehn-extra_actions

github.com/DefectDojo/django-tastypie-swagger - 75b852e41ed82b0f6de645e0ad4a86f3180e8b9d authored about 11 years ago by Kyle Rimkus <[email protected]>
Merge commit '6d0baa4eeca5d6a14a8fcdb79c242644bce9a053'

Conflicts:
tastypie_swagger/templates/tastypie_swagger/index.html
tastypie_swagger/views.py

github.com/DefectDojo/django-tastypie-swagger - 3f8b313f61682c03b042e20c6ce3ad85144e84d3 authored about 11 years ago by Kyle Rimkus <[email protected]>
Added description field to extra_options

github.com/DefectDojo/django-tastypie-swagger - befa7746a07627810f864cf1a2d3066789b4cf9d authored about 11 years ago by Joshua Kehn <[email protected]>
Added list view possibility to mapping.py

github.com/DefectDojo/django-tastypie-swagger - ab71f8c314470f88e01d5927f029f5d572e91036 authored about 11 years ago by Joshua Kehn <[email protected]>
Merge pull request #28 from Azd325/master

Fixed backwards compatibility Django < 1.5 in the Template

github.com/DefectDojo/django-tastypie-swagger - 44dab3a4d3ce98619c33d0a8f85ae80faddb6980 authored over 11 years ago by Josh Bothun <[email protected]>
Fix backward compality from the url tag Fixes #26

Load for the earlier version of Django the url from future libary

github.com/DefectDojo/django-tastypie-swagger - 7bb1ae6e4e94780d122ef4cd4505c54b887c8b0e authored over 11 years ago by Tim Kleinschmidt <[email protected]>
bump version to v0.1.1

github.com/DefectDojo/django-tastypie-swagger - acca712a84a32e023050826d07c1913b118c3498 authored over 11 years ago by josh <[email protected]>
Merge pull request #24 from algrs/master

Fix for django 1.5 and tastypie 0.9.14

github.com/DefectDojo/django-tastypie-swagger - 008c1edbb8268be2cb99212b60b26762b8bc9c05 authored over 11 years ago by Josh Bothun <[email protected]>
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 c...

github.com/DefectDojo/django-tastypie-swagger - f4cbdd80358ec35ac3c2f7b981cbe7ceec303682 authored over 11 years ago by Alex Weiss <[email protected]>
Django 1.5 changed the url tag slightly such that we need to put quotes around namespaced urls.

github.com/DefectDojo/django-tastypie-swagger - 4b4d97f316766efb9bd3e8d15449f5b0a4558d8a authored over 11 years ago by Alex Weiss <[email protected]>
Merge branch 'master' into django-1.5

github.com/DefectDojo/django-tastypie-swagger - 6d0baa4eeca5d6a14a8fcdb79c242644bce9a053 authored almost 12 years ago by josh <[email protected]>
update package metadata

github.com/DefectDojo/django-tastypie-swagger - fd2818812431fb20ae4dfce2fca3bd875615c295 authored almost 12 years ago by josh <[email protected]>
Merge remote-tracking branch 'origin/django-1.5' into django-1.5

github.com/DefectDojo/django-tastypie-swagger - 78b8b0d8af8e89a92aa3d1c28ca39322660aa619 authored almost 12 years ago by josh <[email protected]>
Merge branch 'master' into django-1.5

github.com/DefectDojo/django-tastypie-swagger - 95b1203264cc1a04b8db882cd17e10216d6bc4ea authored almost 12 years ago by josh <[email protected]>
update to version 0.1

github.com/DefectDojo/django-tastypie-swagger - b36c8e1f826b0262b6cd8999024229354ad5bbc0 authored almost 12 years ago by josh <[email protected]>
add basic summaries to operations

github.com/DefectDojo/django-tastypie-swagger - ad14ee9b15ef20b5fd1a64ee80088b781cdd216c authored almost 12 years ago by josh <[email protected]>
Merge pull request #23 from stefanw/django-1.5

Keep support for Django < 1.5

github.com/DefectDojo/django-tastypie-swagger - 14116dfaf63891fd883004bb655bc38b40b5e8d4 authored almost 12 years ago by Josh Bothun <[email protected]>
Keep template backwards compatible to Django 1.4

github.com/DefectDojo/django-tastypie-swagger - fa8b44a37227411f79d6446df5dfe00017215cd4 authored almost 12 years ago by Stefan Wehrmeyer <[email protected]>
Don't try to render the view please

github.com/DefectDojo/django-tastypie-swagger - 3f83d1f735dbf90e4134cfcd744f66117f6cd145 authored almost 12 years ago by David Miller <[email protected]>
Obvious typo

github.com/DefectDojo/django-tastypie-swagger - 90c3dc18efbcc0cfbd50bca2de0bbc254568b4e1 authored almost 12 years ago by David Miller <[email protected]>
merge upstream changes

github.com/DefectDojo/django-tastypie-swagger - 3529ecebc9ed39e28847d9a073946bfbb24a2271 authored almost 12 years ago by David Miller <[email protected]>
Merge remote-tracking branch 'origin/master' into django-1.5

github.com/DefectDojo/django-tastypie-swagger - 8734574c00908233201da520a84404ca23eef492 authored almost 12 years ago by josh <[email protected]>