paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,594 Commits 30 Branches 160 Tags
a13e42f18a445535726d19159a5cbffdd5352766
Commit Graph

55594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anders Kaseorg
a13e42f18a docs: Add missing spaces around code spans. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2023-12-14 00:05:44 -08:00
Aman Agrawal
10ef308848 migrate_server_to_realm: Reset server tier during migration. 2023-12-13 22:29:30 -08:00
Aman Agrawal
a5311c8032 stripe: End legacy plan before approving full sponsorship. 2023-12-13 22:29:30 -08:00
Alex Vandiver
612f2c73d6 send_custom_email: Support JSON extra context with remote servers. 2023-12-13 22:28:20 -08:00
Alex Vandiver
2863b5954e send_custom_email: Make --json an additional filter, not a target. 2023-12-13 22:28:20 -08:00
Alex Vandiver
2de1a23721 send_custom_email: Provide an unsubscribe link for remote servers. 2023-12-13 22:28:20 -08:00
Alex Vandiver
791d66fe28 send_custom_email: Split out the sending to remote servers. 2023-12-13 22:28:20 -08:00
Alex Vandiver
62e6b10ecd send_email: Pull admins_only back into send_custom_email filtering. 
There is no reason for this to be an explicit argument to
send_custom_email, when the rest of the filtering already happens
upstream.
 2023-12-13 22:28:20 -08:00
Alex Vandiver
1229e38a0d send_custom_email: Stop lying about the type of options. 
Saying `**options: str` is a lie, since it contains bools.  We pluck
out the two bools that we need properly typed because we will be
pushing them into function calls, and type them explicitly as bools.
 2023-12-13 22:28:20 -08:00
Tim Abbott
bfa3d144eb zilencer: Don't try to migrate ended plans. 2023-12-13 17:55:00 -08:00
Tim Abbott
b8deb44a05 zilencer: Fix mismigrated plan type assertion. 2023-12-13 17:55:00 -08:00
Tim Abbott
d040664952 billing: Set the legacy plan type when migrating. 2023-12-13 16:40:44 -08:00
Tim Abbott
6308e07e53 billing: Standardize remote server plan type IDs. 
This will likely save us at least one headache.
 2023-12-13 16:40:44 -08:00
Lauryn Menard
89545891f6 support: Filter remote realm data query for customer realm None. 2023-12-13 14:36:23 -08:00
Lauryn Menard
a897d68d93 support: Add active plan information to remote server activity. 
Adds three columns to the remote server activity chart and updates
the chart key for the third of those columns.

The first is the plan name. If there are multiple plans with a
status under the live threshhold, then we send "See support view".

The second is the plan status. If there are multiple plans, then
we send "Multiple plans".

The third is the estimated annual revenue for the plan. Note that
for free trials, this will be calculated as if the plan was paid
for 12 months (so a full year).

If there is no plan for the server under the live threshold or at
all then "---" is inserted into the table row. Note that 100%
sponsored servers/realms would fall into this category.
 2023-12-13 13:43:00 -08:00
Lauryn Menard
484c0df076 corporate: Move renewal_amount to BillingSession framework. 2023-12-13 13:43:00 -08:00
Tim Abbott
1abe22b0a1 mailmap: Add entry for Rohan Gudimetla. 2023-12-13 13:28:19 -08:00
Sahil Batra
f0d429d0f9 remote_server: Handle data of non existent realms. 
This commit adds code to make sure that the push
notification does not crash on receiving data for
a non-existent realm.
 2023-12-13 13:13:12 -08:00
Tim Abbott
c43eb10224 mailmap: Add entry for Viktor Illmer. 2023-12-13 12:54:54 -08:00
Karl Stolley
09c32cbe30 Revert "portico: Disable self-hosted tab for logged-in cloud users." 
This reverts commit 857630707a.
 2023-12-13 12:23:02 -08:00
Lauryn Menard
68d117e60a support: Add sponsorship request information to remote support view. 2023-12-13 10:28:11 -08:00
Lauryn Menard
e8500fbdb0 support: Include sponsorship request for remote server support view. 
Preparation for updating the sponsorship forms template to include
information about the latest sponsorship request if sponsorship is
pending.
 2023-12-13 10:28:11 -08:00
