From 6f834c9a9b88f5cf660a56d04f1680d0db256cce Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 15 Dec 2016 11:49:49 +0000 Subject: [PATCH] Update links to github.com/torchbox to point to github.com/wagtail --- CONTRIBUTING.md | 6 +++--- README.rst | 6 +++--- docs/advanced_topics/api/index.rst | 2 +- docs/contributing/committing.rst | 2 +- docs/contributing/developing.rst | 10 +++++----- docs/contributing/index.rst | 4 ++-- docs/contributing/issue_tracking.rst | 2 +- docs/contributing/python_guidelines.rst | 2 +- docs/getting_started/demo_site.rst | 2 +- docs/releases/0.7.rst | 4 ++-- docs/releases/1.0.rst | 2 +- docs/releases/1.1.rst | 2 +- docs/support.rst | 2 +- docs/topics/pages.rst | 2 +- package.json | 2 +- wagtail/wagtailadmin/tests/test_edit_handlers.py | 2 +- wagtail/wagtailcore/blocks/base.py | 2 +- wagtail/wagtailcore/tests/tests.py | 4 ++-- wagtail/wagtailsearch/backends/elasticsearch2.py | 2 +- .../wagtailsearch/tests/test_elasticsearch2_backend.py | 2 +- .../wagtailsearch/tests/test_elasticsearch5_backend.py | 2 +- .../wagtailsearch/tests/test_elasticsearch_backend.py | 2 +- wagtail/wagtailusers/tests.py | 2 +- 23 files changed, 34 insertions(+), 34 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56b6091e5..f00576545 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ documentation, translations or just feature requests. ## Using the issue tracker -The [issue tracker](https://github.com/torchbox/wagtail/issues) is +The [issue tracker](https://github.com/wagtail/wagtail/issues) is the preferred channel for [bug reports](#bugs), [features requests](#features) and [submitting pull requests](#pull-requests). Please don't use the issue tracker for support - use our [Wagtail support group](https://groups.google.com/forum/#!forum/wagtail). @@ -17,11 +17,11 @@ for support - use our [Wagtail support group](https://groups.google.com/forum/#! Please review the [contributing guidelines](http://docs.wagtail.io/en/latest/contributing/index.html). You might like to start by checking issues with the -[difficulty:Easy](https://github.com/torchbox/wagtail/labels/difficulty%3AEasy) label. +[difficulty:Easy](https://github.com/wagtail/wagtail/labels/difficulty%3AEasy) label. ## Code reviews -We welcome code reviews from everyone. There's always a list of pull requests tagged ['Needs review'](https://github.com/torchbox/wagtail/pulls?q=is%3Apr+is%3Aopen+label%3A%22Needs+review%22). +We welcome code reviews from everyone. There's always a list of pull requests tagged ['Needs review'](https://github.com/wagtail/wagtail/pulls?q=is%3Apr+is%3Aopen+label%3A%22Needs+review%22). ## Translations diff --git a/README.rst b/README.rst index 00fe6a042..81154f72a 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -.. image:: https://api.travis-ci.org/torchbox/wagtail.svg?branch=master - :target: https://travis-ci.org/torchbox/wagtail +.. image:: https://api.travis-ci.org/wagtail/wagtail.svg?branch=master + :target: https://travis-ci.org/wagtail/wagtail .. image:: https://img.shields.io/pypi/l/wagtail.svg :target: https://pypi.python.org/pypi/wagtail/ .. image:: https://img.shields.io/pypi/v/wagtail.svg @@ -76,6 +76,6 @@ Contributing ~~~~~~~~~~~~ If you're a Python or Django developer, fork the repo and get stuck in! We run a separate group for developers of Wagtail itself at https://groups.google.com/forum/#!forum/wagtail-developers (please note that this is not for support requests). -You might like to start by reviewing the `contributing guidelines `_ and checking issues with the `difficulty:Easy `_ label. +You might like to start by reviewing the `contributing guidelines `_ and checking issues with the `difficulty:Easy `_ label. We also welcome translations for Wagtail's interface. Translation work should be submitted through `Transifex `_. diff --git a/docs/advanced_topics/api/index.rst b/docs/advanced_topics/api/index.rst index ee7e57fec..8df5423d6 100644 --- a/docs/advanced_topics/api/index.rst +++ b/docs/advanced_topics/api/index.rst @@ -11,7 +11,7 @@ There are currently two versions of the API available: v1 and v2. Both versions are "stable" so it is recommended to use v2. V1 is only provided for backwards compatibility and will be removed from Wagtail soon. -See `RFC 8: Wagtail API `_ +See `RFC 8: Wagtail API `_ for full details on our stabilisation policy. Version 2 (recommended) diff --git a/docs/contributing/committing.rst b/docs/contributing/committing.rst index d00f452cb..1f8400ddd 100644 --- a/docs/contributing/committing.rst +++ b/docs/contributing/committing.rst @@ -22,7 +22,7 @@ Check out the code locally If the code has been submitted as a pull request, you should fetch the changes and check them out in your Wagtail repository. -A simple way to do this is by adding the following ``git`` alias to your ``~/.gitconfig`` (assuming ``upstream`` is ``torchbox/wagtail``): +A simple way to do this is by adding the following ``git`` alias to your ``~/.gitconfig`` (assuming ``upstream`` is ``wagtail/wagtail``): .. code-block:: text diff --git a/docs/contributing/developing.rst b/docs/contributing/developing.rst index fe8786e6d..b8eccdfdc 100644 --- a/docs/contributing/developing.rst +++ b/docs/contributing/developing.rst @@ -3,9 +3,9 @@ Development ----------- -Setting up a local copy of `the Wagtail git repository `_ is slightly more involved than running a release package of Wagtail, as it requires `Node.js `_ and NPM for building Javascript and CSS assets. (This is not required when running a release version, as the compiled assets are included in the release package.) +Setting up a local copy of `the Wagtail git repository `_ is slightly more involved than running a release package of Wagtail, as it requires `Node.js `_ and NPM for building Javascript and CSS assets. (This is not required when running a release version, as the compiled assets are included in the release package.) -If you're happy to develop on a virtual machine, the `vagrant-wagtail-develop `_ setup script is the fastest way to get up and running. This will provide you with a running instance of the `Wagtail demo site `_, with the Wagtail and wagtaildemo codebases available as shared folders for editing on your host machine. +If you're happy to develop on a virtual machine, the `vagrant-wagtail-develop `_ setup script is the fastest way to get up and running. This will provide you with a running instance of the `Wagtail demo site `_, with the Wagtail and wagtaildemo codebases available as shared folders for editing on your host machine. (Build scripts for other platforms would be very much welcomed - if you create one, please let us know via the `Wagtail Developers group `_!) @@ -17,11 +17,11 @@ Setting up the Wagtail codebase Install Node.js, v5.3.0 or higher. Instructions for installing Node.js can be found on the `Node.js download page `_. You will also need to install the **libjpeg** and **zlib** libraries, if you haven't done so already - see Pillow's `platform-specific installation instructions `_. -Clone a copy of `the Wagtail codebase `_: +Clone a copy of `the Wagtail codebase `_: .. code-block:: console - $ git clone https://github.com/torchbox/wagtail.git + $ git clone https://github.com/wagtail/wagtail.git $ cd wagtail With your preferred virtualenv activated, install the Wagtail package in development mode with the included testing and documentation dependencies: @@ -42,7 +42,7 @@ Compile the assets: $ npm run build -Any Wagtail sites you start up in this virtualenv will now run against this development instance of Wagtail. We recommend using the `Wagtail demo site `_ as a basis for developing Wagtail. +Any Wagtail sites you start up in this virtualenv will now run against this development instance of Wagtail. We recommend using the `Wagtail demo site `_ as a basis for developing Wagtail. .. _testing: diff --git a/docs/contributing/index.rst b/docs/contributing/index.rst index 507adf1a0..f8fa1a558 100644 --- a/docs/contributing/index.rst +++ b/docs/contributing/index.rst @@ -4,7 +4,7 @@ Contributing to Wagtail Issues ~~~~~~ -The easiest way to contribute to Wagtail is to tell us how to improve it! First, check to see if your bug or feature request has already been submitted at `github.com/torchbox/wagtail/issues `_. If it has, and you have some supporting information which may help us deal with it, comment on the existing issue. If not, please `create a new one `_, providing as much relevant context as possible. For example, if you're experiencing problems with installation, detail your environment and the steps you've already taken. If something isn't displaying correctly, tell us what browser you're using, and include a screenshot if possible. +The easiest way to contribute to Wagtail is to tell us how to improve it! First, check to see if your bug or feature request has already been submitted at `github.com/wagtail/wagtail/issues `_. If it has, and you have some supporting information which may help us deal with it, comment on the existing issue. If not, please `create a new one `_, providing as much relevant context as possible. For example, if you're experiencing problems with installation, detail your environment and the steps you've already taken. If something isn't displaying correctly, tell us what browser you're using, and include a screenshot if possible. .. toctree:: :maxdepth: 2 @@ -14,7 +14,7 @@ The easiest way to contribute to Wagtail is to tell us how to improve it! First, Pull requests ~~~~~~~~~~~~~ -If you're a Python or Django developer, `fork it `_ and read the :ref:`developing docs ` to get stuck in! We welcome all contributions, whether they solve problems which are specific to you or they address existing issues. If you're stuck for ideas, pick something from the `issue list `_, or email us directly on `hello@wagtail.io `_ if you'd like us to suggest something! +If you're a Python or Django developer, `fork it `_ and read the :ref:`developing docs ` to get stuck in! We welcome all contributions, whether they solve problems which are specific to you or they address existing issues. If you're stuck for ideas, pick something from the `issue list `_, or email us directly on `hello@wagtail.io `_ if you'd like us to suggest something! .. toctree:: :maxdepth: 2 diff --git a/docs/contributing/issue_tracking.rst b/docs/contributing/issue_tracking.rst index 43d4a05ea..a3df07789 100644 --- a/docs/contributing/issue_tracking.rst +++ b/docs/contributing/issue_tracking.rst @@ -1,7 +1,7 @@ Issue tracking ============== -We welcome bug reports, feature requests and pull requests through Wagtail's `Github issue tracker `_. +We welcome bug reports, feature requests and pull requests through Wagtail's `Github issue tracker `_. Issues ------ diff --git a/docs/contributing/python_guidelines.rst b/docs/contributing/python_guidelines.rst index 2b706be07..be19f878a 100644 --- a/docs/contributing/python_guidelines.rst +++ b/docs/contributing/python_guidelines.rst @@ -71,4 +71,4 @@ Tests Wagtail has a suite of tests, which we are committed to improving and expanding. See :ref:`testing`. -We run continuous integration at `travis-ci.org/torchbox/wagtail `_ to ensure that no commits or pull requests introduce test failures. If your contributions add functionality to Wagtail, please include the additional tests to cover it; if your contributions alter existing functionality, please update the relevant tests accordingly. +We run continuous integration at `travis-ci.org/wagtail/wagtail `_ to ensure that no commits or pull requests introduce test failures. If your contributions add functionality to Wagtail, please include the additional tests to cover it; if your contributions alter existing functionality, please update the relevant tests accordingly. diff --git a/docs/getting_started/demo_site.rst b/docs/getting_started/demo_site.rst index 8bb4f7c58..0c43416aa 100644 --- a/docs/getting_started/demo_site.rst +++ b/docs/getting_started/demo_site.rst @@ -5,4 +5,4 @@ Demo site To create a new site on Wagtail we recommend the ``wagtail start`` command in :doc:`index`, however a demo site exists containing example page types and models. We also recommend you use the demo site for testing during development of Wagtail itself. -The repo and installation instructions can be found here: `https://github.com/torchbox/wagtaildemo `_ +The repo and installation instructions can be found here: `https://github.com/wagtail/wagtaildemo `_ diff --git a/docs/releases/0.7.rst b/docs/releases/0.7.rst index 5ff924c31..c7930053a 100644 --- a/docs/releases/0.7.rst +++ b/docs/releases/0.7.rst @@ -100,5 +100,5 @@ Update to ``focal_point_key`` field on custom Rendition models The ``focal_point_key`` field on wagtailimages.Rendition has been changed to ``null=False``, to fix an issue with duplicate renditions being created. If you have defined a custom Rendition model in your project (by extending the ``wagtailimages.AbstractRendition`` class), you will need to apply a migration to make the corresponding change on your custom model. Unfortunately neither South nor Django 1.7's migration system are able to generate this automatically - you will need to customise the migration produced by ``./manage.py schemamigration`` / ``./manage.py makemigrations``, using the wagtailimages migration as a guide: - - https://github.com/torchbox/wagtail/blob/master/wagtail/wagtailimages/south_migrations/0004_auto__chg_field_rendition_focal_point_key.py (for South / Django 1.6) - - https://github.com/torchbox/wagtail/blob/master/wagtail/wagtailimages/migrations/0004_make_focal_point_key_not_nullable.py (for Django 1.7) + - https://github.com/wagtail/wagtail/blob/master/wagtail/wagtailimages/south_migrations/0004_auto__chg_field_rendition_focal_point_key.py (for South / Django 1.6) + - https://github.com/wagtail/wagtail/blob/master/wagtail/wagtailimages/migrations/0004_make_focal_point_key_not_nullable.py (for Django 1.7) diff --git a/docs/releases/1.0.rst b/docs/releases/1.0.rst index e78c54375..428e446d5 100644 --- a/docs/releases/1.0.rst +++ b/docs/releases/1.0.rst @@ -299,7 +299,7 @@ EditHandler internal API has changed While it is not an official Wagtail API, it has been possible for Wagtail site implementers to define their own ``EditHandler`` subclasses for use in panel definitions, to customise the behaviour of the page / snippet editing forms. If you have made use of this facility, you will need to update your custom EditHandlers, as this mechanism has been refactored (to allow EditHandler classes to keep a persistent reference to their corresponding model). If you have only used Wagtail's built-in panel types (``FieldPanel``, ``InlinePanel``, ``PageChooserPanel`` and so on), you are unaffected by this change. -Previously, functions like ``FieldPanel`` acted as 'factory' functions, where a call such as ``FieldPanel('title')`` constructed and returned an ``EditHandler`` subclass tailored to work on a 'title' field. These functions now return an object with a ``bind_to_model`` method instead; the EditHandler subclass can be obtained by calling this with the model class as a parameter. As a guide to updating your custom EditHandler code, you may wish to refer to `the relevant change to the Wagtail codebase `_. +Previously, functions like ``FieldPanel`` acted as 'factory' functions, where a call such as ``FieldPanel('title')`` constructed and returned an ``EditHandler`` subclass tailored to work on a 'title' field. These functions now return an object with a ``bind_to_model`` method instead; the EditHandler subclass can be obtained by calling this with the model class as a parameter. As a guide to updating your custom EditHandler code, you may wish to refer to `the relevant change to the Wagtail codebase `_. chooser_panel templates are obsolete ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/releases/1.1.rst b/docs/releases/1.1.rst index 19778efd4..ff4c4ae6f 100644 --- a/docs/releases/1.1.rst +++ b/docs/releases/1.1.rst @@ -29,7 +29,7 @@ The Elasticsearch search backend now accepts an experimental ``ATOMIC_REBUILD`` The :mod:`~wagtail.contrib.wagtailapi` module now uses Django REST Framework ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The ``wagtailapi`` module is now built on Django REST Framework and it now also has a `library of serialisers `_ that you can use in your own REST Framework based APIs. No user-facing changes have been made. +The ``wagtailapi`` module is now built on Django REST Framework and it now also has a `library of serialisers `_ that you can use in your own REST Framework based APIs. No user-facing changes have been made. We hope to support more REST framework features, such as a browsable API, in future releases. diff --git a/docs/support.rst b/docs/support.rst index 39b76769f..70b9854dc 100644 --- a/docs/support.rst +++ b/docs/support.rst @@ -9,7 +9,7 @@ If you have general questions about Wagtail, or you're looking for help on how t Issues ~~~~~~ -If you think you've found a bug in Wagtail, or you'd like to suggest a new feature, please check the current list at `github.com/torchbox/wagtail/issues `_. If your bug or suggestion isn't there, raise a new issue, providing as much relevant context as possible. +If you think you've found a bug in Wagtail, or you'd like to suggest a new feature, please check the current list at `github.com/wagtail/wagtail/issues `_. If your bug or suggestion isn't there, raise a new issue, providing as much relevant context as possible. Torchbox ~~~~~~~~ diff --git a/docs/topics/pages.rst b/docs/topics/pages.rst index 6f96ccb6b..5f6f5b210 100644 --- a/docs/topics/pages.rst +++ b/docs/topics/pages.rst @@ -88,7 +88,7 @@ This example represents a typical blog post: .. important:: - Ensure that none of your field names are the same as your class names. This will cause errors due to the way Django handles relations (`read more `_). In our examples we have avoided this by appending "Page" to each model name. + Ensure that none of your field names are the same as your class names. This will cause errors due to the way Django handles relations (`read more `_). In our examples we have avoided this by appending "Page" to each model name. Writing page models diff --git a/package.json b/package.json index 3f1fa118a..c4984225a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "wagtail", "version": "1.0.0", - "repository": "https://github.com/torchbox/wagtail", + "repository": "https://github.com/wagtail/wagtail", "private": true, "browser": {}, "browserify": { diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py index 6ea8c4bfa..4fc7cf660 100644 --- a/wagtail/wagtailadmin/tests/test_edit_handlers.py +++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py @@ -756,7 +756,7 @@ class TestInlinePanel(TestCase, WagtailTestUtils): """ Test that the USE_THOUSAND_SEPARATOR setting does not screw up the rendering of numbers (specifically maxForms=1000) in the JS initializer: - https://github.com/torchbox/wagtail/pull/2699 + https://github.com/wagtail/wagtail/pull/2699 """ SpeakerObjectList = ObjectList([ InlinePanel('speakers', label="Speakers", panels=[ diff --git a/wagtail/wagtailcore/blocks/base.py b/wagtail/wagtailcore/blocks/base.py index 3ed192a2c..a0774f042 100644 --- a/wagtail/wagtailcore/blocks/base.py +++ b/wagtail/wagtailcore/blocks/base.py @@ -481,7 +481,7 @@ class BlockWidget(forms.Widget): # Flag used by Django 1.10.1 (only) to indicate that this widget will not necessarily submit # a postdata item with a name that matches the field name - - # see https://github.com/django/django/pull/7068, https://github.com/torchbox/wagtail/issues/2994 + # see https://github.com/django/django/pull/7068, https://github.com/wagtail/wagtail/issues/2994 dont_use_model_field_default_for_empty_data = True def __init__(self, block_def, attrs=None): diff --git a/wagtail/wagtailcore/tests/tests.py b/wagtail/wagtailcore/tests/tests.py index 90902c205..fcbce0b09 100644 --- a/wagtail/wagtailcore/tests/tests.py +++ b/wagtail/wagtailcore/tests/tests.py @@ -91,7 +91,7 @@ class TestSiteRootPathsCache(TestCase): site and return None as their url. Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682 - Discussion: https://github.com/torchbox/wagtail/issues/7 + Discussion: https://github.com/wagtail/wagtail/issues/7 """ # Get homepage, root page and site root_page = Page.objects.get(id=1) @@ -129,7 +129,7 @@ class TestSiteRootPathsCache(TestCase): the site and return None as their url. Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682 - Discussion: https://github.com/torchbox/wagtail/issues/157 + Discussion: https://github.com/wagtail/wagtail/issues/157 """ # Get homepage homepage = Page.objects.get(url_path='/home/') diff --git a/wagtail/wagtailsearch/backends/elasticsearch2.py b/wagtail/wagtailsearch/backends/elasticsearch2.py index 761af0df1..cc5632137 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch2.py +++ b/wagtail/wagtailsearch/backends/elasticsearch2.py @@ -109,7 +109,7 @@ class Elasticsearch2Index(ElasticsearchIndex): # Put mapping self.es.indices.put_mapping( # pass update_all_types=True as a workaround to avoid "Can't redefine search field" errors - - # see https://github.com/torchbox/wagtail/issues/2968 + # see https://github.com/wagtail/wagtail/issues/2968 index=self.name, doc_type=mapping.get_document_type(), body=mapping.get_mapping(), update_all_types=True ) diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py index 86c732152..2d75fa1bb 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py +++ b/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py @@ -150,7 +150,7 @@ class TestElasticsearch2SearchBackend(BackendTests, TestCase): This tests that punctuation characters are treated the same way in both indexing and querying. - See: https://github.com/torchbox/wagtail/issues/937 + See: https://github.com/wagtail/wagtail/issues/937 """ # Reset the index self.reset_index() diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch5_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch5_backend.py index c3f12322b..923780707 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch5_backend.py +++ b/wagtail/wagtailsearch/tests/test_elasticsearch5_backend.py @@ -149,7 +149,7 @@ class TestElasticsearch5SearchBackend(BackendTests, TestCase): This tests that punctuation characters are treated the same way in both indexing and querying. - See: https://github.com/torchbox/wagtail/issues/937 + See: https://github.com/wagtail/wagtail/issues/937 """ # Reset the index self.reset_index() diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py index 42e0960dd..af738ea9c 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py +++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py @@ -149,7 +149,7 @@ class TestElasticsearchSearchBackend(BackendTests, TestCase): This tests that punctuation characters are treated the same way in both indexing and querying. - See: https://github.com/torchbox/wagtail/issues/937 + See: https://github.com/wagtail/wagtail/issues/937 """ # Reset the index self.reset_index() diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py index c20f39d56..42669e4f5 100644 --- a/wagtail/wagtailusers/tests.py +++ b/wagtail/wagtailusers/tests.py @@ -91,7 +91,7 @@ class TestUserIndexView(TestCase, WagtailTestUtils): self.assertContains(response, 'testuser') def test_allows_negative_ids(self): - # see https://github.com/torchbox/wagtail/issues/565 + # see https://github.com/wagtail/wagtail/issues/565 get_user_model().objects.create_user('guardian', 'guardian@example.com', 'gu@rd14n', pk=-1) response = self.get() self.assertEqual(response.status_code, 200)