Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
56,271 Commits 28 Branches 143 Tags 606 MiB
Commit Graph

32 Commits

Author SHA1 Message Date
Prakhar Pratyush 82da6abb24 corporate: Restrict free-trial when fixed-price plan is configured. 
When fixed-price plan is configured:
* Don't show 'free-trial for 30 days' button on plans page.
* Remove free-trial related texts from /upgrade page.
 2024-01-31 12:25:31 -08:00
Karl Stolley a37354f92a corporate: Add a Basic plan. 2023-12-20 23:09:21 -08:00
Prakhar Pratyush 63bb63ad80 corporate: Remove '#nocoverage' comments. 
This commit removes '#nocoverage' comment as we have added
few E2E tests in 'test_stripe.py'.
 2023-12-19 10:59:38 -08:00
Aman Agrawal d962814a30 upgrade: Make it possible to upgrade to a provided tier. 
Main work is maintaining context during various redirects and
and passing the context to the final upgrade process.
 2023-12-18 12:23:46 -08:00
Aman Agrawal 6b1f71872b plans: Fix same page hashtag link. 
Fixes /plans fragment links redirecting users to different page.
 2023-12-16 22:51:21 -08:00
Karl Stolley e44ba3b1f1 portico: Add new self-hosted plans. 
Co-authored-by: Alya Abbott <alya@zulip.com>
 2023-12-15 11:03:42 -08:00
Aman Agrawal 45a2f7eac1 portico: Pass requested sponsorship context to plan page. 2023-12-12 23:27:39 -08:00
Aman Agrawal eb92b31e1d stripe: Disable free trial for self hosted customers. 2023-12-11 13:23:49 -08:00
Aman Agrawal 23d712391e post_analytics: Migrate plan from server to realm after upgrade. 2023-12-11 13:23:49 -08:00
Aman Agrawal ce56e19d1c stripe: Separate activation of free trial for remote realm/server. 
Add a separate setting to only enable free trial for remote
realm / server.
 2023-12-10 15:18:01 -08:00
Aman Agrawal 34704daee7 stripe: Use a function to get free trial days. 2023-12-10 15:18:01 -08:00
Aman Agrawal 34730203b3 plans: Show special text for legacy orgs scheduled for upgrade. 2023-12-05 23:44:29 -08:00
Aman Agrawal 8d9a7679bc plans: Show buttons as per current context. 
Also show correct tab based on remote / cloud user.
 2023-12-05 23:44:29 -08:00
Aman Agrawal 00df9c6c18 urls: Show sponsorship page on a new URL. 
Fixes #27377

Replaced #sponsorship links with sponsorship/ links and in other
places liking gear menu.
 2023-11-06 14:55:14 -08:00
Aman Agrawal b8b7938eb9 portico: Remove orgs who haven't set their own description. 2023-10-12 09:58:47 -07:00
Aman Agrawal 4ebbd68749 portico: Show limited filters on communities page. 2023-10-12 09:58:47 -07:00
Anders Kaseorg 3b09197fdf ruff: Fix RUF015 Prefer `next(...)` over single element slice. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2023-07-23 15:20:53 -07:00
Anders Kaseorg b5e5728112 coverage: Clean up coverage configuration. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2023-05-31 13:53:04 -07:00
Tim Abbott 50b91fe5c7 portico: Fix incorrect fallback contributors data type. 
Previously, using this without having run fetch-contributors-data
would throw an exception trying to call .filter on an empty
dictionary.
 2023-03-27 22:33:54 -07:00
Alex Vandiver c686c5ed0f web: Save a needless 301 redirect from /plans to /plans/. 2023-03-24 14:51:01 -07:00
Alex Vandiver 5967dda35d web: Save a needless 301 redirect from /upgrade to /upgrade/. 2023-03-24 14:51:01 -07:00
Alex Vandiver 7613928e8a apps: Fix redirect from /apps -> https://zulip.com/apps/. 
When this code was moved from being in zerver in 21a2fd482e, it kept
the `if ZILENCER_ENABLED` blocks.  Since ZILENCER and CORPORATE are
generally either both on or both off, the if statement became
mostly-unnecessary.

However, because tests cannot easily remove elements from
INSTALLED_APPS and re-determine URL resolution, we switch to checking
`if CORPORATE_ENABLED` as a guard, and leave these in-place.

The other side effect of this is that with e54ded49c4, most Zulip
deployments started to 404 requests for `/apps` instead of redirecting
them to `https://zulip.com/apps/` since they no longer had any path
configured for `/apps`.  Unfortunately, this URL is in widespread use
in the app (e.g. in links from the Welcome Bot), so we should ensure
that it does successfully redirect.

Add the `/apps` path to `zerver`, but only if not CORPORATE_ENABLED,
so the URLs do not overlap.
 2022-12-30 17:47:16 -08:00
Alex Vandiver 13ad9e8323 corporate: CORPORATE_ENABLED is always true in corporate.views.portico. 
This is a holdover from when the portico was moved from zerver in
21a2fd482e.
 2022-12-30 17:44:23 -08:00
Anders Kaseorg 73c4da7974 ruff: Fix N818 exception name should be named with an Error suffix. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2022-11-17 16:52:00 -08:00
Lauryn Menard 2e23318872 communities: Include orgs without invite or email domain restrictions. 
Updates the organizations listed in the open communities directory
to also include organizations that do not require an invite and do
not restrict email domains for new users to join the organization.
 2022-10-13 10:11:07 -07:00
Aman Agrawal cdb1db156f portico: Change display name of non-profit org type. 
In the left sidebar, remove `registered` word from the
non-profit category name.
 2022-09-13 10:40:16 -07:00
Aman Agrawal 379c6acbea portico: Add page to list open organizations. 
Fixes #22020
 2022-08-30 16:02:06 -07:00
Aman Agrawal ef21f9107c urls: Move /hello files to the corporate folder. 2022-08-22 15:53:43 -07:00
Aman Agrawal c9ac233911 urls: Move /team files to the corporate folder. 2022-08-22 15:53:43 -07:00
Aman Agrawal 9ce7a784e7 urls: Move /apps files to corporate folder. 2022-08-22 15:53:43 -07:00
Aman Agrawal a5d7a334c4 urls: Move /plans files to corporate folder. 2022-08-22 15:53:43 -07:00
Aman Agrawal 21a2fd482e portico: Move to corporate folder. 
Since the URLs that use these function are present in corporate/urls,
this file belongs in the corporate folder.
 2022-08-22 15:53:43 -07:00