Aman Agrawal
35b644c564 populate_billing_realms: Don't create plan for sponsored remote realm. 2023-12-13 08:13:33 -08:00
Aman Agrawal
9efb236c35 remote_billing_page: Fix redirects for self hosted login. 2023-12-13 08:13:33 -08:00
Aman Agrawal
081d94c4e8 stripe: Add user and org metadata to stripe payments. 2023-12-13 08:13:33 -08:00
Aman Agrawal
039f6af79e billing: Link plan name to /plans page. 2023-12-13 08:13:33 -08:00
Aman Agrawal
998685f2e7 sponsorship: Show sponsored plan name for sponsored orgs. 
The `plan_name` is incorrect here since the customer will not
have an active plan for approved sponsorship.
 2023-12-13 08:13:33 -08:00
Aman Agrawal
0c99420ceb stripe: Don't approve sponsorship for customers on paid plan. 
This would avoid us accidentally approving sponsorship for customers
on paid plan.
 2023-12-13 08:13:33 -08:00
Sayam Samal
c61b353b4b gear_menu_popover: Update the rocket icon used for plan and pricing. 
Fixes #28163.
 2023-12-13 07:59:13 -08:00
Sahil Batra
27d236fb52 popover: Fix user popover and profile for bot with inaccessible users. 
We incorrectly passed bot owner ID to get_bot_owner_user instead of
the bot object.
 2023-12-13 00:45:20 -08:00
Tim Abbott
95f4b31ce7 billing: Don't require data to add to legacy plan. 2023-12-13 00:44:50 -08:00
Tim Abbott
af83093a65 billing: Remove some stale TODOs. 2023-12-13 00:33:37 -08:00
Aman Agrawal
45a2f7eac1 portico: Pass requested sponsorship context to plan page. 2023-12-12 23:27:39 -08:00
Sayam Samal
7f26905fe0 compose_actions: Hide compose box when navigating to inbox/recent view. 
Currently, given that the compose box is already open, it stays open
when the user navigates to the inbox/recent view, even when there is
no modifications to the message or recipients.

This commit adds conditions to close the compose box when navigating
to the inbox/recent view, except when we can reasonably infer that it
was the intended action.
 2023-12-12 22:56:53 -08:00
Tim Abbott
f281199d2f billing_session: Push nocoverage comments down a layer. 2023-12-12 22:03:24 -08:00
Aman Agrawal
63f4fc51de server_deactivate: Show error message for server on active plan. 2023-12-12 21:00:42 -08:00
Aman Agrawal
c2636354a5 remote_billing_login: Show different title for deactivate login. 2023-12-12 21:00:42 -08:00
Alex Vandiver
19575b46f7 remote_activity: Hide deactivated remote servers. 2023-12-12 20:36:03 -08:00
Aman Agrawal
0d08fe90a8 remote_billing_email_confirm: Minor text changes. 
* Move email early in text to reduce change of it wrapping to
  next line.

* Change 2 hours to 24 hours.
 2023-12-12 20:32:42 -08:00
Karl Stolley
180dd00d5f portico: Update strings for RemoteRealm login flow. 2023-12-12 20:32:42 -08:00
Alex Vandiver
44e9171a46 register_server: POST requests take data, not params. 
This currently _works_, but only because we are very forgiving about
how we parse requests.
 2023-12-12 19:58:19 -08:00
Lauryn Menard
aebafcc43f corporate: Show error page if mobile push data has not been uploaded. 
Adds a template that displays an error message when the billing
or upgrade context for a remote server or remote realm raises a
MissingDataError.
 2023-12-12 19:36:06 -08:00
Aman Agrawal
e9ce69aaf6 populate_billing_realms: Call sessions with billing_user. 2023-12-12 17:31:41 -08:00
Aman Agrawal
da74b9ade7 billing: Apply common styles to billing pages. 2023-12-12 17:31:41 -08:00
Karl Stolley
9cc0ded092 portico: Correct layout on deactivation pages. 2023-12-12 17:31:41 -08:00
Karl Stolley
2b879e646c portico: Move billing contact to above payment method. 2023-12-12 16:24:56 -08:00
Alya Abbott
a2f72edc68 email: Update strings in remote_realm log in confirmation email. 2023-12-12 14:51:00 -08:00
Mateusz Mandera
e515574b3e remote_billing: Add endpoint and a helper to make deactivation links. 
This is a general link for logging into the billing system on behalf of
a server, but it's tied to the .contact_email and takes the user
straight to the /deactivate/ page via the next_page mechanism.
 2023-12-12 13:31:59 -08:00
Tim Abbott
fa9e3fb35c version: Update version after 8.0-beta2 release. 2023-12-12 12:28:02 -08:00
Tim Abbott
555cdd0a57 Release Zulip Server 8.0-beta2. 8.0-beta2 2023-12-12 12:17:56 -08:00