Package: djangorestframework / 3.9.0-1

0002-Clean-all-privacy-breaches-in-the-package.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
From: =?utf-8?q?Pierre-Elliott_B=C3=A9cue?= <becue@crans.org>
Date: Mon, 12 Mar 2018 20:55:16 +0100
Subject: Clean all privacy breaches in the package

---
 docs/community/3.0-announcement.md                 |   4 +-
 docs/community/3.9-announcement.md                 |   2 +-
 docs/community/funding.md                          | 181 +--------------------
 docs/community/kickstarter-announcement.md         |   2 +-
 docs/community/mozilla-grant.md                    |  27 +--
 docs/index.md                                      |  16 --
 docs/topics/documenting-your-api.md                |   3 +-
 docs_theme/main.html                               |  22 ---
 .../rest_framework/css/bootstrap-theme.min.css     |   2 +-
 9 files changed, 11 insertions(+), 248 deletions(-)

diff --git a/docs/community/3.0-announcement.md b/docs/community/3.0-announcement.md
index 83aec9e..9eb47ad 100644
--- a/docs/community/3.0-announcement.md
+++ b/docs/community/3.0-announcement.md
@@ -32,9 +32,7 @@ Significant new functionality continues to be planned for the 3.1 and 3.2 releas
 
 #### REST framework: Under the hood.
 
