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
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
|
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
Forwarded: not-needed
---
docs/community/3.0-announcement.md | 4 +-
docs/community/3.10-announcement.md | 11 --
docs/community/3.11-announcement.md | 12 --
docs/community/3.12-announcement.md | 12 --
docs/community/3.4-announcement.md | 7 --
docs/community/3.5-announcement.md | 8 --
docs/community/3.6-announcement.md | 10 --
docs/community/3.7-announcement.md | 9 --
docs/community/3.9-announcement.md | 15 +--
docs/community/funding.md | 182 +----------------------------
docs/community/kickstarter-announcement.md | 2 +-
docs/community/mozilla-grant.md | 27 +----
docs/index.md | 26 -----
docs_theme/main.html | 29 +----
14 files changed, 14 insertions(+), 340 deletions(-)
diff --git a/docs/community/3.0-announcement.md b/docs/community/3.0-announcement.md
index 0cb79fc..329d7a8 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.10-announcement.md b/docs/community/3.10-announcement.md
index a2135fd..15d2002 100644
--- a/docs/community/3.10-announcement.md
+++ b/docs/community/3.10-announcement.md
@@ -130,17 +130,6 @@ continued development by **[signing up for a paid plan][funding]**.
*Every single sign-up helps us make REST framework long-term financially sustainable.*
-<ul class="premium-promo promo">
- <li><a href="https://getsentry.com/welcome/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/sentry130.png)">Sentry</a></li>
- <li><a href="https://getstream.io/try-the-api/?utm_source=drf&utm_medium=banner&utm_campaign=drf" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/stream-130.png)">Stream</a></li>
- <li><a href="https://software.esg-usa.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/esg-new-logo.png)">ESG</a></li>
- <li><a href="https://rollbar.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rollbar2.png)">Rollbar</a></li>
- <li><a href="https://cadre.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/cadre.png)">Cadre</a></li>
- <li><a href="https://hubs.ly/H0f30Lf0" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/kloudless-plus-text.png)">Kloudless</a></li>
- <li><a href="https://lightsonsoftware.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/lightson-dark.png)">Lights On Software</a></li>
-</ul>
-<div style="clear: both; padding-bottom: 20px;"></div>
-
*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), and [Lights On Software](https://lightsonsoftware.com).*
[legacy-core-api-docs]:https://github.com/encode/django-rest-framework/blob/3.14.0/docs/coreapi/index.md
diff --git a/docs/community/3.11-announcement.md b/docs/community/3.11-announcement.md
index 2fc37a7..7c304e1 100644
--- a/docs/community/3.11-announcement.md
+++ b/docs/community/3.11-announcement.md
@@ -100,18 +100,6 @@ continued development by **[signing up for a paid plan][funding]**.
*Every single sign-up helps us make REST framework long-term financially sustainable.*
-<ul class="premium-promo promo">
- <li><a href="https://getsentry.com/welcome/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/sentry130.png)">Sentry</a></li>
- <li><a href="https://getstream.io/try-the-api/?utm_source=drf&utm_medium=banner&utm_campaign=drf" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/stream-130.png)">Stream</a></li>
- <li><a href="https://software.esg-usa.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/esg-new-logo.png)">ESG</a></li>
- <li><a href="https://rollbar.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rollbar2.png)">Rollbar</a></li>
- <li><a href="https://cadre.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/cadre.png)">Cadre</a></li>
- <li><a href="https://hubs.ly/H0f30Lf0" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/kloudless-plus-text.png)">Kloudless</a></li>
- <li><a href="https://lightsonsoftware.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/lightson-dark.png)">Lights On Software</a></li>
- <li><a href="https://retool.com/?utm_source=djangorest&utm_medium=sponsorship" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/retool-sidebar.png)">Retool</a></li>
-</ul>
-<div style="clear: both; padding-bottom: 20px;"></div>
-
*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), and [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship).*
[sponsors]: https://fund.django-rest-framework.org/topics/funding/#our-sponsors
diff --git a/docs/community/3.12-announcement.md b/docs/community/3.12-announcement.md
index b192f72..c273f2d 100644
--- a/docs/community/3.12-announcement.md
+++ b/docs/community/3.12-announcement.md
@@ -163,18 +163,6 @@ continued development by **[signing up for a paid plan][funding]**.
*Every single sign-up helps us make REST framework long-term financially sustainable.*
-<ul class="premium-promo promo">
- <li><a href="https://getsentry.com/welcome/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/sentry130.png)">Sentry</a></li>
- <li><a href="https://getstream.io/try-the-api/?utm_source=drf&utm_medium=banner&utm_campaign=drf" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/stream-130.png)">Stream</a></li>
- <li><a href="https://software.esg-usa.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/esg-new-logo.png)">ESG</a></li>
- <li><a href="https://rollbar.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rollbar2.png)">Rollbar</a></li>
- <li><a href="https://cadre.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/cadre.png)">Cadre</a></li>
- <li><a href="https://hubs.ly/H0f30Lf0" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/kloudless-plus-text.png)">Kloudless</a></li>
- <li><a href="https://lightsonsoftware.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/lightson-dark.png)">Lights On Software</a></li>
- <li><a href="https://retool.com/?utm_source=djangorest&utm_medium=sponsorship" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/retool-sidebar.png)">Retool</a></li>
-</ul>
-<div style="clear: both; padding-bottom: 20px;"></div>
-
*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), and [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship).*
[sponsors]: https://fund.django-rest-framework.org/topics/funding/#our-sponsors
diff --git a/docs/community/3.4-announcement.md b/docs/community/3.4-announcement.md
index 2954b36..1925e16 100644
--- a/docs/community/3.4-announcement.md
+++ b/docs/community/3.4-announcement.md
@@ -35,13 +35,6 @@ The initial aim is to provide a single full-time position on REST framework.
Right now we're over 60% of the way towards achieving that.
*Every single sign-up makes a significant impact.*
-<ul class="premium-promo promo">
- <li><a href="https://www.rover.com/careers/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rover_130x130.png)">Rover.com</a></li>
- <li><a href="https://sentry.io/welcome/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/sentry130.png)">Sentry</a></li>
- <li><a href="https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/stream-130.png)">Stream</a></li>
-</ul>
-<div style="clear: both; padding-bottom: 20px;"></div>
-
*Many thanks to all our [awesome sponsors][sponsors], and in particular to our premium backers, [Rover](https://www.rover.com/careers/), [Sentry](https://sentry.io/welcome/), and [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf).*
---
diff --git a/docs/community/3.5-announcement.md b/docs/community/3.5-announcement.md
index 43a628d..6e9f367 100644
--- a/docs/community/3.5-announcement.md
+++ b/docs/community/3.5-announcement.md
@@ -31,14 +31,6 @@ If you use REST framework commercially and would like to see this work continue,
we strongly encourage you to invest in its continued development by
**[signing up for a paid plan][funding]**.
-<ul class="premium-promo promo">
- <li><a href="https://www.rover.com/careers/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rover_130x130.png)">Rover.com</a></li>
- <li><a href="https://sentry.io/welcome/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/sentry130.png)">Sentry</a></li>
- <li><a href="https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/stream-130.png)">Stream</a></li>
- <li><a href="https://www.machinalis.com/#services" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/Machinalis130.png)">Machinalis</a></li>
-</ul>
-<div style="clear: both; padding-bottom: 20px;"></div>
-
*Many thanks to all our [sponsors][sponsors], and in particular to our premium backers, [Rover](https://www.rover.com/careers/), [Sentry](https://sentry.io/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](https://www.machinalis.com/#services).*
---
diff --git a/docs/community/3.6-announcement.md b/docs/community/3.6-announcement.md
index 9e45473..6e98d49 100644
--- a/docs/community/3.6-announcement.md
+++ b/docs/community/3.6-announcement.md
@@ -38,16 +38,6 @@ If you use REST framework commercially and would like to see this work continue,
we strongly encourage you to invest in its continued development by
**[signing up for a paid plan][funding]**.
-<ul class="premium-promo promo">
- <li><a href="https://www.rover.com/careers/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rover_130x130.png)">Rover.com</a></li>
- <li><a href="https://sentry.io/welcome/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/sentry130.png)">Sentry</a></li>
- <li><a href="https://getstream.io/try-the-api/?utm_source=drf&utm_medium=banner&utm_campaign=drf" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/stream-130.png)">Stream</a></li>
- <li><a href="https://machinalis.com/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/Machinalis130.png)">Machinalis</a></li>
- <li><a href="https://rollbar.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rollbar.png)">Rollbar</a></li>
- <li><a href="https://micropyramid.com/django-rest-framework-development-services/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/mp-text-logo.png)">MicroPyramid</a></li>
-</ul>
-<div style="clear: both; padding-bottom: 20px;"></div>
-
*Many thanks to all our [sponsors][sponsors], and in particular to our premium backers, [Rover](https://www.rover.com/careers/), [Sentry](https://sentry.io/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://machinalis.com/), [Rollbar](https://rollbar.com), and [MicroPyramid](https://micropyramid.com/django-rest-framework-development-services/).*
---
diff --git a/docs/community/3.7-announcement.md b/docs/community/3.7-announcement.md
index d1a39fa..61072ec 100644
--- a/docs/community/3.7-announcement.md
+++ b/docs/community/3.7-announcement.md
@@ -32,15 +32,6 @@ This release has been made possible by [Bayer](https://www.bayer.com/) who have
If you use REST framework commercially and would like to see this work continue, we strongly encourage you to invest in its continued development by
**[signing up for a paid plan][funding]**.
-<ul class="premium-promo promo">
- <li><a href="https://www.rover.com/careers/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rover_130x130.png)">Rover.com</a></li>
- <li><a href="https://sentry.io/welcome/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/sentry130.png)">Sentry</a></li>
- <li><a href="https://getstream.io/try-the-api/?utm_source=drf&utm_medium=banner&utm_campaign=drf" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/stream-130.png)">Stream</a></li>
- <li><a href="https://machinalis.com/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/Machinalis130.png)">Machinalis</a></li>
- <li><a href="https://rollbar.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rollbar.png)">Rollbar</a></li>
-</ul>
-<div style="clear: both; padding-bottom: 20px;"></div>
-
*As well as our release sponsor, we'd like to say thanks in particular our premium backers, [Rover](https://www.rover.com/careers/), [Sentry](https://sentry.io/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://machinalis.com/), and [Rollbar](https://rollbar.com).*
---
diff --git a/docs/community/3.9-announcement.md b/docs/community/3.9-announcement.md
index 6bc5e3c..e17933e 100644
--- a/docs/community/3.9-announcement.md
+++ b/docs/community/3.9-announcement.md
@@ -28,19 +28,6 @@ The 3.9 release gives access to _extra actions_ in the Browsable API, introduces
If you use REST framework commercially and would like to see this work continue, we strongly encourage you to invest in its continued development by
**[signing up for a paid plan][funding]**.
-
-<ul class="premium-promo promo">
- <li><a href="https://www.rover.com/careers/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rover_130x130.png)">Rover.com</a></li>
- <li><a href="https://sentry.io/welcome/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/sentry130.png)">Sentry</a></li>
- <li><a href="https://getstream.io/try-the-api/?utm_source=drf&utm_medium=banner&utm_campaign=drf" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/stream-130.png)">Stream</a></li>
- <li><a href="https://auklet.io" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/auklet-new.png)">Auklet</a></li>
- <li><a href="https://rollbar.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/rollbar2.png)">Rollbar</a></li>
- <li><a href="https://cadre.com" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/cadre.png)">Cadre</a></li>
- <li><a href="https://loadimpact.com/?utm_campaign=Sponsorship%20links&utm_source=drf&utm_medium=drf" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/load-impact.png)">Load Impact</a></li>
- <li><a href="https://hubs.ly/H0f30Lf0" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/kloudless.png)">Kloudless</a></li>
-</ul>
-<div style="clear: both; padding-bottom: 20px;"></div>
-
*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](https://www.rover.com/careers/), [Sentry](https://sentry.io/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Auklet](https://auklet.io/), [Rollbar](https://rollbar.com), [Cadre](https://cadre.com), [Load Impact](https://loadimpact.com/?utm_campaign=Sponsorship%20links&utm_source=drf&utm_medium=drf), and [Kloudless](https://hubs.ly/H0f30Lf0).*
---
@@ -118,7 +105,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)
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 7bca4ba..3d04d5e 100644
--- a/docs/community/funding.md
+++ b/docs/community/funding.md
@@ -163,43 +163,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 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.
---
@@ -211,117 +175,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/#individual-plan">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.
@@ -333,33 +187,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&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>.
---
## Frequently asked questions
@@ -383,6 +211,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 27e77ce..7a2be71 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&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 d590d2c..faef7fa 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -17,18 +17,6 @@
}
</style>
-<p class="badges" height=20px>
- <iframe src="https://ghbtns.com/github-btn.html?user=encode&repo=django-rest-framework&type=watch&count=true" class="github-star-button" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
-
- <a href="https://github.com/encode/django-rest-framework/actions/workflows/main.yml">
- <img src="https://github.com/encode/django-rest-framework/actions/workflows/main.yml/badge.svg" 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>
@@ -65,20 +53,6 @@ continued development by **[signing up for a paid plan][funding]**.
*Every single sign-up helps us make REST framework long-term financially sustainable.*
-<ul class="premium-promo promo">
- <li><a href="https://getsentry.com/welcome/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/sentry130.png)">Sentry</a></li>
- <li><a href="https://getstream.io/?utm_source=DjangoRESTFramework&utm_medium=Webpage_Logo_Ad&utm_content=Developer&utm_campaign=DjangoRESTFramework_Jan2022_HomePage" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/stream-130.png)">Stream</a></li>
- <li><a href="https://www.spacinov.com/" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/spacinov.png)">Spacinov</a></li>
- <li><a href="https://retool.com/?utm_source=djangorest&utm_medium=sponsorship" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/retool-sidebar.png)">Retool</a></li>
- <li><a href="https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/bitio_logo_gold_background.png)">bit.io</a></li>
- <li><a href="https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/135996800-d49fe024-32d9-441a-98d9-4c7596287a67.png)">PostHog</a></li>
- <li><a href="https://cryptapi.io" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/cryptapi.png)">CryptAPI</a></li>
- <li><a href="https://www.fezto.xyz/?utm_source=DjangoRESTFramework" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/fezto.png)">FEZTO</a></li>
- <li><a href="https://www.svix.com/?utm_source=django-REST&utm_medium=sponsorship" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/svix.png)">Svix</a></li>
- <li><a href="https://zuplo.link/django-web" style="background-image: url(https://fund-rest-framework.s3.amazonaws.com/zuplo.png)">Zuplo</a></li>
-</ul>
-<div style="clear: both; padding-bottom: 20px;"></div>
-
*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=DjangoRESTFramework&utm_medium=Webpage_Logo_Ad&utm_content=Developer&utm_campaign=DjangoRESTFramework_Jan2022_HomePage), [Spacinov](https://www.spacinov.com/), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [PostHog](https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [CryptAPI](https://cryptapi.io), [FEZTO](https://www.fezto.xyz/?utm_source=DjangoRESTFramework), [Svix](https://www.svix.com/?utm_source=django-REST&utm_medium=sponsorship), , and [Zuplo](https://zuplo.link/django-web).*
---
diff --git a/docs_theme/main.html b/docs_theme/main.html
index b4e8947..3afd58f 100644
--- a/docs_theme/main.html
+++ b/docs_theme/main.html
@@ -5,8 +5,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="utf-8">
<title>{% if page.title %}{{ page.title }} - {% endif %}{{ config.site_name }}</title>
- <link href="{{ 'img/favicon.ico'|url }}" rel="icon" type="image/x-icon">
- <link rel="canonical" href="{{ page.canonical_url|url }}" />
+ <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon">
+ <link rel="canonical" href="{{ base_url }}/{{ page.canonical_url|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,22 +17,6 @@
<link href="{{ 'css/bootstrap-responsive.css'|url }}" rel="stylesheet">
<link href="{{ 'css/default.css'|url }}" rel="stylesheet">
-
- <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;
@@ -134,11 +118,10 @@
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script async src="https://fund.django-rest-framework.org/sidebar_include.js"></script>
- <script src="{{ 'js/jquery-1.8.1-min.js'|url }}"></script>
- <script src="{{ 'js/prettify-1.0.js'|url }}"></script>
- <script src="{{ 'js/bootstrap-2.1.1-min.js'|url }}"></script>
- <script src="{{ 'js/theme.js'|url }}"></script>
+ <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="{{ base_url }}/js/theme.js"></script>
<script>var base_url = '{{ base_url }}';</script>
{% for path in config.extra_javascript %}
|
