From 28e3c166a80d8e4d6a826c14d48dfb8ae97fbc09 Mon Sep 17 00:00:00 2001 From: Karl Stolley Date: Fri, 2 Feb 2024 16:06:17 -0500 Subject: [PATCH] plans: Consolidate integrated table references. --- .../corporate/comparison_table_cloud.html | 768 ------------ .../comparison_table_integrated.html | 5 +- .../comparison_table_self_hosted.html | 1080 ----------------- templates/corporate/plans.html | 9 +- 4 files changed, 7 insertions(+), 1855 deletions(-) delete mode 100644 templates/corporate/comparison_table_cloud.html delete mode 100644 templates/corporate/comparison_table_self_hosted.html diff --git a/templates/corporate/comparison_table_cloud.html b/templates/corporate/comparison_table_cloud.html deleted file mode 100644 index d1ec0358be..0000000000 --- a/templates/corporate/comparison_table_cloud.html +++ /dev/null @@ -1,768 +0,0 @@ -
-

Cloud plans comparison

- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FeaturesFreeStandardPlus
Collaboration basics
- Message history search - Limited
Users
- Streams -
- Topic-based threading -
- File sharing and storage - 5 GB total10 GB/user10 GB/user
- Voice and video calls (1:1) -
Choose a call provider (Zoom, Jitsi, etc.)
-
- Voice and video calls (group) -
Choose a call provider (Zoom, Jitsi, etc.)
-
- Integrations with other apps -
- Localized in more than 20 languages -
Apps
- Web app -
Any modern browser
-
- Desktop apps -
Windows, Mac, Linux
-
- Mobile apps -
iOS and Android
-
Terminal app
- Mobile push notifications -
Efficient communication
- Expressive formatting -
Code syntax highlighting, LaTeX, etc.
-
- Collaborative messages -
Polls, todo lists
-
- Extensive keyboard shortcuts -
- Move messages between - streams and - topics -
- Mark topics as resolved -
Lightweight project management
-
- Permanent message links -
- User status and availability -
Custom emoji
- Read receipts -
- Typing notifications -
- Send later, - mark unread, and other workflows -
- - Highly configurable notification settings - -
- Email notifications -
- Previews for links, images and videos -
- Linkifiers -
Auto-link text to issues, tickets, etc.
-
Integrations
- - Configurable call provider - -
Zoom, Jitsi
-
- Native GIPHY integration -
- 130+ native integrations -
- 1000s of integrations though Zapier and - IFTTT -
- - Admin controls for all bots and integrations - -
- - Custom webhooks - -
- - REST API custom integrations - -
- - Chat bridges with other products - -
Slack, Microsoft Teams, Matrix, etc.
-
- Email bridge integration -
User administration
- Email authentication -
- Reusable invitation links -
- OAuth social logins -
Google, GitHub, GitLab, Apple
-
- Custom profile fields -
- SSO with SAML -
Including Okta and OneLogIn
-
- - SSO with OpenID Connect - - Please inquirePlease inquire
- - 100+ authentication options - -
With python-social-auth
- 		Please inquirePlease inquire
- - AD/LDAP user sync - - Please inquirePlease inquire
- - AD/LDAP group sync - - Please inquirePlease inquire
SCIM user sync
- Custom user groups -
- Guest users -
- Limit user list access for guests -
Advanced administration
- Private streams with shared history -
- Private streams with private history -
- Stream posting permissions -
- Permissions for - - editing - , - - deleting - - and moving messages -
- - Configure initial settings for new users - -
- - Configure initial streams for new users - -
- Public access option -
- Advanced moderation tools -
- Usage statistics charts -
- Custom branding -
- Custom domain -
Security
- 100% open-source, auditable codebase -
- - Restricted email domains - -
- - TLS encryption - -
Data encryption at rest
- - API endpoint access rate limits - -
Compliance
- - Message editing and deletion policies - -
- Complete data exports -
- Granular data retention policies -
- - Detailed audit log of administrative actions - -
- - Compliance exports - -
- GDPR compliant -
Support
- Chat support in the - Zulip development community -
Feature feedback sessions
- Email support -
Import data from another Zulip server
- Import data from Slack, - Mattermost, - Gitter or - Rocket.Chat -
Import data from other chat productsPlease inquire
Implementation consultingBilled hourlyBilled hourly
Training sessionsBilled hourlyBilled hourly
Custom feature developmentBilled hourlyBilled hourly
-
diff --git a/templates/corporate/comparison_table_integrated.html b/templates/corporate/comparison_table_integrated.html index a992290623..d2425db678 100644 --- a/templates/corporate/comparison_table_integrated.html +++ b/templates/corporate/comparison_table_integrated.html @@ -1,5 +1,8 @@
-

Self-hosted plans comparison

+

Cloud plans comparison

+

Self-hosted plans comparison

+

All plans comparison

+
All plans offer the same 100% open-source software.
Zulip’s support team will provide assistance with features marked with a .
diff --git a/templates/corporate/comparison_table_self_hosted.html b/templates/corporate/comparison_table_self_hosted.html deleted file mode 100644 index 4cd9722f7f..0000000000 --- a/templates/corporate/comparison_table_self_hosted.html +++ /dev/null @@ -1,1080 +0,0 @@ -
-