-This talk from the [Django: Under the Hood](https://www.djangounderthehood.com/) event in Amsterdam, Nov 2014, gives some good background context on the design decisions behind 3.0.
-
-<iframe style="display: block; margin: 0 auto 0 auto" width="560" height="315" src="//www.youtube.com/embed/3cSsbe-tA0E" frameborder="0" allowfullscreen></iframe>
+<a href="https://www.youtube.com/watch?v=3cSsbe-tA0E">This talk</a> from the [Django: Under the Hood](http://www.djangounderthehood.com/) event in Amsterdam, Nov 2014, gives some good background context on the design decisions behind 3.0.
 
 ---
 
diff --git a/docs/community/3.9-announcement.md b/docs/community/3.9-announcement.md
index 3cd9b1a..79a49a3 100644
--- a/docs/community/3.9-announcement.md
+++ b/docs/community/3.9-announcement.md
@@ -120,7 +120,7 @@ from `BasePermission` in order to enable this support.
 Following the introduction of the `action` decorator in v3.8, _extra actions_ defined on a ViewSet are now available
 from the Browsable API.
 
-![Extra Actions displayed in the Browsable API](https://user-images.githubusercontent.com/2370209/32976956-1ca9ab7e-cbf1-11e7-981a-a20cb1e83d63.png)
+[Extra Actions displayed in the Browsable API](https://user-images.githubusercontent.com/2370209/32976956-1ca9ab7e-cbf1-11e7-981a-a20cb1e83d63.png)
 
 When defined, a dropdown of "Extra Actions", appropriately filtered to detail/non-detail actions, is displayed.
 
diff --git a/docs/community/funding.md b/docs/community/funding.md
index 8f0e025..415448b 100644
--- a/docs/community/funding.md
+++ b/docs/community/funding.md
@@ -173,43 +173,7 @@ This subscription is recommended for individuals with an interest in seeing REST
 
 If you are using REST framework as a full-time employee, consider recommending that your company takes out a [corporate&nbsp;plan](#corporate-plans).
 
-<div class="pricing">
-                <div class="span4">
-                    <div class="chart first">
-                        <div class="quantity">
-                            <span class="dollar">{{ symbol }}</span>
-                            <span class="price">{{ rates.personal1 }}</span>
-                            <span class="period">/month{% if vat %} +VAT{% endif %}</span>
-                        </div>
-                        <div class="plan-name">Individual</div>
-                        <div class="specs freelancer">
-                            <div class="spec">
-                                Support ongoing development
-                            </div>
-                            <div class="spec">
-                                Credited on the site
-                            </div>
-                        </div>
-                        <form class="signup" action="/signup/{{ currency }}-{{ rates.personal1 }}/" method="POST">
-  <script
-    src="https://checkout.stripe.com/checkout.js" class="stripe-button"
-    data-key="{{ stripe_public }}"
-    data-amount="{{ stripe_amounts.personal1 }}"
-    data-name="Django REST framework"
-    data-description="Individual"
-    data-currency="{{ currency }}"
-    data-allow-remember-me=false
-    data-billing-address=true
-    data-label='Sign up'
-    data-panel-label='Sign up - {% verbatim %}{{amount}}{% endverbatim %}/mo'>
-  </script>
-</form>
-                    </div>
-                </div>
-            </div>
-<div style="clear: both; padding-top: 50px"></div>
-
-*Billing is monthly and you can cancel at any time.*
+For privacy reasons, these paragraphs were stripped from Debian package. Yet, we believe that it's the software's author right to advertise for funding. We encourage you to browse <a href="https://fund.django-rest-framework.org/topics/funding/#individual-plan">this webpage</a> to see the original contents of the funding plans.
 
 ---
 
@@ -221,117 +185,7 @@ In exchange for funding you'll also receive advertising space on our site, allow
 
 Our professional and premium plans also include **priority support**. At any time your engineers can escalate an issue or discussion group thread, and we'll ensure it gets a guaranteed response within the next working day.
 
-<div class="pricing">
-                <div class="span4">
-                    <div class="chart first">
-                        <div class="quantity">
-                            <span class="dollar">{{ symbol }}</span>
-                            <span class="price">{{ rates.corporate1 }}</span>
-                            <span class="period">/month{% if vat %} +VAT{% endif %}</span>
-                        </div>
-                        <div class="plan-name">Basic</div>
-                        <div class="specs startup">
-                            <div class="spec">
-                                Support ongoing development
-                            </div>
-                            <div class="spec">
-                                <span class="variable">Funding page</span> ad placement
-                            </div>
-                        </div>
-                        <form class="signup" action="/signup/{{ currency }}-{{ rates.corporate1 }}/" method="POST">
-  <script
-    src="https://checkout.stripe.com/checkout.js" class="stripe-button"
-    data-key="{{ stripe_public }}"
-    data-amount="{{ stripe_amounts.corporate1 }}"
-    data-name="Django REST framework"
-    data-description="Basic"
-    data-currency="{{ currency }}"
-    data-allow-remember-me=false
-    data-billing-address=true
-    data-label='Sign up'
-    data-panel-label='Sign up - {% verbatim %}{{amount}}{% endverbatim %}/mo'>
-  </script>
-</form>
-                    </div>
-                </div>
-                <div class="span4">
-                    <div class="chart">
-                        <div class="quantity">
-                            <span class="dollar">{{ symbol }}</span>
-                            <span class="price">{{ rates.corporate2 }}</span>
-                            <span class="period">/month{% if vat %} +VAT{% endif %}</span>
-                        </div>
-                        <div class="plan-name">Professional</div>
-                        <div class="specs">
-                            <div class="spec">
-                                Support ongoing development
-                            </div>
-                            <div class="spec">
-                                <span class="variable">Sidebar</span> ad placement
-                            </div>
-                            <div class="spec">
-                                <span class="variable">Priority support</span> for your engineers
-                            </div>
-                        </div>
-                        <form class="signup" action="/signup/{{ currency }}-{{ rates.corporate2 }}/" method="POST">
-  <script
-    src="https://checkout.stripe.com/checkout.js" class="stripe-button"
-    data-key="{{ stripe_public }}"
-    data-amount="{{ stripe_amounts.corporate2 }}"
-    data-name="Django REST framework"
-    data-description="Professional"
-    data-currency="{{ currency }}"
-    data-allow-remember-me=false
-    data-billing-address=true
-    data-label='Sign up'
-    data-panel-label='Sign up - {% verbatim %}{{amount}}{% endverbatim %}/mo'>
-  </script>
-</form>
-                    </div>
-                </div>
-                <div class="span4">
-                    <div class="chart last">
-                        <div class="quantity">
-                            <span class="dollar">{{ symbol }}</span>
-                            <span class="price">{{ rates.corporate3 }}</span>
-                            <span class="period">/month{% if vat %} +VAT{% endif %}</span>
-                        </div>
-                        <div class="plan-name">Premium</div>
-                        <div class="specs">
-                        <div class="spec">
-                            Support ongoing development
-                        </div>
-                            <div class="spec">
-                                <span class="variable">Homepage</span> ad placement
-                            </div>
-                            <div class="spec">
-                                <span class="variable">Sidebar</span> ad placement
-                            </div>
-                            <div class="spec">
-                                <span class="variable">Priority support</span> for your engineers
-                            </div>
-                        </div>
-                        <form class="signup" action="/signup/{{ currency }}-{{ rates.corporate3 }}/" method="POST">
-  <script
-    src="https://checkout.stripe.com/checkout.js" class="stripe-button"
-    data-key="{{ stripe_public }}"
-    data-amount="{{ stripe_amounts.corporate3 }}"
-    data-name="Django REST framework"
-    data-description="Premium"
-    data-currency="{{ currency }}"
-    data-allow-remember-me=false
-    data-billing-address=true
-    data-label='Sign up'
-    data-panel-label='Sign up - {% verbatim %}{{amount}}{% endverbatim %}/mo'>
-  </script>
-</form>
-                    </div>
-                </div>
-            </div>
-
-<div style="clear: both; padding-top: 50px"></div>
-
-*Billing is monthly and you can cancel at any time.*
+For privacy reasons, these paragraphs were stripped from Debian package. Yet, we believe that it's the software's author right to advertise for funding. We encourage you to browse <a href="https://fund.django-rest-framework.org/topics/funding/#corporate-plans">this webpage</a> to see the original contents of the funding plans.
 
 Once you've signed up, we will contact you via email and arrange your ad placements on the site.
 
@@ -343,32 +197,7 @@ For further enquires please contact <a href=mailto:funding@django-rest-framework
 
 In an effort to keep the project as transparent as possible, we are releasing [monthly progress reports](https://www.encode.io/reports/march-2018) and regularly include financial reports and cost breakdowns.
 
-<!-- Begin MailChimp Signup Form -->
-<link href="//cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">
-<style type="text/css">
-    #mc_embed_signup{background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif; }
-    /* Add your own MailChimp form style overrides in your site stylesheet or in this style block.
-       We recommend moving this block and the preceding CSS link to the HEAD of your HTML file. */
-</style>
-<div id="mc_embed_signup">
-<form action="//encode.us13.list-manage.com/subscribe/post?u=b6b66bb5e4c7cb484a85c8dd7&amp;id=e382ef68ef" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
-    <div id="mc_embed_signup_scroll">
-    <h2>Stay up to date, with our monthly progress reports...</h2>
-<div class="mc-field-group">
-    <label for="mce-EMAIL">Email Address </label>
-    <input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
-</div>
-    <div id="mce-responses" class="clear">
-        <div class="response" id="mce-error-response" style="display:none"></div>
-        <div class="response" id="mce-success-response" style="display:none"></div>
-    </div>    <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
-    <div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_b6b66bb5e4c7cb484a85c8dd7_e382ef68ef" tabindex="-1" value=""></div>
-    <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
-    </div>
-</form>
-</div>
-<script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script><script type='text/javascript'>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>
-<!--End mc_embed_signup-->
+For privacy reasons, the mailchimp subscription form provided here by the original author has been stripped from the Debian's package. See the original content <a href="https://fund.django-rest-framework.org/topics/funding/#accountability">here</a>.
 
 ---
 
@@ -393,6 +222,4 @@ A: No, we value individual sponsors just as much as corporate sponsors and appre
 
 ## Our sponsors
 
-<div id="fundingInclude"></div>
-
-<script src="https://fund.django-rest-framework.org/funding_include.js"></script>
+For privacy reasons, the content here, which was imported from an external website, has been stripped out from Debian's package. See the original content <a href="https://fund.django-rest-framework.org/topics/funding/#our-sponsors">here</a>.
diff --git a/docs/community/kickstarter-announcement.md b/docs/community/kickstarter-announcement.md
index 0e5d95b..164bdcd 100644
--- a/docs/community/kickstarter-announcement.md
+++ b/docs/community/kickstarter-announcement.md
@@ -2,7 +2,7 @@
 
 ---
 
-<iframe style="display: block; margin: 0 auto 0 auto" width="480" height="360" src="https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3/widget/video.html" frameborder="0" scrolling="no"> </iframe>
+<a href="https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3/widget/video.html">Kickstarter announcement</a>
 
 ---
 
diff --git a/docs/community/mozilla-grant.md b/docs/community/mozilla-grant.md
index 5248f5c..77edc39 100644
--- a/docs/community/mozilla-grant.md
+++ b/docs/community/mozilla-grant.md
@@ -39,29 +39,4 @@ act as the business entity behind REST framework. I will be issuing monthly repo
 from Encode on progress both towards the Mozilla grant, and for development time
 funded via the [REST framework paid plans](funding.md).
 
-<!-- Begin MailChimp Signup Form -->
-<link href="//cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">
-<style type="text/css">
-    #mc_embed_signup{background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif; }
-    /* Add your own MailChimp form style overrides in your site stylesheet or in this style block.
-       We recommend moving this block and the preceding CSS link to the HEAD of your HTML file. */
-</style>
-<div id="mc_embed_signup">
-<form action="//encode.us13.list-manage.com/subscribe/post?u=b6b66bb5e4c7cb484a85c8dd7&amp;id=e382ef68ef" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
-    <div id="mc_embed_signup_scroll">
-    <h2>Stay up to date, with our monthly progress reports...</h2>
-<div class="mc-field-group">
-    <label for="mce-EMAIL">Email Address </label>
-    <input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
-</div>
-    <div id="mce-responses" class="clear">
-        <div class="response" id="mce-error-response" style="display:none"></div>
-        <div class="response" id="mce-success-response" style="display:none"></div>
-    </div>    <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
-    <div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_b6b66bb5e4c7cb484a85c8dd7_e382ef68ef" tabindex="-1" value=""></div>
-    <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
-    </div>
-</form>
-</div>
-<script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script><script type='text/javascript'>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>
-<!--End mc_embed_signup-->
+For privacy reasons, the mailchimp subscription form provided here by the original author has been stripped from the Debian's package. See the original content <a href="http://www.django-rest-framework.org/topics/mozilla-grant/#accountability">here</a>.
diff --git a/docs/index.md b/docs/index.md
index c250aa0..8c5ed8c 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -17,19 +17,6 @@
 }
 </style>
 
-<p class="badges" height=20px>
-    <iframe src="https://ghbtns.com/github-btn.html?user=encode&amp;repo=django-rest-framework&amp;type=watch&amp;count=true" class="github-star-button" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
-
-    <a href="https://travis-ci.org/encode/django-rest-framework?branch=master">
-        <img src="https://secure.travis-ci.org/encode/django-rest-framework.svg?branch=master" class="status-badge">
-    </a>
-
-    <a href="https://pypi.org/project/djangorestframework/">
-        <img src="https://img.shields.io/pypi/v/djangorestframework.svg" class="status-badge">
-    </a>
-</p>
-
----
 
 <p>
 <h1 style="position: absolute;
@@ -191,9 +178,6 @@ For priority support please sign up for a [professional or premium sponsorship p
 
 For updates on REST framework development, you may also want to follow [the author][twitter] on Twitter.
 
-<a style="padding-top: 10px" href="https://twitter.com/_tomchristie" class="twitter-follow-button" data-show-count="false">Follow @_tomchristie</a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-
 ## Security
 
 If you believe you’ve found something in Django REST framework which has security implications, please **do not raise the issue in a public forum**.
diff --git a/docs/topics/documenting-your-api.md b/docs/topics/documenting-your-api.md
index 778ebb0..f2fac45 100644
--- a/docs/topics/documenting-your-api.md
+++ b/docs/topics/documenting-your-api.md
@@ -261,7 +261,7 @@ Supports:
   * permission_classes
   * extra url params(GET params)
 
-![whole structure](http://joxi.ru/52aBGNI4k3oyA0.jpg)
+![whole structure](image-whole-structure)
 
 ---
 
@@ -352,6 +352,7 @@ To implement a hypermedia API you'll need to decide on an appropriate media type
 [markdown]: https://daringfireball.net/projects/markdown/
 [hypermedia-docs]: rest-hypermedia-hateoas.md
 [image-drf-docs]: ../img/drfdocs.png
+[image-whole-structure]: ../img/whole-structure.jpg
 [image-django-rest-swagger]: ../img/django-rest-swagger.png
 [image-apiary]: ../img/apiary.png
 [image-self-describing-api]: ../img/self-describing.png
diff --git a/docs_theme/main.html b/docs_theme/main.html
index b60b231..bb17e9a 100644
--- a/docs_theme/main.html
+++ b/docs_theme/main.html
@@ -6,7 +6,6 @@
   <meta charset="utf-8">
   <title>{% if page.title %}{{ page.title }} - {% endif %}{{ config.site_name }}</title>
   <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon">
-  <link rel="canonical" href="{{ page.canonical_url }}" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="Django, API, REST{% if page %}, {{ page.title }}{% endif %}">
   <meta name="author" content="Tom Christie">
@@ -17,26 +16,6 @@
   <link href="{{ base_url }}/css/bootstrap-responsive.css" rel="stylesheet">
   <link href="{{ base_url }}/css/default.css" rel="stylesheet">
 
-  <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
-
-  <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-18852272-2']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script');
-      ga.type = 'text/javascript';
-      ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0];
-      s.parentNode.insertBefore(ga, s);
-    })();
-  </script>
-
   <style>
   #sidebarInclude img {
       margin-bottom: 10px;
@@ -141,7 +120,6 @@
   <script src="{{ base_url }}/js/jquery-1.8.1-min.js"></script>
   <script src="{{ base_url }}/js/prettify-1.0.js"></script>
   <script src="{{ base_url }}/js/bootstrap-2.1.1-min.js"></script>
-  <script src="https://fund.django-rest-framework.org/sidebar_include.js"></script>
   <script>var base_url = '{{ base_url }}';</script>
   <script src="{{ base_url }}/mkdocs/js/require.js"></script>
   <script src="{{ base_url }}/js/theme.js"></script>
diff --git a/rest_framework/static/rest_framework/css/bootstrap-theme.min.css b/rest_framework/static/rest_framework/css/bootstrap-theme.min.css
index 5b8a17d..6fae10c 100644
--- a/rest_framework/static/rest_framework/css/bootstrap-theme.min.css
+++ b/rest_framework/static/rest_framework/css/bootstrap-theme.min.css
@@ -1,4 +1,4 @@
-@import url("https://fonts.googleapis.com/css?family=Roboto:400,500,700");/*!
+/*!
  * bootswatch v3.3.7
  * Homepage: http://bootswatch.com
  * Copyright 2012-2016 Thomas Park