Skip to content

Commit 3329017

Browse files
authored
Merge pull request #5060 from jpadilla/encode
Update links after moving to encode org
2 parents bbe0df2 + c1f3149 commit 3329017

35 files changed

+650
-650
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Getting involved in triaging incoming issues is a good way to start contributing
5050

5151
To start developing on Django REST framework, clone the repo:
5252

53-
git clone [email protected]:tomchristie/django-rest-framework.git
53+
git clone [email protected]:encode/django-rest-framework.git
5454

5555
Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you set up your editor to automatically indicate non-conforming styles.
5656

@@ -198,10 +198,10 @@ If you want to draw attention to a note or warning, use a pair of enclosing line
198198
[code-of-conduct]: https://www.djangoproject.com/conduct/
199199
[google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
200200
[so-filter]: http://stackexchange.com/filters/66475/rest-framework
201-
[issues]: https://github.com/tomchristie/django-rest-framework/issues?state=open
201+
[issues]: https://github.com/encode/django-rest-framework/issues?state=open
202202
[pep-8]: http://www.python.org/dev/peps/pep-0008/
203203
[pull-requests]: https://help.github.com/articles/using-pull-requests
204204
[tox]: https://tox.readthedocs.io/en/latest/
205205
[markdown]: http://daringfireball.net/projects/markdown/basics
206-
[docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs
206+
[docs]: https://github.com/encode/django-rest-framework/tree/master/docs
207207
[mou]: http://mouapp.com/

PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*Note*: Before submitting this pull request, please review our [contributing guidelines](https://github.com/tomchristie/django-rest-framework/blob/master/CONTRIBUTING.md#pull-requests).
1+
*Note*: Before submitting this pull request, please review our [contributing guidelines](https://github.com/encode/django-rest-framework/blob/master/CONTRIBUTING.md#pull-requests).
22

33
## Description
44

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ The initial aim is to provide a single full-time position on REST framework.
2121
*Every single sign-up makes a significant impact towards making that possible.*
2222

2323
<p align="center">
24-
<a href="http://jobs.rover.com/"><img src="https://raw.githubusercontent.com/tomchristie/django-rest-framework/master/docs/img/premium/rover-readme.png"/></a>
25-
<a href="https://getsentry.com/welcome/"><img src="https://raw.githubusercontent.com/tomchristie/django-rest-framework/master/docs/img/premium/sentry-readme.png"/></a>
26-
<a href="https://getstream.io/try-the-api/?utm_source=drf&utm_medium=banner&utm_campaign=drf"><img src="https://raw.githubusercontent.com/tomchristie/django-rest-framework/master/docs/img/premium/stream-readme.png"/></a>
27-
<a href="https://hello.machinalis.co.uk/"><img src="https://raw.githubusercontent.com/tomchristie/django-rest-framework/master/docs/img/premium/machinalis-readme.png"/></a>
28-
<a href="https://rollbar.com/"><img src="https://raw.githubusercontent.com/tomchristie/django-rest-framework/master/docs/img/premium/rollbar-readme.png"/></a>
29-
<a href="https://micropyramid.com/django-rest-framework-development-services/"><img src="https://raw.githubusercontent.com/tomchristie/django-rest-framework/master/docs/img/premium/micropyramid-readme.png"/></a>
24+
<a href="http://jobs.rover.com/"><img src="https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/rover-readme.png"/></a>
25+
<a href="https://getsentry.com/welcome/"><img src="https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/sentry-readme.png"/></a>
26+
<a href="https://getstream.io/try-the-api/?utm_source=drf&utm_medium=banner&utm_campaign=drf"><img src="https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/stream-readme.png"/></a>
27+
<a href="https://hello.machinalis.co.uk/"><img src="https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/machinalis-readme.png"/></a>
28+
<a href="https://rollbar.com/"><img src="https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/rollbar-readme.png"/></a>
29+
<a href="https://micropyramid.com/django-rest-framework-development-services/"><img src="https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/micropyramid-readme.png"/></a>
3030
</p>
3131

3232
*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), [Rollbar](https://rollbar.com), and [MicroPyramid](https://micropyramid.com/django-rest-framework-development-services/).*
@@ -176,10 +176,10 @@ If you believe you've found something in Django REST framework which has securit
176176

177177
Send a description of the issue via email to [[email protected]][security-mail]. The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.
178178

179-
[build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master
180-
[travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
181-
[coverage-status-image]: https://img.shields.io/codecov/c/github/tomchristie/django-rest-framework/master.svg
182-
[codecov]: http://codecov.io/github/tomchristie/django-rest-framework?branch=master
179+
[build-status-image]: https://secure.travis-ci.org/encode/django-rest-framework.svg?branch=master
180+
[travis]: http://travis-ci.org/encode/django-rest-framework?branch=master
181+
[coverage-status-image]: https://img.shields.io/codecov/c/github/encode/django-rest-framework/master.svg
182+
[codecov]: http://codecov.io/github/encode/django-rest-framework?branch=master
183183
[pypi-version]: https://img.shields.io/pypi/v/djangorestframework.svg
184184
[pypi]: https://pypi.python.org/pypi/djangorestframework
185185
[twitter]: https://twitter.com/_tomchristie

docs/index.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
</style>
1919

2020
<p class="badges" height=20px>
21-
<iframe src="http://ghbtns.com/github-btn.html?user=tomchristie&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>
21+
<iframe src="http://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>
2222

23-
<a href="http://travis-ci.org/tomchristie/django-rest-framework?branch=master">
24-
<img src="https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master" class="status-badge">
23+
<a href="http://travis-ci.org/encode/django-rest-framework?branch=master">
24+
<img src="https://secure.travis-ci.org/encode/django-rest-framework.svg?branch=master" class="status-badge">
2525
</a>
2626

2727
<a href="https://pypi.python.org/pypi/djangorestframework">
@@ -108,7 +108,7 @@ Install using `pip`, including any optional packages you want...
108108

109109
...or clone the project from github.
110110

111-
git clone [email protected]:tomchristie/django-rest-framework.git
111+
git clone [email protected]:encode/django-rest-framework.git
112112

113113
Add `'rest_framework'` to your `INSTALLED_APPS` setting.
114114

@@ -311,7 +311,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
311311
[django-filter]: http://pypi.python.org/pypi/django-filter
312312
[django-crispy-forms]: https://github.com/maraujop/django-crispy-forms
313313
[django-guardian]: https://github.com/lukaszb/django-guardian
314-
[0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X
314+
[0.4]: https://github.com/encode/django-rest-framework/tree/0.4.X
315315
[image]: img/quickstart.png
316316
[index]: .
317317
[oauth1-section]: api-guide/authentication/#django-rest-framework-oauth

docs/topics/2.2-announcement.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,5 +155,5 @@ From version 2.2 onwards, serializers with hyperlinked relationships *always* re
155155
[mailing-list]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
156156
[django-rest-framework-docs]: https://github.com/marcgibbons/django-rest-framework-docs
157157
[marcgibbons]: https://github.com/marcgibbons/
158-
[issues]: https://github.com/tomchristie/django-rest-framework/issues
159-
[564]: https://github.com/tomchristie/django-rest-framework/issues/564
158+
[issues]: https://github.com/encode/django-rest-framework/issues
159+
[564]: https://github.com/encode/django-rest-framework/issues/564

docs/topics/2.4-announcement.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,6 @@ Once again, many thanks to all the generous [backers and sponsors][kickstarter-s
167167
[view-name-and-description-settings]: ../api-guide/settings#view-names-and-descriptions
168168
[client-ip-identification]: ../api-guide/throttling#how-clients-are-identified
169169
[2-3-announcement]: 2.3-announcement
170-
[github-labels]: https://github.com/tomchristie/django-rest-framework/issues
171-
[github-milestones]: https://github.com/tomchristie/django-rest-framework/milestones
170+
[github-labels]: https://github.com/encode/django-rest-framework/issues
171+
[github-milestones]: https://github.com/encode/django-rest-framework/milestones
172172
[kickstarter-sponsors]: kickstarter-announcement#sponsors

docs/topics/3.0-announcement.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -957,9 +957,9 @@ The 3.1 release is planned to address improvements in the following components:
957957

958958
The 3.2 release is planned to introduce an alternative admin-style interface to the browsable API.
959959

960-
You can follow development on the GitHub site, where we use [milestones to indicate planning timescales](https://github.com/tomchristie/django-rest-framework/milestones).
960+
You can follow development on the GitHub site, where we use [milestones to indicate planning timescales](https://github.com/encode/django-rest-framework/milestones).
961961

962962
[kickstarter]: http://kickstarter.com/projects/tomchristie/django-rest-framework-3
963963
[sponsors]: http://www.django-rest-framework.org/topics/kickstarter-announcement/#sponsors
964-
[mixins.py]: https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/mixins.py
964+
[mixins.py]: https://github.com/encode/django-rest-framework/blob/master/rest_framework/mixins.py
965965
[django-localization]: https://docs.djangoproject.com/en/stable/topics/i18n/translation/#localization-how-to-create-language-files

docs/topics/3.2-announcement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This interface is intended to act as a more user-friendly interface to the API.
88

99
We've also fixed a huge number of issues, and made numerous cleanups and improvements.
1010

11-
Over the course of the 3.1.x series we've [resolved nearly 600 tickets](https://github.com/tomchristie/django-rest-framework/issues?utf8=%E2%9C%93&q=closed%3A%3E2015-03-05) on our GitHub issue tracker. This means we're currently running at a rate of **closing around 100 issues or pull requests per month**.
11+
Over the course of the 3.1.x series we've [resolved nearly 600 tickets](https://github.com/encode/django-rest-framework/issues?utf8=%E2%9C%93&q=closed%3A%3E2015-03-05) on our GitHub issue tracker. This means we're currently running at a rate of **closing around 100 issues or pull requests per month**.
1212

1313
None of this would have been possible without the support of our wonderful Kickstarter backers. If you're looking for a job in Django development we'd strongly recommend taking [a look through our sponsors](http://www.django-rest-framework.org/topics/kickstarter-announcement/#sponsors) and finding out who's hiring.
1414

docs/topics/3.3-announcement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ The following pagination view attributes and settings have been moved into attri
5353
The `ModelSerializer` and `HyperlinkedModelSerializer` classes should now include either a `fields` or `exclude` option, although the `fields = '__all__'` shortcut may be used. Failing to include either of these two options is currently pending deprecation, and will be removed entirely in the 3.5 release. This behavior brings `ModelSerializer` more closely in line with Django's `ModelForm` behavior.
5454

5555
[forms-api]: html-and-forms.md
56-
[ajax-form]: https://github.com/tomchristie/ajax-form
56+
[ajax-form]: https://github.com/encode/ajax-form
5757
[jsonfield]: ../../api-guide/fields#jsonfield
5858
[django-supported-versions]: https://www.djangoproject.com/download/#supported-versions

docs/topics/3.4-announcement.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ The full set of itemized release notes [are available here][release-notes].
188188
[tut-7]: ../../tutorial/7-schemas-and-client-libraries/
189189
[schema-generation]: ../../api-guide/schemas/
190190
[api-clients]: api-clients.md
191-
[milestone]: https://github.com/tomchristie/django-rest-framework/milestone/35
191+
[milestone]: https://github.com/encode/django-rest-framework/milestone/35
192192
[release-notes]: release-notes#34
193193
[metadata]: ../../api-guide/metadata/#custom-metadata-classes
194-
[gh3751]: https://github.com/tomchristie/django-rest-framework/issues/3751
194+
[gh3751]: https://github.com/encode/django-rest-framework/issues/3751

docs/topics/3.5-announcement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,6 @@ in version 3.3 and raised a deprecation warning in 3.4. Its usage is now mandato
261261
[schema-generation-api]: ../api-guide/schemas/#schemagenerator
262262
[schema-docs]: ../api-guide/schemas/#schemas-as-documentation
263263
[schema-view]: ../api-guide/schemas/#the-get_schema_view-shortcut
264-
[django-rest-raml]: https://github.com/tomchristie/django-rest-raml
264+
[django-rest-raml]: https://github.com/encode/django-rest-raml
265265
[raml-image]: ../img/raml.png
266266
[raml-codec]: https://github.com/core-api/python-raml-codec

docs/topics/browser-enhancements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ was later [dropped from the spec][html5]. There remains
8181
as well as how to support content types other than form-encoded data.
8282

8383
[cite]: http://www.amazon.com/Restful-Web-Services-Leonard-Richardson/dp/0596529260
84-
[ajax-form]: https://github.com/tomchristie/ajax-form
84+
[ajax-form]: https://github.com/encode/ajax-form
8585
[rails]: http://guides.rubyonrails.org/form_helpers.html#how-do-forms-with-put-or-delete-methods-work
8686
[html5]: http://www.w3.org/TR/html5-diff/#changes-2010-06-24
8787
[put_delete]: http://amundsen.com/examples/put-delete-forms/

docs/topics/contributing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Getting involved in triaging incoming issues is a good way to start contributing
5050

5151
To start developing on Django REST framework, clone the repo:
5252

53-
git clone [email protected]:tomchristie/django-rest-framework.git
53+
git clone [email protected]:encode/django-rest-framework.git
5454

5555
Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you set up your editor to automatically indicate non-conforming styles.
5656

@@ -202,11 +202,11 @@ If you want to draw attention to a note or warning, use a pair of enclosing line
202202
[code-of-conduct]: https://www.djangoproject.com/conduct/
203203
[google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
204204
[so-filter]: http://stackexchange.com/filters/66475/rest-framework
205-
[issues]: https://github.com/tomchristie/django-rest-framework/issues?state=open
205+
[issues]: https://github.com/encode/django-rest-framework/issues?state=open
206206
[pep-8]: http://www.python.org/dev/peps/pep-0008/
207207
[travis-status]: ../img/travis-status.png
208208
[pull-requests]: https://help.github.com/articles/using-pull-requests
209209
[tox]: https://tox.readthedocs.io/en/latest/
210210
[markdown]: http://daringfireball.net/projects/markdown/basics
211-
[docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs
211+
[docs]: https://github.com/encode/django-rest-framework/tree/master/docs
212212
[mou]: http://mouapp.com/

docs/topics/internationalization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ If you're translating a new language you'll need to translate the existing REST
8181

8282
4. Edit the `django.po` file you've just copied, translating all the error messages.
8383

84-
5. Run `manage.py compilemessages -l pt_BR` to make the translations
84+
5. Run `manage.py compilemessages -l pt_BR` to make the translations
8585
available for Django to use. You should see a message like `processing file django.po in <...>/locale/pt_BR/LC_MESSAGES`.
8686

8787
6. Restart your development server to see the changes take effect.
@@ -106,7 +106,7 @@ For API clients the most appropriate of these will typically be to use the `Acce
106106
[django-translation]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation
107107
[custom-exception-handler]: ../api-guide/exceptions.md#custom-exception-handling
108108
[transifex-project]: https://www.transifex.com/projects/p/django-rest-framework/
109-
[django-po-source]: https://raw.githubusercontent.com/tomchristie/django-rest-framework/master/rest_framework/locale/en_US/LC_MESSAGES/django.po
109+
[django-po-source]: https://raw.githubusercontent.com/encode/django-rest-framework/master/rest_framework/locale/en_US/LC_MESSAGES/django.po
110110
[django-language-preference]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation/#how-django-discovers-language-preference
111111
[django-locale-paths]: https://docs.djangoproject.com/en/1.7/ref/settings/#std:setting-LOCALE_PATHS
112112
[django-locale-name]: https://docs.djangoproject.com/en/1.7/topics/i18n/#term-locale-name

docs/topics/jobs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ Wonder how else you can help? One of the best ways you can help Django REST Fram
3535
[remoteok-io]: https://remoteok.io/remote-django-jobs
3636
[remotepython-com]: https://www.remotepython.com/jobs/
3737
[drf-funding]: https://fund.django-rest-framework.org/topics/funding/
38-
[submit-pr]: https://github.com/tomchristie/django-rest-framework
38+
[submit-pr]: https://github.com/encode/django-rest-framework
3939
[anna-email]: mailto:[email protected]

docs/topics/project-management.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ We have a quarterly maintenance cycle where new members may join the maintenance
1717

1818
#### Current team
1919

20-
The [maintenance team for Q4 2015](https://github.com/tomchristie/django-rest-framework/issues/2190):
20+
The [maintenance team for Q4 2015](https://github.com/encode/django-rest-framework/issues/2190):
2121

22-
* [@tomchristie](https://github.com/tomchristie/)
22+
* [@tomchristie](https://github.com/encode/)
2323
* [@xordoquy](https://github.com/xordoquy/) (Release manager.)
2424
* [@carltongibson](https://github.com/carltongibson/)
2525
* [@kevin-brown](https://github.com/kevin-brown/)
@@ -104,9 +104,9 @@ The following template should be used for the description of the issue, and serv
104104

105105
Checklist:
106106

107-
- [ ] Create pull request for [release notes](https://github.com/tomchristie/django-rest-framework/blob/master/docs/topics/release-notes.md) based on the [*.*.* milestone](https://github.com/tomchristie/django-rest-framework/milestones/***).
107+
- [ ] Create pull request for [release notes](https://github.com/encode/django-rest-framework/blob/master/docs/topics/release-notes.md) based on the [*.*.* milestone](https://github.com/encode/django-rest-framework/milestones/***).
108108
- [ ] Update the translations from [transifex](http://www.django-rest-framework.org/topics/project-management/#translations).
109-
- [ ] Ensure the pull request increments the version to `*.*.*` in [`restframework/__init__.py`](https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/__init__.py).
109+
- [ ] Ensure the pull request increments the version to `*.*.*` in [`restframework/__init__.py`](https://github.com/encode/django-rest-framework/blob/master/rest_framework/__init__.py).
110110
- [ ] Confirm with @tomchristie that release is finalized and ready to go.
111111
- [ ] Ensure that release date is included in pull request.
112112
- [ ] Merge the release pull request.
@@ -197,10 +197,10 @@ The following issues still need to be addressed:
197197
* Document ownership and management of the security mailing list.
198198

199199
[bus-factor]: http://en.wikipedia.org/wiki/Bus_factor
200-
[un-triaged]: https://github.com/tomchristie/django-rest-framework/issues?q=is%3Aopen+no%3Alabel
200+
[un-triaged]: https://github.com/encode/django-rest-framework/issues?q=is%3Aopen+no%3Alabel
201201
[transifex-project]: https://www.transifex.com/projects/p/django-rest-framework/
202202
[transifex-client]: https://pypi.python.org/pypi/transifex-client
203203
[translation-memory]: http://docs.transifex.com/guides/tm#let-tm-automatically-populate-translations
204-
[github-org]: https://github.com/tomchristie/django-rest-framework/issues/2162
204+
[github-org]: https://github.com/encode/django-rest-framework/issues/2162
205205
[sandbox]: http://restframework.herokuapp.com/
206206
[mailing-list]: https://groups.google.com/forum/#!forum/django-rest-framework

0 commit comments

Comments
 (0)