Self-hosted plans comparison

-
- All plans offer the same 100% open-source software.
- Zulip’s support team will provide assistance with features marked with a .
- Features you will need to set up and maintain on your own are marked with a . -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FeaturesFreeBasicBusinessEnterprise
Collaboration basics
- Message history search -
Users
- Streams -
- Topic-based threading -
- File sharing and storage -
- Voice and video calls (1:1) -
Choose a call provider (Zoom, Jitsi, etc.)
-
- Voice and video calls (group) -
Choose a call provider (Zoom, Jitsi, etc.)
-
- Integrations with other apps -
- Localized in more than 20 languages -
Apps
- Web app -
Any modern browser
-
- Desktop apps -
Windows, Mac, Linux
-
- Mobile apps -
iOS and Android
-
Terminal app
- Mobile push notifications - Limited
Efficient communication
- Expressive formatting -
Code syntax highlighting, LaTeX, etc.
-
- Collaborative messages -
Polls, todo lists
-
- Extensive keyboard shortcuts -
- Move messages between - streams and - topics -
- Mark topics as resolved -
Lightweight project management
-
- Permanent message links -
- User status and availability -
Custom emoji
- Read receipts -
- Typing notifications -
- Send later, - mark unread, and other workflows -
- - Highly configurable notification settings - -
- Email notifications -
- Previews for links, images and videos -
- Linkifiers -
Auto-link text to issues, tickets, etc.
-
Integrations
- - Configurable call provider - -
Zoom, Jitsi, BigBlueButton, etc.
-
- Native GIPHY integration -
- 130+ native integrations -
- 1000s of integrations though Zapier and - IFTTT -
- - Admin controls for all bots and integrations - -
- - Custom webhooks - -
- - REST API custom integrations - -
- - Chat bridges with other products - -
Slack, Microsoft Teams, Matrix, etc.
-
- Email bridge integration -
AI / LLM integration
User administration
- Email authentication -
- Reusable invitation links -
- OAuth social logins -
Google, GitHub, GitLab, Apple
-
- Custom profile fields -
- SSO with SAML -
Including Okta and OneLogIn
-
- SSO with Azure Active Directory -
- - SSO with OpenID Connect - -
- - 100+ authentication options - -
With python-social-auth
-
- - AD/LDAP user sync - -
- - AD/LDAP group sync - -
SCIM user sync
- Custom user groups -
- Guest users -
- Limit user list access for guests -
Advanced administration
- Private streams with shared history -
- Private streams with private history -
- Stream posting permissions -
- Permissions for - - editing - , - - deleting - - and moving messages -
- - Configure initial settings for new users - -
- - Configure initial streams for new users - -
- Public access option -
- Advanced moderation tools -
- Usage statistics charts -
- Custom branding -
Security
- 100% open-source, auditable codebase -
- - Restricted email domains - -
- - Custom password strength requirement - -
- - TLS encryption with Let's Encrypt - -
- Custom SSL certificate authority -
- - Custom TLS server termination -
- - Firewalled hosting - -
Air-gapped hosting
Data encryption at rest
- - No-content push notifications - -
- - Revoke and reset any user's credentials - -
- - API endpoint access rate limits - -
Compliance
- - Message editing and deletion policies - -
- Complete data exports -
- Granular data retention policies -
- - Detailed audit log of administrative actions - -
- - Compliance exports - -
- GDPR compliant deployment -
HIPAA compliant deployment
Compliance customization and supportBilled hourlyBilled hourly
Deployment options
- Multiple organizations on one server -
- Maintain a local fork -
Keep custom code across upgrades
-
- Comprehensive data backups and restores -
- Real-time data backup and replication -
- Off-server attachment storage -
NAS, S3, etc.
-
- Outgoing proxy -
- Docker deployments -
- Kubernetes deployments with Helm -
- Scalability for thousands of concurrent users -
- Deploy supporting services on separate hosts -
- Disaster recovery failover -
- Monitoring and alerting -
- Sentry integration for error reporting -
Support
- Chat support in the - Zulip development community -
Feature feedback sessionsChat only
- Email support -
- Import data from Slack, - Mattermost, - Gitter or - Rocket.Chat -
Import data from other chat productsBilled hourly
Realtime support for installation and upgradesBilled hourly
Implementation consultingBilled hourlyBilled hourly
Training sessionsBilled hourlyBilled hourly
Custom feature developmentBilled hourly
Advance notice for security releases
-
diff --git a/templates/corporate/plans.html b/templates/corporate/plans.html index 191c7206b8..1a904a6d45 100644 --- a/templates/corporate/plans.html +++ b/templates/corporate/plans.html @@ -117,10 +117,6 @@
-
- {% include "corporate/comparison_table_integrated.html" %} -
-
@@ -218,9 +214,10 @@
-
- {% include "corporate/comparison_table_self_hosted.html" %} +
+ {% include "corporate/comparison_table_integrated.html" %}
+
{% if not is_self_hosted_realm %}