Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

docs: Update URLs to use https://zulip.com. 

We're migrating to using the cleaner zulip.com domain, which involves
changing all of our links from ReadTheDocs and other places to point
to the cleaner URL.
This commit is contained in:
Tim Abbott 2020-06-08 14:04:39 -07:00 committed by Tim Abbott
parent 04671f40ae
commit 71078adc50
74 changed files with 156 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@ -32,8 +32,8 @@ needs doing:
[desktop app](https://github.com/zulip/zulip-desktop). [desktop app](https://github.com/zulip/zulip-desktop).
* Building out our * Building out our
[Python API and bots](https://github.com/zulip/python-zulip-api) framework. [Python API and bots](https://github.com/zulip/python-zulip-api) framework.
* [Writing an integration](https://zulipchat.com/api/integrations-overview). * [Writing an integration](https://zulip.com/api/integrations-overview).
* Improving our [user](https://zulipchat.com/help/) or * Improving our [user](https://zulip.com/help/) or
[developer](https://zulip.readthedocs.io/en/latest/) documentation. [developer](https://zulip.readthedocs.io/en/latest/) documentation.
* [Reviewing code](https://zulip.readthedocs.io/en/latest/contributing/code-reviewing.html) * [Reviewing code](https://zulip.readthedocs.io/en/latest/contributing/code-reviewing.html)
and manually testing pull requests. and manually testing pull requests.

10
README.md
View File

@ -51,17 +51,17 @@ You might be interested in:
the the
[Zulip community server](https://zulip.readthedocs.io/en/latest/contributing/chat-zulip-org.html). We [Zulip community server](https://zulip.readthedocs.io/en/latest/contributing/chat-zulip-org.html). We
also recommend reading Zulip for also recommend reading Zulip for
[open source](https://zulipchat.com/for/open-source/), Zulip for [open source](https://zulip.com/for/open-source/), Zulip for
[companies](https://zulipchat.com/for/companies/), or Zulip for [companies](https://zulip.com/for/companies/), or Zulip for
[working groups and part time communities](https://zulipchat.com/for/working-groups-and-communities/). [working groups and part time communities](https://zulip.com/for/working-groups-and-communities/).
* **Running a Zulip server**. Use a preconfigured [Digital Ocean droplet](https://marketplace.digitalocean.com/apps/zulip), * **Running a Zulip server**. Use a preconfigured [Digital Ocean droplet](https://marketplace.digitalocean.com/apps/zulip),
[install Zulip](https://zulip.readthedocs.io/en/stable/production/install.html) [install Zulip](https://zulip.readthedocs.io/en/stable/production/install.html)
directly, or use Zulip's directly, or use Zulip's
experimental [Docker image](https://zulip.readthedocs.io/en/latest/production/deployment.html#zulip-in-docker). experimental [Docker image](https://zulip.readthedocs.io/en/latest/production/deployment.html#zulip-in-docker).
Commercial support is available; see <https://zulipchat.com/plans> for details. Commercial support is available; see <https://zulip.com/plans> for details.
* **Using Zulip without setting up a server**. <https://zulipchat.com> * **Using Zulip without setting up a server**. <https://zulip.com>
offers free and commercial hosting, including providing our paid offers free and commercial hosting, including providing our paid
plan for free to fellow open source projects. plan for free to fellow open source projects.

2
docs/THIRDPARTY
View File

@ -1,7 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Zulip Upstream-Name: Zulip
Upstream-Contact: Tim Abbott <tabbott@zulipchat.com> Upstream-Contact: Tim Abbott <tabbott@zulipchat.com>
Source: https://zulipchat.com/ Source: https://zulip.com/
Comment: Comment:
Unless otherwise noted, the Zulip software is distributed under the Apache Unless otherwise noted, the Zulip software is distributed under the Apache
License, Version 2.0. The software includes some works released by third License, Version 2.0. The software includes some works released by third

2
docs/contributing/chat-zulip-org.md
View File

@ -117,4 +117,4 @@ will search the full history of public streams in the organization for
`keyword` (including messages sent before you joined and on public `keyword` (including messages sent before you joined and on public
streams you're not subscribed to). streams you're not subscribed to).
[searching]: https://zulipchat.com/help/search-for-messages [searching]: https://zulip.com/help/search-for-messages

12
docs/contributing/gsod-ideas.md
View File

@ -6,14 +6,14 @@
## About us ## About us
[Zulip](https://zulipchat.com) is a powerful, open source team chat [Zulip](https://zulip.com) is a powerful, open source team chat
application. Zulip has a web app, a cross-platform mobile app for iOS application. Zulip has a web app, a cross-platform mobile app for iOS
and Android, a cross-platform desktop app, and over 100 native and Android, a cross-platform desktop app, and over 100 native
integrations, all open source. integrations, all open source.
Zulip has gained a considerable amount of traction since it was Zulip has gained a considerable amount of traction since it was
[released as open source software][oss-release] in late 2015, with [released as open source software][oss-release] in late 2015, with
code contributions from [over 500 people](https://zulipchat.com/team) code contributions from [over 500 people](https://zulip.com/team)
from all around the world. Thousands of people use Zulip every single from all around the world. Thousands of people use Zulip every single
day, and your work on Zulip will have impact on the daily experiences day, and your work on Zulip will have impact on the daily experiences
of a large and rapidly growing number of people. of a large and rapidly growing number of people.
@ -210,7 +210,7 @@ are clearly correct and that explain why they are correct.
**Project name**: REST API Documentation **Project name**: REST API Documentation
Fill in the gaps in Zulip's Fill in the gaps in Zulip's
[REST API documentation](https://zulipchat.com/api). Zulip has a [REST API documentation](https://zulip.com/api). Zulip has a
[nice framework](../documentation/api.md) for [nice framework](../documentation/api.md) for
writing API documentation built by a student last summer based on the writing API documentation built by a student last summer based on the
OpenAPI standard with built-in automated tests, but there are dozens of OpenAPI standard with built-in automated tests, but there are dozens of
@ -264,9 +264,9 @@ blog posts they've written in the past.
**Project name**: User documentation for non-web apps **Project name**: User documentation for non-web apps
We have a lot of nice We have a lot of nice
[user-facing documentation](https://zulipchat.com/help/) for how Zulip [user-facing documentation](https://zulip.com/help/) for how Zulip
works and how to accomplish useful tasks. An example article is how works and how to accomplish useful tasks. An example article is how
to [star a message](https://zulipchat.com/help/star-a-message). In to [star a message](https://zulip.com/help/star-a-message). In
most cases, our documentation explains how to accomplish a task in the most cases, our documentation explains how to accomplish a task in the
Zulip webapp, but doesn't cover how to do those tasks in Zulip's Zulip webapp, but doesn't cover how to do those tasks in Zulip's
mobile and beta terminal apps. mobile and beta terminal apps.
@ -274,7 +274,7 @@ mobile and beta terminal apps.
We have recently built a nice markdown-based system to make it easy to show We have recently built a nice markdown-based system to make it easy to show
information for multiple platforms in a single tabbed widget. An example information for multiple platforms in a single tabbed widget. An example
article using this widget is article using this widget is
[logging in](https://zulipchat.com/help/logging-in). This project will [logging in](https://zulip.com/help/logging-in). This project will
likely take advantage of that system to build out documentation for our likely take advantage of that system to build out documentation for our
other apps. other apps.

2
docs/development/using.md
View File

@ -92,7 +92,7 @@ the development environment][authentication-dev-server].
See the mobile project's documentation on [using a development server See the mobile project's documentation on [using a development server
for mobile development][mobile-dev-server]. for mobile development][mobile-dev-server].
[rest-api]: https://zulipchat.com/api/rest [rest-api]: https://zulip.com/api/rest
[authentication-dev-server]: ./authentication.md [authentication-dev-server]: ./authentication.md
[django-runserver]: https://docs.djangoproject.com/en/1.8/ref/django-admin/#runserver-port-or-address-port [django-runserver]: https://docs.djangoproject.com/en/1.8/ref/django-admin/#runserver-port-or-address-port
[new-feature-tutorial]: ../tutorials/new-feature-tutorial.md [new-feature-tutorial]: ../tutorials/new-feature-tutorial.md

4
docs/documentation/api.md
View File

@ -1,7 +1,7 @@
# Documenting REST API endpoints # Documenting REST API endpoints
This document explains the system for documenting [Zulip's REST This document explains the system for documenting [Zulip's REST
API](https://zulipchat.com/api/rest). This documentation is an API](https://zulip.com/api/rest). This documentation is an
essential resource both for users and the developers of Zulip's mobile essential resource both for users and the developers of Zulip's mobile
and terminal apps. We carefully designed a system for both displaying and terminal apps. We carefully designed a system for both displaying
it and helping ensure it stays up to date as Zulip's API changes. it and helping ensure it stays up to date as Zulip's API changes.
@ -35,7 +35,7 @@ want to also read the [Step by step guide](#step-by-step-guide).
To understand how this documentation system works, start by reading an To understand how this documentation system works, start by reading an
existing doc file (`templates/zerver/api/render-message.md` is a good existing doc file (`templates/zerver/api/render-message.md` is a good
example; accessible live example; accessible live
[here](https://zulipchat.com/api/render-message) or in the development [here](https://zulip.com/api/render-message) or in the development
environment at `http://localhost:9991/api/render-message`). environment at `http://localhost:9991/api/render-message`).
We highly recommend looking at those resources while reading this page. We highly recommend looking at those resources while reading this page.

12
docs/documentation/integrations.md
View File

@ -101,7 +101,7 @@ Here are a few common macros used to document Zulip's integrations:
[the docs for Zulip's GitHub integration][GitHub]. [the docs for Zulip's GitHub integration][GitHub].
* `{!download-python-bindings.md!}` macro - Links to Zulip's * `{!download-python-bindings.md!}` macro - Links to Zulip's
[API page](https://zulipchat.com/api/) to download and install Zulip's [API page](https://zulip.com/api/) to download and install Zulip's
API bindings. This macro is usually used in non-webhook integration docs under API bindings. This macro is usually used in non-webhook integration docs under
`templates/zerver/integrations/<integration_name>.md`. For an example `templates/zerver/integrations/<integration_name>.md`. For an example
rendering, see **Step 2** of rendering, see **Step 2** of
@ -134,11 +134,11 @@ Here are a few common macros used to document Zulip's integrations:
``` ```
For an example rendering, see For an example rendering, see
[Zulip's Beanstalk integration](https://zulipchat.com/integrations/doc/beanstalk). [Zulip's Beanstalk integration](https://zulip.com/integrations/doc/beanstalk).
[GitHub]: https://zulipchat.com/integrations/doc/github [GitHub]: https://zulip.com/integrations/doc/github
[codebase]: https://zulipchat.com/integrations/doc/codebase [codebase]: https://zulip.com/integrations/doc/codebase
[beanstalk]: https://zulipchat.com/integrations/doc/beanstalk [beanstalk]: https://zulip.com/integrations/doc/beanstalk
[1]: https://github.com/zulip/zulip/blob/708f3a4bb19c8e823c9ea1e577d360ac4229b199/zerver/lib/integrations.py#L78 [1]: https://github.com/zulip/zulip/blob/708f3a4bb19c8e823c9ea1e577d360ac4229b199/zerver/lib/integrations.py#L78
## Writing guidelines ## Writing guidelines
@ -146,7 +146,7 @@ Here are a few common macros used to document Zulip's integrations:
For the vast majority of integrations, you should just copy the docs for a For the vast majority of integrations, you should just copy the docs for a
similar integration and edit it. [Basecamp][basecamp] is a good one to copy. similar integration and edit it. [Basecamp][basecamp] is a good one to copy.
[basecamp]: https://zulipchat.com/integrations/doc/basecamp [basecamp]: https://zulip.com/integrations/doc/basecamp
### General writing guidelines ### General writing guidelines

2
docs/documentation/openapi.md
View File

@ -44,7 +44,7 @@ info:
title: Zulip REST API title: Zulip REST API
description: Powerful open source group chat. description: Powerful open source group chat.
contact: contact:
url: https://zulipchat.com url: https://zulip.com
license: license:
name: Apache 2.0 name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html url: https://www.apache.org/licenses/LICENSE-2.0.html

6
docs/documentation/overview.md
View File

@ -91,19 +91,19 @@ to do the things one does a lot in each type of documentation.
### General user documentation ### General user documentation
To learn more about Zulip's general user documentation, To learn more about Zulip's general user documentation,
[visit it on zulipchat.com](https://zulipchat.com/help/) or [visit it on zulip.com](https://zulip.com/help/) or
[read our guide on writing user documentation](user.md). [read our guide on writing user documentation](user.md).
### Integrations documentation ### Integrations documentation
To learn more about Zulip's integrations documentation, To learn more about Zulip's integrations documentation,
[visit it on zulipchat.com](https://zulipchat.com/integrations/) or [visit it on zulip.com](https://zulip.com/integrations/) or
[read our guide on writing user documentation](integrations.md). [read our guide on writing user documentation](integrations.md).
### API documentation ### API documentation
To learn more about Zulip's API documentation, To learn more about Zulip's API documentation,
[visit it on zulipchat.com](https://zulipchat.com/api/) or [visit it on zulip.com](https://zulip.com/api/) or
[read our tutorial on writing user documentation](../documentation/api.md). [read our tutorial on writing user documentation](../documentation/api.md).
## Automated testing ## Automated testing

4
docs/documentation/user.md
View File

@ -234,7 +234,7 @@ should be formatted as a continuation of a numbered step.
Our markdown processor supports easily creating a tab switcher widget Our markdown processor supports easily creating a tab switcher widget
design to easily show the instructions for different design to easily show the instructions for different
[platforms](https://zulipchat.com/help/logging-out) in user docs, [platforms](https://zulip.com/help/logging-out) in user docs,
languages in API docs, etc. To create a tab switcher, write: languages in API docs, etc. To create a tab switcher, write:
{start_tabs} {start_tabs}
@ -254,5 +254,5 @@ the tabs' labels are declared in
This widget can also be used just to create a nice box around a set of This widget can also be used just to create a nice box around a set of
instructions instructions
([example](https://zulipchat.com/help/deactivate-your-account)) by ([example](https://zulip.com/help/deactivate-your-account)) by
only declaring a single tab. only declaring a single tab.

4
docs/index.rst
View File

@ -8,11 +8,11 @@ Welcome to the Zulip documentation!
Welcome! Zulip's documentation is split into four parts: Welcome! Zulip's documentation is split into four parts:
- `User documentation <https://zulipchat.com/help>`__, for users and - `User documentation <https://zulip.com/help>`__, for users and
administrators of Zulip organizations. administrators of Zulip organizations.
- `Installation documentation <production/install.html>`__, for - `Installation documentation <production/install.html>`__, for
installing and maintaining a production self-hosted Zulip installation. installing and maintaining a production self-hosted Zulip installation.
- `API documentation <https://zulipchat.com/api/>`__, for writing - `API documentation <https://zulip.com/api/>`__, for writing
integrations or bots using the Zulip API. integrations or bots using the Zulip API.
- `Contributor documentation <overview/contributing.html>`__, for - `Contributor documentation <overview/contributing.html>`__, for
developing the Zulip software, translating, submitting bug reports, developing the Zulip software, translating, submitting bug reports,

8
docs/overview/architecture-overview.md
View File

@ -7,7 +7,7 @@ Key Codebases
The main Zulip codebase is at <https://github.com/zulip/zulip>. It The main Zulip codebase is at <https://github.com/zulip/zulip>. It
contains the Zulip backend (written in Python 3.x and Django), the contains the Zulip backend (written in Python 3.x and Django), the
webapp (written in JavaScript and TypeScript) and our library of webapp (written in JavaScript and TypeScript) and our library of
incoming webhook [integrations](https://zulipchat.com/integrations) incoming webhook [integrations](https://zulip.com/integrations)
with other services and applications (see [the directory structure with other services and applications (see [the directory structure
guide](../overview/directory-structure.md)). guide](../overview/directory-structure.md)).
@ -44,10 +44,10 @@ Zulip is a real-time team chat application meant to provide a great
experience for a wide range of organizations, from companies to experience for a wide range of organizations, from companies to
volunteer projects to groups of friends, ranging in size from a small volunteer projects to groups of friends, ranging in size from a small
team to 10,000s of users. It has [hundreds of team to 10,000s of users. It has [hundreds of
features](https://zulipchat.com/features) both larger and small, and features](https://zulip.com/features) both larger and small, and
supports dedicated apps for iOS, Android, Linux, Windows, and macOS, supports dedicated apps for iOS, Android, Linux, Windows, and macOS,
all modern web browsers, several cross-protocol chat clients, and all modern web browsers, several cross-protocol chat clients, and
numerous dedicated [Zulip API](https://zulipchat.com/api) clients numerous dedicated [Zulip API](https://zulip.com/api) clients
(e.g. bots). (e.g. bots).
A server can host multiple Zulip *realms* (organizations), each on its A server can host multiple Zulip *realms* (organizations), each on its
@ -59,7 +59,7 @@ administrators of an organization have a great deal of control over
who can register an account, what permissions new users have, etc. For who can register an account, what permissions new users have, etc. For
more on security considerations and options, see [the security model more on security considerations and options, see [the security model
section](../production/security-model.md) and the [Zulip Help section](../production/security-model.md) and the [Zulip Help
Center](https://zulipchat.com/help). Center](https://zulip.com/help).
Components Components
---------- ----------

4
docs/overview/changelog.md
View File

@ -192,7 +192,7 @@ server-level setting is enabled by default, and the organization-level
setting is disabled. As a result, organization administrators can setting is disabled. As a result, organization administrators can
configure this feature entirely in the UI. However, servers that had configure this feature entirely in the UI. However, servers that had
previously [enabled previews of linked previously [enabled previews of linked
websites](https://zulipchat.com/help/allow-image-link-previews) will websites](https://zulip.com/help/allow-image-link-previews) will
lose the setting and need to re-enable it. lose the setting and need to re-enable it.
- We rewrote the Google Authentication backend to use the - We rewrote the Google Authentication backend to use the
`python-social-auth` system we use for other third-party `python-social-auth` system we use for other third-party
@ -593,7 +593,7 @@ Zulip installations; it has minimal changes for existing servers.
- Users can now configure email and mobile push notifications for - Users can now configure email and mobile push notifications for
all messages in a stream (useful for low-traffic all messages in a stream (useful for low-traffic
streams/organizations), not just for messages mentioning them. streams/organizations), not just for messages mentioning them.
- New [stream settings](https://zulipchat.com/help/stream-permissions) - New [stream settings](https://zulip.com/help/stream-permissions)
control whether private stream subscribers can access history control whether private stream subscribers can access history
from before they joined, and allow configuring streams to only from before they joined, and allow configuring streams to only
allow administrators to post. allow administrators to post.

2
docs/overview/directory-structure.md
View File

@ -31,7 +31,7 @@ paths will be familiar to Django developers.
* `zerver/views/*.py` Most [Django views](https://docs.djangoproject.com/en/1.8/topics/http/views/). * `zerver/views/*.py` Most [Django views](https://docs.djangoproject.com/en/1.8/topics/http/views/).
* `zerver/webhooks/` Webhook views and tests for [Zulip's incoming webhook integrations]( * `zerver/webhooks/` Webhook views and tests for [Zulip's incoming webhook integrations](
https://zulipchat.com/api/incoming-webhooks-overview). https://zulip.com/api/incoming-webhooks-overview).
* `zerver/tornado/views.py` Tornado views. * `zerver/tornado/views.py` Tornado views.

6
docs/overview/gsoc-ideas.md
View File

@ -6,14 +6,14 @@
## About us ## About us
[Zulip](https://zulipchat.com) is a powerful, open source team chat [Zulip](https://zulip.com) is a powerful, open source team chat
application. Zulip has a web app, a cross-platform mobile app for iOS application. Zulip has a web app, a cross-platform mobile app for iOS
and Android, a cross-platform desktop app, and over 100 native and Android, a cross-platform desktop app, and over 100 native
integrations, all open source. integrations, all open source.
Zulip has gained a considerable amount of traction since it was Zulip has gained a considerable amount of traction since it was
[released as open source software][oss-release] in late 2015, with [released as open source software][oss-release] in late 2015, with
code contributions from [over 500 people](https://zulipchat.com/team) code contributions from [over 500 people](https://zulip.com/team)
from all around the world. Thousands of people use Zulip every single from all around the world. Thousands of people use Zulip every single
day, and your work on Zulip will have impact on the daily experiences day, and your work on Zulip will have impact on the daily experiences
of a large and rapidly growing number of people. of a large and rapidly growing number of people.
@ -264,7 +264,7 @@ CSS](https://github.com/zulip/zulip/).
Expert: Eeshan Garg. Expert: Eeshan Garg.
- Fill in the gaps in Zulip's [REST API - Fill in the gaps in Zulip's [REST API
documentation](https://zulipchat.com/api), which is an important documentation](https://zulip.com/api), which is an important
resource for any organization integrating with Zulip. Zulip has a resource for any organization integrating with Zulip. Zulip has a
[nice framework](../documentation/api.md) for writing API [nice framework](../documentation/api.md) for writing API
documentation built by past GSoC students based on the OpenAPI documentation built by past GSoC students based on the OpenAPI

8
docs/production/authentication-methods.md
View File

@ -269,7 +269,7 @@ Zulip by entering your email address and LDAP password on the Zulip
login form. login form.
You may also want to configure Zulip's settings for [inviting new You may also want to configure Zulip's settings for [inviting new
users](https://zulipchat.com/help/invite-new-users). If LDAP is the users](https://zulip.com/help/invite-new-users). If LDAP is the
only enabled authentication method, the main use case for Zulip's only enabled authentication method, the main use case for Zulip's
invitation feature is selecting the initial streams for invited users invitation feature is selecting the initial streams for invited users
(invited users will still need to use their LDAP password to create an (invited users will still need to use their LDAP password to create an
@ -307,7 +307,7 @@ When using this feature, you may also want to
since any such changes would be automatically overwritten on the sync since any such changes would be automatically overwritten on the sync
run of `manage.py sync_ldap_user_data`. run of `manage.py sync_ldap_user_data`.
[restrict-name-changes]: https://zulipchat.com/help/restrict-name-and-email-changes [restrict-name-changes]: https://zulip.com/help/restrict-name-and-email-changes
#### Synchronizing avatars #### Synchronizing avatars
@ -329,7 +329,7 @@ corresponding LDAP attribute is `linkedinProfile` then you just need
to add `'custom_profile_field__linkedin_profile': 'linkedinProfile'` to add `'custom_profile_field__linkedin_profile': 'linkedinProfile'`
to the `AUTH_LDAP_USER_ATTR_MAP`. to the `AUTH_LDAP_USER_ATTR_MAP`.
[custom-profile-fields]: https://zulipchat.com/help/add-custom-profile-fields [custom-profile-fields]: https://zulip.com/help/add-custom-profile-fields
#### Automatically deactivating users with Active Directory #### Automatically deactivating users with Active Directory
@ -380,7 +380,7 @@ Other fields you may want to sync from LDAP include:
* String fields like `default_language` (e.g. `en`) or `timezone`, if * String fields like `default_language` (e.g. `en`) or `timezone`, if
you have that data in the right format in your LDAP database. you have that data in the right format in your LDAP database.
* [Coming soon][custom-profile-fields-ldap]: Support for syncing * [Coming soon][custom-profile-fields-ldap]: Support for syncing
[custom profile fields](https://zulipchat.com/help/add-custom-profile-fields) [custom profile fields](https://zulip.com/help/add-custom-profile-fields)
from your LDAP database. from your LDAP database.
You can look at the [full list of fields][models-py] in the Zulip user You can look at the [full list of fields][models-py] in the Zulip user

2
docs/production/email-gateway.md
View File

@ -9,7 +9,7 @@ because it enables:
into Zulip. into Zulip.
* Integrating third-party services that can send email notifications * Integrating third-party services that can send email notifications
into Zulip. See the [integration into Zulip. See the [integration
documentation](https://zulipchat.com/integrations/doc/email) for documentation](https://zulip.com/integrations/doc/email) for
details. details.
Once this integration is configured, each stream will have a special Once this integration is configured, each stream will have a special

2
docs/production/export-and-import.md
View File

@ -31,7 +31,7 @@ service (or back):
JSON files–a format shared by our [data JSON files–a format shared by our [data
import](#import-into-a-new-zulip-server) tools for third-party import](#import-into-a-new-zulip-server) tools for third-party
services like services like
[Slack](https://zulipchat.com/help/import-from-slack). [Slack](https://zulip.com/help/import-from-slack).
Like the backup tool, logical data exports must be imported on a Like the backup tool, logical data exports must be imported on a
Zulip server running the same version. However, logical data Zulip server running the same version. However, logical data

3
docs/production/install-existing-server.md
View File

@ -18,7 +18,8 @@ existing services if (when) your server goes down.
These instructions are only for experts. If you're not an experienced These instructions are only for experts. If you're not an experienced
Linux sysadmin, you will have a much better experience if you get a Linux sysadmin, you will have a much better experience if you get a
dedicated VM to install Zulip on instead (or [use zulipchat.com](https://zulipchat.com). dedicated VM to install Zulip on instead (or [use
zulip.com](https://zulip.com).
### Nginx ### Nginx

8
docs/production/install.md
View File

@ -10,7 +10,7 @@ Zulip's
Note that if you're developing for Zulip, you should install Zulip's Note that if you're developing for Zulip, you should install Zulip's
[development environment](../development/overview.md) instead. If [development environment](../development/overview.md) instead. If
you're just looking to play around with Zulip and see what it looks like, you're just looking to play around with Zulip and see what it looks like,
you can create a test organization at <https://zulipchat.com/new>. you can create a test organization at <https://zulip.com/new>.
## Step 1: Download the latest release ## Step 1: Download the latest release
@ -78,8 +78,8 @@ backup][zulip-backups] or importing your data from [HipChat][hipchat-import],
[Slack][slack-import], or another Zulip server, you should stop here [Slack][slack-import], or another Zulip server, you should stop here
and return to the import instructions. and return to the import instructions.
[hipchat-import]: https://zulipchat.com/help/import-from-hipchat [hipchat-import]: https://zulip.com/help/import-from-hipchat
[slack-import]: https://zulipchat.com/help/import-from-slack [slack-import]: https://zulip.com/help/import-from-slack
[zulip-backups]: ../production/export-and-import.html#backups [zulip-backups]: ../production/export-and-import.html#backups
Otherwise, open the link in a browser. Follow the prompts to set up Otherwise, open the link in a browser. Follow the prompts to set up
@ -114,7 +114,7 @@ important announcements, including new releases and security issues. You can als
and [upgrading](../production/upgrade-or-modify.md) a production Zulip and [upgrading](../production/upgrade-or-modify.md) a production Zulip
server. server.
[realm-admin-docs]: https://zulipchat.com/help/getting-your-organization-started-with-zulip [realm-admin-docs]: https://zulip.com/help/getting-your-organization-started-with-zulip
```eval_rst ```eval_rst
.. _installer-details: .. _installer-details:

2
docs/production/management-commands.md
View File

@ -119,7 +119,7 @@ There are dozens of useful management commands under
* `./manage.py change_user_email`: Change a user's email address. * `./manage.py change_user_email`: Change a user's email address.
* `./manage.py knight`: Can toggle whether a user is an administrator * `./manage.py knight`: Can toggle whether a user is an administrator
(easier done [via the (easier done [via the
UI](https://zulipchat.com/help/change-a-users-role)) or create an UI](https://zulip.com/help/change-a-users-role)) or create an
API super user bot (with `--permission=api_super_user`), which are API super user bot (with `--permission=api_super_user`), which are
needed for some content mirroring integrations. needed for some content mirroring integrations.
* `./manage.py export_single_user` does a limited version of the [main * `./manage.py export_single_user` does a limited version of the [main

4
docs/production/mobile-push-notifications.md
View File

@ -61,7 +61,7 @@ Zulip only sends push notifications for private messages sent by other
users and messages mentioning you). A push notification should appear users and messages mentioning you). A push notification should appear
in the Android notification area. in the Android notification area.
[mobile-notifications-always]: https://zulipchat.com/help/test-mobile-notifications [mobile-notifications-always]: https://zulip.com/help/test-mobile-notifications
## Updating your server's registration ## Updating your server's registration
@ -96,7 +96,7 @@ forwarding service).
## Security and privacy ## Security and privacy
Use of the push notification bouncer is subject to the Use of the push notification bouncer is subject to the
[Zulipchat Terms of Service](https://zulipchat.com/terms/). By using [Zulipchat Terms of Service](https://zulip.com/terms/). By using
push notifications, you agree to those terms. push notifications, you agree to those terms.
We've designed this push notification bouncer service with security We've designed this push notification bouncer service with security

6
docs/production/multiple-organizations.md
View File

@ -46,9 +46,9 @@ things:
[the notes on `SOCIAL_AUTH_SUBDOMAIN` below](#authentication). [the notes on `SOCIAL_AUTH_SUBDOMAIN` below](#authentication).
For servers hosting a large number of organizations, like For servers hosting a large number of organizations, like
[zulipchat.com](https://zulipchat.com), one can set [zulip.com](https://zulip.com), one can set `ROOT_DOMAIN_LANDING_PAGE
`ROOT_DOMAIN_LANDING_PAGE = True` in `/etc/zulip/settings.py` so that = True` in `/etc/zulip/settings.py` so that the homepage for the
the homepage for the server is a copy of the Zulip homepage. server is a copy of the Zulip homepage.
### SSL Certificates ### SSL Certificates

2
docs/production/requirements.md
View File

@ -81,7 +81,7 @@ on hardware requirements for larger organizations.
* Outgoing HTTP(S) access (ports 80 and 443) to the public Internet so * Outgoing HTTP(S) access (ports 80 and 443) to the public Internet so
that Zulip can properly manage image previews and embeds. Outgoing that Zulip can properly manage image previews and embeds. Outgoing
Internet access is not required if you [disable those Internet access is not required if you [disable those
features](https://zulipchat.com/help/allow-image-link-previews). features](https://zulip.com/help/allow-image-link-previews).
* Outgoing SMTP access (usually port 587) to your [SMTP * Outgoing SMTP access (usually port 587) to your [SMTP
server](../production/email.md) so that Zulip can send emails. server](../production/email.md) so that Zulip can send emails.
* A domain name (e.g. `zulip.example.com`) that your users will use to * A domain name (e.g. `zulip.example.com`) that your users will use to

8
docs/production/security-model.md
View File

@ -113,7 +113,7 @@ strength allowed is controlled by two settings in
figure out whether a stream with that name exists, but cannot see any figure out whether a stream with that name exists, but cannot see any
other details about the stream. other details about the stream.
* See [Stream permissions](https://zulipchat.com/help/stream-permissions) for more details. * See [Stream permissions](https://zulip.com/help/stream-permissions) for more details.
* Zulip supports editing the content and topics of messages that have * Zulip supports editing the content and topics of messages that have
already been sent. As a general philosophy, our policies provide already been sent. As a general philosophy, our policies provide
@ -128,7 +128,7 @@ strength allowed is controlled by two settings in
any time by that administrator. any time by that administrator.
* See * See
[Configuring message editing and deletion](https://zulipchat.com/help/configure-message-editing-and-deletion) [Configuring message editing and deletion](https://zulip.com/help/configure-message-editing-and-deletion)
for more details. for more details.
## Users and Bots ## Users and Bots
@ -146,7 +146,7 @@ strength allowed is controlled by two settings in
exceptions: exceptions:
* Administrators may get access to private messages via some types of * Administrators may get access to private messages via some types of
[data export](https://zulipchat.com/help/export-your-organization). [data export](https://zulip.com/help/export-your-organization).
* Administrators can change the ownership of a bot. If a bot is subscribed * Administrators can change the ownership of a bot. If a bot is subscribed
to a private stream, then an administrator can indirectly get access to to a private stream, then an administrator can indirectly get access to
@ -164,7 +164,7 @@ strength allowed is controlled by two settings in
SSO system, since neither of those prevents authenticating with the SSO system, since neither of those prevents authenticating with the
user's API key or those of bots the user has created. Instead, you user's API key or those of bots the user has created. Instead, you
should should
[deactivate the user's account](https://zulipchat.com/help/deactivate-or-reactivate-a-user) [deactivate the user's account](https://zulip.com/help/deactivate-or-reactivate-a-user)
via Zulip's "Organization settings" interface. via Zulip's "Organization settings" interface.
* The Zulip mobile apps authenticate to the server by sending the * The Zulip mobile apps authenticate to the server by sending the

2
docs/production/settings.md
View File

@ -9,7 +9,7 @@ Most configuration can be done by a realm administrator, on the web.
For those settings, see [the documentation for realm For those settings, see [the documentation for realm
administrators][realm-admin-docs]. administrators][realm-admin-docs].
[realm-admin-docs]: https://zulipchat.com/help/getting-your-organization-started-with-zulip [realm-admin-docs]: https://zulip.com/help/getting-your-organization-started-with-zulip
This page discusses additional configuration that a system This page discusses additional configuration that a system
administrator can do. To change any of the following settings, edit administrator can do. To change any of the following settings, edit

2
docs/production/ssl-certificates.md
View File

@ -138,7 +138,7 @@ running the following as `root`:
service nginx reload service nginx reload
``` ```
[desktop-certs]: https://zulipchat.com/help/custom-certificates [desktop-certs]: https://zulip.com/help/custom-certificates
## Troubleshooting ## Troubleshooting

4
docs/production/upgrade-or-modify.md
View File

@ -129,7 +129,7 @@ help](https://chat.zulip.org/#narrow/stream/31-production-help) in the
server](../contributing/chat-zulip-org.md) for best-effort help. server](../contributing/chat-zulip-org.md) for best-effort help.
Please include the relevant error output from the above logs in a Please include the relevant error output from the above logs in a
[markdown code [markdown code
block](https://zulipchat.com/help/format-your-message-using-markdown#code) block](https://zulip.com/help/format-your-message-using-markdown#code)
in any reports. in any reports.
### Rolling back to a prior version ### Rolling back to a prior version
@ -327,7 +327,7 @@ that fact:
* Ideally, you'd reproduce the issue in an unmodified version (e.g. on * Ideally, you'd reproduce the issue in an unmodified version (e.g. on
[chat.zulip.org](../contributing/chat-zulip-org.md) or [chat.zulip.org](../contributing/chat-zulip-org.md) or
[zulipchat.com](https://zulipchat.com)). [zulip.com](https://zulip.com)).
* Where that is difficult or you think it's very unlikely your changes * Where that is difficult or you think it's very unlikely your changes
are related to the issue, just mention your changes in the issue report. are related to the issue, just mention your changes in the issue report.

2
docs/production/zoom-configuration.md
View File

@ -32,5 +32,5 @@ to be your app's "Client Secret".
This enables Zoom support in your Zulip server. Finally, [configure This enables Zoom support in your Zulip server. Finally, [configure
Zoom as the video call Zoom as the video call
provider](https://zulipchat.com/help/start-a-call) in the Zulip provider](https://zulip.com/help/start-a-call) in the Zulip
organization(s) where you want to use it. organization(s) where you want to use it.

2
docs/subsystems/client.md
View File

@ -35,4 +35,4 @@ object as `request.client`.
In most integrations, `request.client` is then passed to In most integrations, `request.client` is then passed to
`check_send_stream_message`, where it is used to keep track of which client `check_send_stream_message`, where it is used to keep track of which client
sent the message (which in turn is used by analytics). For more sent the message (which in turn is used by analytics). For more
information, see [the incoming webhook walkthrough](https://zulipchat.com/api/incoming-webhooks-walkthrough). information, see [the incoming webhook walkthrough](https://zulip.com/api/incoming-webhooks-walkthrough).

2
docs/subsystems/custom-apps.md
View File

@ -177,7 +177,7 @@ you basically have to solve these problems:
Zulip actually supports a bunch of integrations out-of-the-box that Zulip actually supports a bunch of integrations out-of-the-box that
perform as **World Readers**. perform as **World Readers**.
The [three different integration models](https://zulipchat.com/api/integrations-overview#sending-content-into-zulip) The [three different integration models](https://zulip.com/api/integrations-overview#sending-content-into-zulip)
basically differ in where they perform the main functions of a basically differ in where they perform the main functions of a
**World Reader**. **World Reader**.

2
docs/subsystems/email.md
View File

@ -6,7 +6,7 @@ guide to [sending outgoing email](../production/email.md). If you're trying to
configure an email integration to receive incoming email (e.g. so that users configure an email integration to receive incoming email (e.g. so that users
can reply to missed message emails via email), you might be interested in can reply to missed message emails via email), you might be interested in
our instructions for our instructions for
[setting up an email integration](https://zulipchat.com/integrations/doc/email). [setting up an email integration](https://zulip.com/integrations/doc/email).
On to the documentation. Zulip's email system is fairly straightforward, On to the documentation. Zulip's email system is fairly straightforward,
with only a few things you need to know to get started. with only a few things you need to know to get started.

4
docs/subsystems/markdown.md
View File

@ -131,8 +131,8 @@ Important considerations for any changes are:
Zulip's markdown processor's rendering supports a number of features Zulip's markdown processor's rendering supports a number of features
that depend on realm-specific or user-specific data. For example, the that depend on realm-specific or user-specific data. For example, the
realm could have realm could have
[Linkifiers](https://zulipchat.com/help/add-a-custom-linkification-filter) [Linkifiers](https://zulip.com/help/add-a-custom-linkification-filter)
or [Custom emoji](https://zulipchat.com/help/add-custom-emoji) or [Custom emoji](https://zulip.com/help/add-custom-emoji)
configured, and Zulip supports mentions for streams, users, and user configured, and Zulip supports mentions for streams, users, and user
groups (which depend on data like users' names, IDs, etc.). groups (which depend on data like users' names, IDs, etc.).

4
docs/subsystems/sending-messages.md
View File

@ -67,7 +67,7 @@ number of purposes:
messages. E.g. determining whether to send the messages. E.g. determining whether to send the
plaintext/markdown raw content or the rendered HTML (e.g. the plaintext/markdown raw content or the rendered HTML (e.g. the
`apply_markdown` and `client_gravatar` features in our `apply_markdown` and `client_gravatar` features in our
[events API docs](https://zulipchat.com/api/register-queue)). [events API docs](https://zulip.com/api/register-queue)).
* Following our standard naming convention, input validation is done * Following our standard naming convention, input validation is done
inside the `check_message` function, which is responsible for inside the `check_message` function, which is responsible for
validating the user can send to the recipient, validating the user can send to the recipient,
@ -92,7 +92,7 @@ number of purposes:
step adds a lot of complexity, because the events system cannot step adds a lot of complexity, because the events system cannot
make queries to the database directly. make queries to the database directly.
* Trigger any other deferred work caused by the current message, * Trigger any other deferred work caused by the current message,
e.g. [outgoing webhooks](https://zulipchat.com/api/outgoing-webhooks) e.g. [outgoing webhooks](https://zulip.com/api/outgoing-webhooks)
or embedded bots. or embedded bots.
* Every query is designed to be a bulk query; we carefully * Every query is designed to be a bulk query; we carefully
unit-test this system for how many database and memcached queries unit-test this system for how many database and memcached queries

2
docs/translating/translating.md
View File

@ -87,7 +87,7 @@ There are a few ways to see your translations in the Zulip UI:
`http://localhost:9991/de/login/`. This works for any part of the `http://localhost:9991/de/login/`. This works for any part of the
Zulip UI, including portico (logged-out) pages. Zulip UI, including portico (logged-out) pages.
* For Zulip's logged-in UI (i.e. the actual webapp), you can [pick the * For Zulip's logged-in UI (i.e. the actual webapp), you can [pick the
language](https://zulipchat.com/help/change-your-language) in the language](https://zulip.com/help/change-your-language) in the
Zulip UI. Zulip UI.
* If your system has languages configured in your OS/browser, Zulip's * If your system has languages configured in your OS/browser, Zulip's
portico (logged-out) pages will automatically use your configured portico (logged-out) pages will automatically use your configured

4
docs/tutorials/life-of-a-request.md
View File

@ -78,9 +78,9 @@ we can see something called `i18n_urls`. These urls show up in the
address bar of the browser, and serve HTML. address bar of the browser, and serve HTML.
For example, the `/features` page (preview For example, the `/features` page (preview
[here](https://zulipchat.com/features/)) gets translated in Chinese at [here](https://zulip.com/features/)) gets translated in Chinese at
`zh-hans/features/` (preview `zh-hans/features/` (preview
[here](https://zulipchat.com/zh-hans/features/)). [here](https://zulip.com/zh-hans/features/)).
Note the `zh-hans` prefix--that url pattern gets added by `i18n_patterns`. Note the `zh-hans` prefix--that url pattern gets added by `i18n_patterns`.

2
docs/tutorials/writing-views.md
View File

@ -20,7 +20,7 @@ A view in Zulip is everything that helps implement a server endpoint.
Every path that the Zulip server supports (doesn't show a 404 page Every path that the Zulip server supports (doesn't show a 404 page
for) is a view. The obvious ones are those you can visit in your for) is a view. The obvious ones are those you can visit in your
browser, for example browser, for example
[/integrations](https://zulipchat.com/integrations/), which shows the [/integrations](https://zulip.com/integrations/), which shows the
integration documentation. These paths show up in the address bar of integration documentation. These paths show up in the address bar of
the browser. There are other views that are only seen by software, the browser. There are other views that are only seen by software,
namely the API views. They are used to build the various clients that namely the API views. They are used to build the various clients that

2
puppet/zulip/files/nginx/sites-available/zulip-org
View File

@ -17,7 +17,7 @@ server {
} }
location / { location / {
rewrite ^/ https://zulipchat.com permanent; rewrite ^/ https://zulip.com permanent;
} }
} }

2
static/html/5xx.html
View File

@ -17,7 +17,7 @@
<div class="header-main" id="top_navbar"> <div class="header-main" id="top_navbar">
<div class="float-left"> <div class="float-left">
<div> <div>
<a class="brand logo" href="https://zulipchat.com/"> <a class="brand logo" href="https://zulip.com/">
<svg class="brand-logo" xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40 40" version="1.1"> <svg class="brand-logo" xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40 40" version="1.1">
<g transform="translate(-297.14285,-466.64792)"> <g transform="translate(-297.14285,-466.64792)">
<circle cx="317.14285" cy="486.64792" r="19.030317" style="fill:hsl(156, 100%, 24%)!important;stroke-width:1.93936479;stroke:transparent"></circle> <circle cx="317.14285" cy="486.64792" r="19.030317" style="fill:hsl(156, 100%, 24%)!important;stroke-width:1.93936479;stroke:transparent"></circle>

2
static/js/ui.js
View File

@ -67,7 +67,7 @@ exports.show_error_for_unsupported_platform = function () {
const error = "Hello! You're using the unsupported old Zulip desktop app," + const error = "Hello! You're using the unsupported old Zulip desktop app," +
" which is no longer developed. We recommend switching to the new, " + " which is no longer developed. We recommend switching to the new, " +
"modern desktop app, which you can download at " + "modern desktop app, which you can download at " +
"<a href='https://zulipchat.com/apps'>zulipchat.com/apps</a>."; "<a href='https://zulip.com/apps'>zulip.com/apps</a>.";
ui_report.generic_embed_error(error); ui_report.generic_embed_error(error);
} }

4
templates/zerver/api/incoming-webhooks-walkthrough.md
View File

@ -231,7 +231,7 @@ Common validators are available in `zerver/lib/validators.py`.
For either one of the command line tools, first, you'll need to get an API key For either one of the command line tools, first, you'll need to get an API key
from the **Your bots** section of your Zulip user's Settings page. To test the webhook, from the **Your bots** section of your Zulip user's Settings page. To test the webhook,
you'll need to [create a bot](https://zulipchat.com/help/add-a-bot-or-integration) with you'll need to [create a bot](https://zulip.com/help/add-a-bot-or-integration) with
the **Incoming Webhook** type. Replace `<api_key>` with your bot's API key in the examples the **Incoming Webhook** type. Replace `<api_key>` with your bot's API key in the examples
presented below! This is how Zulip knows that the request was made by an authorized user. presented below! This is how Zulip knows that the request was made by an authorized user.
@ -405,7 +405,7 @@ DONE!
## Step 6: Create documentation ## Step 6: Create documentation
Next, we add end-user documentation for our integration. You Next, we add end-user documentation for our integration. You
can see the existing examples at <https://zulipchat.com/integrations> can see the existing examples at <https://zulip.com/integrations>
or by accessing `/integrations` in your Zulip development environment. or by accessing `/integrations` in your Zulip development environment.
There are two parts to the end-user documentation on this page. There are two parts to the end-user documentation on this page.

2
templates/zerver/app/navbar_alerts.html
View File

@ -42,7 +42,7 @@
<div data-step="1"> <div data-step="1">
{% trans %} {% trans %}
You are using an old version of the Zulip desktop app with known security bugs. You are using an old version of the Zulip desktop app with known security bugs.
<a class="alert-link" href="https://zulipchat.com/apps" target="_blank"> <a class="alert-link" href="https://zulip.com/apps" target="_blank">
Download the latest version. Download the latest version.
</a> </a>
{% endtrans %} {% endtrans %}

11
templates/zerver/atlassian.md
View File

@ -4,10 +4,11 @@ migrating from Atlassian’s HipChat or Stride to Zulip.
## Do a trial of Zulip. ## Do a trial of Zulip.
* [Install Zulip on-premise](https://zulip.readthedocs.io/en/stable/production/install.html) * [Install Zulip
or [create a Zulip Cloud organization](https://zulipchat.com/new) on on-premise](https://zulip.readthedocs.io/en/stable/production/install.html)
zulipchat.com. Installing a Zulip server takes just a couple of or [create a Zulip Cloud
minutes. organization](https://zulip.com/new). Installing a Zulip server takes
just a couple of minutes.
* Stop by the [Zulip community server](https://chat.zulip.org) to see * Stop by the [Zulip community server](https://chat.zulip.org) to see
what an active Zulip organization looks like. The Zulip community what an active Zulip organization looks like. The Zulip community
@ -65,7 +66,7 @@ chat model.
## Decide on a payment plan. ## Decide on a payment plan.
See [zulipchat.com/plans](https://zulipchat.com/plans) for Cloud See [zulip.com/plans](https://zulip.com/plans) for Cloud
pricing, or email <support@zulip.com> for on-premise support pricing, or email <support@zulip.com> for on-premise support
options. We also offer affordable paid installation help that includes options. We also offer affordable paid installation help that includes
installing and configuring Zulip. installing and configuring Zulip.

2
templates/zerver/emails/followup_day1.source.html
View File

@ -27,7 +27,7 @@
{% else %} {% else %}
<li>{{ _('Email:') }} {{ email }}<br></li> <li>{{ _('Email:') }} {{ email }}<br></li>
{% endif %} {% endif %}
{% trans %}(you'll need these to sign in to the <a href="https://zulipchat.com/apps">mobile and desktop</a> apps){% endtrans %} {% trans %}(you'll need these to sign in to the <a href="https://zulip.com/apps">mobile and desktop</a> apps){% endtrans %}
</p> </p>
<p> <p>

2
templates/zerver/emails/followup_day1.txt
View File

@ -18,7 +18,7 @@
{% else %} {% else %}
* {{ _('Email:') }} {{ email }} * {{ _('Email:') }} {{ email }}
{% endif %} {% endif %}
{% trans %}(you'll need these to sign in to the mobile and desktop apps (https://zulipchat.com/apps)){% endtrans %} {% trans %}(you'll need these to sign in to the mobile and desktop apps (https://zulip.com/apps)){% endtrans %}
{% if is_realm_admin %} {% if is_realm_admin %}

8
templates/zerver/for/mystery-hunt.md
View File

@ -30,9 +30,9 @@ Yes! We provide free hosting for all MIT mystery hunt teams, student groups,
and research groups. and research groups.
Besides being easy on the wallet, Zulip is also free (open source) Besides being easy on the wallet, Zulip is also free (open source)
software. We make it easy to export your data from a software. We make it easy to export your data from [Zulip
[zulipchat.com](https://zulipchat.com) hosted Zulip and import it into a Cloud](https://zulip.com) and import it into a self-hosted
self-hosted installation. installation.
**Can I integrate Zulip with my current puzzlehunting software?** **Can I integrate Zulip with my current puzzlehunting software?**
@ -41,7 +41,7 @@ it’s easy to write bots that send things into or out of Zulip.
**Where can I test it out?** **Where can I test it out?**
[Click here](https://zulipchat.com/new) to create an organization; it [Click here](https://zulip.com/new) to create an organization; it
only takes only about 30 seconds. If you decide to continue using it, just email only takes only about 30 seconds. If you decide to continue using it, just email
support@zulip.com to tell us you’re a mystery hunt team. support@zulip.com to tell us you’re a mystery hunt team.

16
templates/zerver/for/open-source.md
View File

@ -90,14 +90,14 @@ community succeed too!
Below, we’ve collected a list of [Zulip features](/features) that are Below, we’ve collected a list of [Zulip features](/features) that are
particularly useful to open source communities. particularly useful to open source communities.
### Free hosting at zulipchat.com. ### Free hosting at zulip.com.
The hosting is supported by (and is identical to) zulipchat.com’s The hosting is supported by (and is identical to) zulip.com’s
commercial offerings. This offer extends to any community involved in commercial offerings. This offer extends to any community involved in
supporting free and open source software: development projects, foundations, supporting free and open source software: development projects,
meetups, hackathons, conference committees, and more. If you’re not sure foundations, meetups, hackathons, conference committees, and more. If
whether your organization qualifies, send us an email at you’re not sure whether your organization qualifies, send us an email
support@zulip.com. at support@zulip.com.
### Moderation suite. ### Moderation suite.
@ -196,8 +196,8 @@ first creating an account.
Our high quality [export](/help/export-your-organization) and Our high quality [export](/help/export-your-organization) and
[import](https://zulip.readthedocs.io/en/latest/production/export-and-import.html) [import](https://zulip.readthedocs.io/en/latest/production/export-and-import.html)
tools ensure you can always move from tools ensure you can always move from [Zulip Cloud](https://zulip.com)
[zulipchat.com](https://zulipchat.com) hosting to your own servers. hosting to your own servers.
### Free and open source. ### Free and open source.

12
templates/zerver/for/research.md
View File

@ -84,11 +84,11 @@ particularly useful to academic research organizations (both formal
organizations and online communities focused around research topics organizations and online communities focused around research topics
like Category Theory). like Category Theory).
### Free hosting at zulipchat.com. ### Free hosting at zulip.com.
This free hosting is supported by (and is identical to) This free hosting is supported by (and is identical to) zulip.com’s
zulipchat.com’s commercial offerings. If you’re not sure whether your commercial offerings. If you’re not sure whether your organization
organization qualifies, send us an email at support@zulip.com. qualifies, send us an email at support@zulip.com.
### Native LaTeX support powered by KaTeX ### Native LaTeX support powered by KaTeX
@ -157,8 +157,8 @@ easily find relevant past discussions.
Our high quality [export](/help/export-your-organization) and Our high quality [export](/help/export-your-organization) and
[import](https://zulip.readthedocs.io/en/latest/production/export-and-import.html) [import](https://zulip.readthedocs.io/en/latest/production/export-and-import.html)
tools ensure you can always move from tools ensure you can always move from [Zulip Cloud](https://zulip.com)
[zulipchat.com](https://zulipchat.com) hosting to your own servers. hosting to your own servers.
### Free and open source. ### Free and open source.

2
templates/zerver/help/about-streams-and-topics.md
View File

@ -30,7 +30,7 @@ complicated?
The short answer is that most users spend many hours a day on chat. A little The short answer is that most users spend many hours a day on chat. A little
investment up front pays huge dividends in access to a more powerful investment up front pays huge dividends in access to a more powerful
communication paradigm. communication paradigm.
A longer answer is [here](https://zulipchat.com/why-zulip). A longer answer is [here](https://zulip.com/why-zulip).
## Replying to a topic ## Replying to a topic

6
templates/zerver/help/desktop-app-install-guide.md
View File

@ -16,7 +16,7 @@ look at the newest features, consider the [beta releases](#install-a-beta-releas
#### Disk image (recommended) #### Disk image (recommended)
<!-- TODO why zip? --> <!-- TODO why zip? -->
1. Download [Zulip for macOS](https://zulipchat.com/apps/mac). 1. Download [Zulip for macOS](https://zulip.com/apps/mac).
1. Open the file, and drag the app into the `Applications` folder. 1. Open the file, and drag the app into the `Applications` folder.
The app will update automatically to future versions. The app will update automatically to future versions.
@ -33,7 +33,7 @@ also work, if you prefer.
#### Web installer (recommended) #### Web installer (recommended)
1. Download and run [Zulip for Windows](https://zulipchat.com/apps/windows). 1. Download and run [Zulip for Windows](https://zulip.com/apps/windows).
1. Run Zulip from the Start menu. 1. Run Zulip from the Start menu.
The app will update automatically to future versions. The app will update automatically to future versions.
@ -72,7 +72,7 @@ regular software update on your system, e.g. with
#### AppImage (recommended for all other distros) #### AppImage (recommended for all other distros)
1. Download [Zulip for Linux](https://zulipchat.com/apps/linux). 1. Download [Zulip for Linux](https://zulip.com/apps/linux).
2. Make the file executable, with 2. Make the file executable, with
`chmod a+x Zulip-x.x.x-x86_64.AppImage` from a terminal (replace `chmod a+x Zulip-x.x.x-x86_64.AppImage` from a terminal (replace
`x.x.x` with the actual name of the downloaded file). `x.x.x` with the actual name of the downloaded file).

2
templates/zerver/help/gdpr-compliance.md
View File

@ -2,7 +2,7 @@
This page covers how Zulip interacts with the EU's landmark GDPR This page covers how Zulip interacts with the EU's landmark GDPR
legislation; you can read the legislation; you can read the
[Zulip Cloud privacy policy](https://zulipchat.com/privacy) for our [Zulip Cloud privacy policy](https://zulip.com/privacy) for our
general privacy policies. general privacy policies.
## What is GDPR? ## What is GDPR?

2
templates/zerver/help/index.md
View File

@ -8,7 +8,7 @@ chat tools.
Most people use Zulip on the Web. There are also mobile apps for Most people use Zulip on the Web. There are also mobile apps for
Android/iOS, and desktop apps for Mac/Linux/Windows, which can be Android/iOS, and desktop apps for Mac/Linux/Windows, which can be
downloaded [here](https://zulipchat.com/apps/). downloaded [here](https://zulip.com/apps/).
One Zulip account, associated with a particular company, project, or team, One Zulip account, associated with a particular company, project, or team,
is known as an **organization**. is known as an **organization**.

4
templates/zerver/help/keyboard-shortcuts.md
View File

@ -99,11 +99,11 @@ below, and add more to your repertoire as needed.
* **Send message**: `Enter`, `Tab` then `Enter`, and/or `Ctrl` + `Enter`, * **Send message**: `Enter`, `Tab` then `Enter`, and/or `Ctrl` + `Enter`,
depending on your settings. See depending on your settings. See
[enable enter to send](https://zulipchat.com/help/enable-enter-to-send). [enable enter to send](https://zulip.com/help/enable-enter-to-send).
* **Insert new line**: `Enter`, or `Shift` + `Enter`, depending on your * **Insert new line**: `Enter`, or `Shift` + `Enter`, depending on your
settings. See settings. See
[enable enter to send](https://zulipchat.com/help/enable-enter-to-send). [enable enter to send](https://zulip.com/help/enable-enter-to-send).
* **Insert italic text**: `*italic*` or `Ctrl + I` * **Insert italic text**: `*italic*` or `Ctrl + I`
* **Insert bold text**: `**bold**` or `Ctrl + B` * **Insert bold text**: `**bold**` or `Ctrl + B`

4
templates/zerver/help/logging-in.md
View File

@ -60,8 +60,8 @@ For subsequent logins, see [switching between organizations](/help/switching-bet
Some ideas: Some ideas:
* If you know your organization is hosted on * If you know your organization is hosted on
[zulipchat.com](https://zulipchat.com), go to [zulip.com](https://zulip.com), go to [find my
[find my account](https://zulipchat.com/accounts/find/) and enter the email account](https://zulip.com/accounts/find/) and enter the email
address that you signed up with. address that you signed up with.
* Try guessing the URL. Zulip URLs often look like `<name>.zulipchat.com`, * Try guessing the URL. Zulip URLs often look like `<name>.zulipchat.com`,

4
templates/zerver/help/saml-authentication.md
View File

@ -14,7 +14,7 @@ Zulip with various common SAML Identity Providers.
[Okta's documentation](https://developer.okta.com/docs/guides/saml-application-setup/overview/). [Okta's documentation](https://developer.okta.com/docs/guides/saml-application-setup/overview/).
Specify: Specify:
* `https://<subdomain>.zulipchat.com/complete/saml/` for the "Single sign on URL"`. * `https://<subdomain>.zulipchat.com/complete/saml/` for the "Single sign on URL"`.
* `https://zulipchat.com` for the "Audience URI (SP Entity ID)". * `https://zulip.com` for the "Audience URI (SP Entity ID)".
* Skip "Default RelayState". * Skip "Default RelayState".
* Skip "Name ID format". * Skip "Name ID format".
* Set 'Email` for "Application username format". * Set 'Email` for "Application username format".
@ -39,7 +39,7 @@ Zulip with various common SAML Identity Providers.
but will be shown on your OneLogin Applications page. but will be shown on your OneLogin Applications page.
1. Go to the "Configuration" section: 1. Go to the "Configuration" section:
* Leave the `RelayState` field empty. * Leave the `RelayState` field empty.
* Set `https://zulipchat.com` as the Audience. * Set `https://zulip.com` as the Audience.
* Set `https://<subdomain>.zulipchat.com/complete/saml/` as the Recipient, ACS URL * Set `https://<subdomain>.zulipchat.com/complete/saml/` as the Recipient, ACS URL
and ACS URL Validator. and ACS URL Validator.
1. Go to the "Parameters" section. Ignore the pre-configured parameters that are already there 1. Go to the "Parameters" section. Ignore the pre-configured parameters that are already there

8
templates/zerver/history.html
View File

@ -133,10 +133,10 @@
additional sources of funding. additional sources of funding.
</p> </p>
<p> <p>
In mid-2017, Kandra Labs launched two products: a hosted In mid-2017, Kandra Labs launched two products: a
Zulip service hosted Zulip service
at <a href="https://zulipchat.com">zulipchat.com</a>, at <a href="https://zulip.com">zulip.com</a>, and
and an enterprise support product for on-premise an enterprise support product for on-premise
deployments. deployments.
</p> </p>
<p> <p>

2
templates/zerver/insecure_desktop_app.html
View File

@ -26,7 +26,7 @@
{% endif %} {% endif %}
<p> <p>
<a href="https://zulipchat.com/apps" target="_blank"> <a href="https://zulip.com/apps" target="_blank">
{{ _("Download the latest release.") }} {{ _("Download the latest release.") }}
</a> </a>
</p> </p>

2
templates/zerver/realm_creation_failed.html
View File

@ -23,7 +23,7 @@
can <a href="https://zulip.readthedocs.io/en/stable/production/install.html">install can <a href="https://zulip.readthedocs.io/en/stable/production/install.html">install
your own Zulip server</a> or create a new your own Zulip server</a> or create a new
organization on organization on
<a href="https://zulipchat.com">Zulip Cloud</a> <a href="https://zulip.com">Zulip Cloud</a>
{% endtrans %} {% endtrans %}
</p> </p>
</div> </div>

2
templates/zerver/team.html
View File

@ -60,7 +60,7 @@
</div> </div>
<p> <p>
Kandra Labs provides commercial Zulip hosting and on-premises support Kandra Labs provides commercial Zulip hosting and on-premises support
at <a href="https://zulipchat.com/plans">https://zulipchat.com</a>, at <a href="https://zulip.com/plans">https://zulip.com</a>,
and employs the core developers of the project. It was and employs the core developers of the project. It was
started in June 2016 to help sustain the growth of the Zulip started in June 2016 to help sustain the growth of the Zulip
project. Kandra Labs is funded by project. Kandra Labs is funded by

2
templates/zerver/unsupported_browser.html
View File

@ -23,7 +23,7 @@
<p> <p>
{% trans %} {% trans %}
You can also use You can also use
the <a href="https://zulipchat.com/apps">Zulip the <a href="https://zulip.com/apps">Zulip
desktop app</a>. desktop app</a>.
{% endtrans %} {% endtrans %}
</p> </p>

2
zerver/context_processors.py
View File

@ -82,7 +82,7 @@ def zulip_default_context(request: HttpRequest) -> Dict[str, Any]:
find_team_link_disabled = False find_team_link_disabled = False
allow_search_engine_indexing = True allow_search_engine_indexing = True
apps_page_url = 'https://zulipchat.com/apps/' apps_page_url = 'https://zulip.com/apps/'
if settings.ZILENCER_ENABLED: if settings.ZILENCER_ENABLED:
apps_page_url = '/apps/' apps_page_url = '/apps/'

2
zerver/data_import/slack.py
View File

@ -75,7 +75,7 @@ def slack_workspace_to_realm(domain_name: str, realm_id: int, user_list: List[Ze
zerver_realmemoji, emoji_url_map = build_realmemoji(custom_emoji_list, realm_id) zerver_realmemoji, emoji_url_map = build_realmemoji(custom_emoji_list, realm_id)
realm['zerver_realmemoji'] = zerver_realmemoji realm['zerver_realmemoji'] = zerver_realmemoji
# See https://zulipchat.com/help/set-default-streams-for-new-users # See https://zulip.com/help/set-default-streams-for-new-users
# for documentation on zerver_defaultstream # for documentation on zerver_defaultstream
realm['zerver_userprofile'] = zerver_userprofile realm['zerver_userprofile'] = zerver_userprofile

2
zerver/lib/email_notifications.py
View File

@ -564,7 +564,7 @@ def enqueue_welcome_emails(user: UserProfile, realm_creation: bool=False) -> Non
context['getting_started_link'] = (user.realm.uri + context['getting_started_link'] = (user.realm.uri +
'/help/getting-your-organization-started-with-zulip') '/help/getting-your-organization-started-with-zulip')
else: else:
context['getting_started_link'] = "https://zulipchat.com" context['getting_started_link'] = "https://zulip.com"
# Imported here to avoid import cycles. # Imported here to avoid import cycles.
from zproject.backends import email_belongs_to_ldap, ZulipLDAPAuthBackend from zproject.backends import email_belongs_to_ldap, ZulipLDAPAuthBackend

4
zerver/management/commands/register_server.py
View File

@ -23,7 +23,7 @@ class Command(ZulipBaseCommand):
dest='agree_to_terms_of_service', dest='agree_to_terms_of_service',
action='store_true', action='store_true',
default=False, default=False,
help="Agree to the Zulipchat Terms of Service: https://zulipchat.com/terms/.") help="Agree to the Zulipchat Terms of Service: https://zulip.com/terms/.")
parser.add_argument('--rotate-key', parser.add_argument('--rotate-key',
dest="rotate_key", dest="rotate_key",
action='store_true', action='store_true',
@ -61,7 +61,7 @@ class Command(ZulipBaseCommand):
if not options['agree_to_terms_of_service'] and not options["rotate_key"]: if not options['agree_to_terms_of_service'] and not options["rotate_key"]:
print("To register, you must agree to the Zulipchat Terms of Service: " print("To register, you must agree to the Zulipchat Terms of Service: "
"https://zulipchat.com/terms/") "https://zulip.com/terms/")
tos_prompt = input("Do you agree to the Terms of Service? [Y/n] ") tos_prompt = input("Do you agree to the Terms of Service? [Y/n] ")
print("") print("")
if not (tos_prompt.lower() == 'y' or if not (tos_prompt.lower() == 'y' or

8
zerver/openapi/zulip.yaml
View File

@ -14,7 +14,7 @@ info:
description: | description: |
Powerful open source group chat Powerful open source group chat
contact: contact:
url: https://zulipchat.com url: https://zulip.com
license: license:
name: Apache 2.0 name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html url: https://www.apache.org/licenses/LICENSE-2.0.html
@ -1669,7 +1669,7 @@ paths:
tags: ["users"] tags: ["users"]
description: | description: |
[Deactivates a [Deactivates a
user](https://zulipchat.com/help/deactivate-or-reactivate-a-user) user](https://zulip.com/help/deactivate-or-reactivate-a-user)
given their user ID. given their user ID.
`DELETE {{ api_url }}/v1/users/{user_id}` `DELETE {{ api_url }}/v1/users/{user_id}`
@ -1707,7 +1707,7 @@ paths:
tags: ["users"] tags: ["users"]
description: | description: |
[Reactivates a [Reactivates a
user](https://zulipchat.com/help/deactivate-or-reactivate-a-user) user](https://zulip.com/help/deactivate-or-reactivate-a-user)
given their user ID. given their user ID.
`POST {{ api_url }}/v1/users/{user_id}/reactivate` `POST {{ api_url }}/v1/users/{user_id}/reactivate`
@ -2681,7 +2681,7 @@ paths:
description: | description: |
This endpoint is used to upload a custom emoji for use in the user's This endpoint is used to upload a custom emoji for use in the user's
organization. Access to this endpoint depends on the organization. Access to this endpoint depends on the
[organization's configuration](https://zulipchat.com/help/only-allow-admins-to-add-emoji). [organization's configuration](https://zulip.com/help/only-allow-admins-to-add-emoji).
`POST {{ api_url }}/v1/realm/emoji/{emoji_name}` `POST {{ api_url }}/v1/realm/emoji/{emoji_name}`
parameters: parameters:

2
zerver/tests/fixtures/markdown_test_cases.json vendored
View File

@ -381,7 +381,7 @@
}, },
{ {
"name": "two_inline_images", "name": "two_inline_images",
"input": "Google logo today: https://www.google.com/images/srpr/logo4w.png\nKinda boring\nZulip logo: https://zulipchat.com/static/images/landing-page/zulip-octopus.png", "input": "Google logo today: https://www.google.com/images/srpr/logo4w.png\nKinda boring\nZulip logo: https://zulip.com/static/images/landing-page/zulip-octopus.png",
"expected_output": "<p>Google logo today: <a href=\"https:\/\/www.google.com\/images\/srpr\/logo4w.png\">https:\/\/www.google.com\/images\/srpr\/logo4w.png<\/a><br>\nKinda boring<br>\nZulip logo: <a href=\"https:\/\/zulipchat.com\/static\/images\/landing-page\/zulip-octopus.png\">https:\/\/zulipchat.com\/static\/images\/landing-page\/zulip-octopus.png<\/a><\/p>\n<div class=\"message_inline_image\"><a href=\"https:\/\/www.google.com\/images\/srpr\/logo4w.png\"><img data-src-fullsize=\"\/thumbnail?url=https%3A%2F%2Fwww.google.com%2Fimages%2Fsrpr%2Flogo4w.png&amp;size=full\" src=\"\/thumbnail?url=https%3A%2F%2Fwww.google.com%2Fimages%2Fsrpr%2Flogo4w.png&amp;size=thumbnail\"><\/a><\/div><div class=\"message_inline_image\"><a href=\"https:\/\/zulipchat.com\/static\/images\/landing-page\/zulip-octopus.png\"><img data-src-fullsize=\"\/thumbnail?url=https%3A%2F%2Fzulipchat.com%2Fstatic%2Fimages%2Flanding-page%2Fzulip-octopus.png&amp;size=full\" src=\"\/thumbnail?url=https%3A%2F%2Fzulipchat.com%2Fstatic%2Fimages%2Flanding-page%2Fzulip-octopus.png&amp;size=thumbnail\"><\/a><\/div>", "expected_output": "<p>Google logo today: <a href=\"https:\/\/www.google.com\/images\/srpr\/logo4w.png\">https:\/\/www.google.com\/images\/srpr\/logo4w.png<\/a><br>\nKinda boring<br>\nZulip logo: <a href=\"https:\/\/zulipchat.com\/static\/images\/landing-page\/zulip-octopus.png\">https:\/\/zulipchat.com\/static\/images\/landing-page\/zulip-octopus.png<\/a><\/p>\n<div class=\"message_inline_image\"><a href=\"https:\/\/www.google.com\/images\/srpr\/logo4w.png\"><img data-src-fullsize=\"\/thumbnail?url=https%3A%2F%2Fwww.google.com%2Fimages%2Fsrpr%2Flogo4w.png&amp;size=full\" src=\"\/thumbnail?url=https%3A%2F%2Fwww.google.com%2Fimages%2Fsrpr%2Flogo4w.png&amp;size=thumbnail\"><\/a><\/div><div class=\"message_inline_image\"><a href=\"https:\/\/zulipchat.com\/static\/images\/landing-page\/zulip-octopus.png\"><img data-src-fullsize=\"\/thumbnail?url=https%3A%2F%2Fzulipchat.com%2Fstatic%2Fimages%2Flanding-page%2Fzulip-octopus.png&amp;size=full\" src=\"\/thumbnail?url=https%3A%2F%2Fzulipchat.com%2Fstatic%2Fimages%2Flanding-page%2Fzulip-octopus.png&amp;size=thumbnail\"><\/a><\/div>",
"backend_only_rendering": true, "backend_only_rendering": true,
"text_content": "Google logo today: https:\/\/www.google.com\/images\/srpr\/logo4w.png\nKinda boring\nZulip logo: https:\/\/zulipchat.com\/static\/images\/landing-page\/zulip-octopus.png\n" "text_content": "Google logo today: https:\/\/www.google.com\/images\/srpr\/logo4w.png\nKinda boring\nZulip logo: https:\/\/zulipchat.com\/static\/images\/landing-page\/zulip-octopus.png\n"

2
zerver/tests/test_custom_profile_data.py
View File

@ -502,7 +502,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
('Favorite food', 'long short text data'), ('Favorite food', 'long short text data'),
('Favorite editor', 'vim'), ('Favorite editor', 'vim'),
('Birthday', '1909-3-5'), ('Birthday', '1909-3-5'),
('Favorite website', 'https://zulipchat.com'), ('Favorite website', 'https://zulip.com'),
('Mentor', [self.example_user("cordelia").id]), ('Mentor', [self.example_user("cordelia").id]),
('GitHub', 'zulip-mobile') ('GitHub', 'zulip-mobile')
] ]

8
zerver/tests/test_docs.py
View File

@ -345,7 +345,7 @@ class AboutPageTest(ZulipTestCase):
with self.settings(ZILENCER_ENABLED=False): with self.settings(ZILENCER_ENABLED=False):
result = self.client_get('/team/') result = self.client_get('/team/')
self.assertEqual(result.status_code, 301) self.assertEqual(result.status_code, 301)
self.assertEqual(result["Location"], "https://zulipchat.com/team/") self.assertEqual(result["Location"], "https://zulip.com/team/")
def test_split_by(self) -> None: def test_split_by(self) -> None:
"""Utility function primarily used in authors page""" """Utility function primarily used in authors page"""
@ -402,14 +402,14 @@ class PlansPageTest(ZulipTestCase):
with self.settings(PRODUCTION=True): with self.settings(PRODUCTION=True):
result = self.client_get("/plans/", subdomain="zulip") result = self.client_get("/plans/", subdomain="zulip")
self.assertEqual(result.status_code, 302) self.assertEqual(result.status_code, 302)
self.assertEqual(result["Location"], "https://zulipchat.com/plans") self.assertEqual(result["Location"], "https://zulip.com/plans")
self.login('iago') self.login('iago')
# SELF_HOSTED should hide the local plans page, even if logged in # SELF_HOSTED should hide the local plans page, even if logged in
result = self.client_get("/plans/", subdomain="zulip") result = self.client_get("/plans/", subdomain="zulip")
self.assertEqual(result.status_code, 302) self.assertEqual(result.status_code, 302)
self.assertEqual(result["Location"], "https://zulipchat.com/plans") self.assertEqual(result["Location"], "https://zulip.com/plans")
# But in the development environment, it renders a page # But in the development environment, it renders a page
result = self.client_get("/plans/", subdomain="zulip") result = self.client_get("/plans/", subdomain="zulip")
@ -443,7 +443,7 @@ class AppsPageTest(ZulipTestCase):
with self.settings(ZILENCER_ENABLED=False): with self.settings(ZILENCER_ENABLED=False):
result = self.client_get('/apps/') result = self.client_get('/apps/')
self.assertEqual(result.status_code, 301) self.assertEqual(result.status_code, 301)
self.assertTrue(result['Location'] == 'https://zulipchat.com/apps/') self.assertTrue(result['Location'] == 'https://zulip.com/apps/')
with self.settings(ZILENCER_ENABLED=True): with self.settings(ZILENCER_ENABLED=True):
result = self.client_get('/apps/') result = self.client_get('/apps/')

2
zerver/tests/test_email_notifications.py
View File

@ -112,7 +112,7 @@ class TestFollowupEmails(ZulipTestCase):
email_data = ujson.loads(scheduled_emails[0].data) email_data = ujson.loads(scheduled_emails[0].data)
self.assertEqual(email_data["context"]["email"], self.example_email("hamlet")) self.assertEqual(email_data["context"]["email"], self.example_email("hamlet"))
self.assertEqual(email_data["context"]["is_realm_admin"], False) self.assertEqual(email_data["context"]["is_realm_admin"], False)
self.assertEqual(email_data["context"]["getting_started_link"], "https://zulipchat.com") self.assertEqual(email_data["context"]["getting_started_link"], "https://zulip.com")
self.assertNotIn("ldap_username", email_data["context"]) self.assertNotIn("ldap_username", email_data["context"])
ScheduledEmail.objects.all().delete() ScheduledEmail.objects.all().delete()

4
zerver/tests/test_subs.py
View File

@ -785,12 +785,12 @@ class StreamAdminTest(ZulipTestCase):
# Verify that we don't render inline URL previews in this code path. # Verify that we don't render inline URL previews in this code path.
with self.settings(INLINE_URL_EMBED_PREVIEW=True): with self.settings(INLINE_URL_EMBED_PREVIEW=True):
result = self.client_patch('/json/streams/%d' % (stream_id,), result = self.client_patch('/json/streams/%d' % (stream_id,),
{'description': ujson.dumps('See https://zulipchat.com/team')}) {'description': ujson.dumps('See https://zulip.com/team')})
self.assert_json_success(result) self.assert_json_success(result)
stream = get_stream('stream_name1', realm) stream = get_stream('stream_name1', realm)
self.assertEqual( self.assertEqual(
stream.rendered_description, stream.rendered_description,
'<p>See <a href="https://zulipchat.com/team">https://zulipchat.com/team</a></p>', '<p>See <a href="https://zulip.com/team">https://zulip.com/team</a></p>',
) )
def test_change_stream_description_requires_realm_admin(self) -> None: def test_change_stream_description_requires_realm_admin(self) -> None:

2
zerver/tests/test_users.py
View File

@ -445,7 +445,7 @@ class PermissionTest(ZulipTestCase):
'Favorite food': 'short text data', 'Favorite food': 'short text data',
'Favorite editor': 'vim', 'Favorite editor': 'vim',
'Birthday': '1909-3-5', 'Birthday': '1909-3-5',
'Favorite website': 'https://zulipchat.com', 'Favorite website': 'https://zulip.com',
'Mentor': [cordelia.id], 'Mentor': [cordelia.id],
'GitHub': 'timabbott', 'GitHub': 'timabbott',
} }

6
zerver/views/portico.py
View File

@ -20,7 +20,7 @@ def apps_view(request: HttpRequest, _: str) -> HttpResponse:
} }
} }
) )
return HttpResponseRedirect('https://zulipchat.com/apps/', status=301) return HttpResponseRedirect('https://zulip.com/apps/', status=301)
@add_google_analytics @add_google_analytics
def plans_view(request: HttpRequest) -> HttpResponse: def plans_view(request: HttpRequest) -> HttpResponse:
@ -30,7 +30,7 @@ def plans_view(request: HttpRequest) -> HttpResponse:
if realm is not None: if realm is not None:
realm_plan_type = realm.plan_type realm_plan_type = realm.plan_type
if realm.plan_type == Realm.SELF_HOSTED and settings.PRODUCTION: if realm.plan_type == Realm.SELF_HOSTED and settings.PRODUCTION:
return HttpResponseRedirect('https://zulipchat.com/plans') return HttpResponseRedirect('https://zulip.com/plans')
if not request.user.is_authenticated: if not request.user.is_authenticated:
return redirect_to_login(next="plans") return redirect_to_login(next="plans")
return TemplateResponse( return TemplateResponse(
@ -42,7 +42,7 @@ def plans_view(request: HttpRequest) -> HttpResponse:
@add_google_analytics @add_google_analytics
def team_view(request: HttpRequest) -> HttpResponse: def team_view(request: HttpRequest) -> HttpResponse:
if not settings.ZILENCER_ENABLED: if not settings.ZILENCER_ENABLED:
return HttpResponseRedirect('https://zulipchat.com/team/', status=301) return HttpResponseRedirect('https://zulip.com/team/', status=301)
try: try:
with open(settings.CONTRIBUTOR_DATA_FILE_PATH) as f: with open(settings.CONTRIBUTOR_DATA_FILE_PATH) as f:

2
zproject/urls.py
View File

@ -654,7 +654,7 @@ urls += [
# Mobile-specific authentication URLs # Mobile-specific authentication URLs
urls += [ urls += [
# Used as a global check by all mobile clients, which currently send # Used as a global check by all mobile clients, which currently send
# requests to https://zulipchat.com/compatibility almost immediately after # requests to https://zulip.com/compatibility almost immediately after
# starting up. # starting up.
url(r'^compatibility$', zerver.views.compatibility.check_global_compatibility), url(r'^compatibility$', zerver.views.compatibility.check_global_compatibility),
] ]