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

191 Commits

Author SHA1 Message Date
Aman Agrawal ef21f9107c urls: Move /hello files to the corporate folder. 2022-08-22 15:53:43 -07:00
Aman Agrawal 07f0104714 urls: Move /security files to the corporate folder. 2022-08-22 15:53:43 -07:00
Aman Agrawal 8da5368529 url: Move /self-hosting pages to the corporate folder. 2022-08-22 15:53:43 -07:00
Aman Agrawal c908c9b497 urls: Move /why-zulip pages to the corporate folder. 2022-08-22 15:53:43 -07:00
Aman Agrawal d15158e76b urls: Move /history 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 349bac4751 urls: Move /attribution files to the corporate folder. 2022-08-22 15:53:43 -07:00
Aman Agrawal 7cd8bcd004 urls: Move /development-community files to 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 4a9b4fb91b urls: Move /features 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 afd31b739d templates: Move case-studies and /for pages to corporate folder. 
Since these pages don't belong in a self-hosted server.
 2022-08-22 15:53:43 -07:00
Alya Abbott 7be4146980 corporate: Add Senior Frontend Engineer job opening to /jobs. 2022-07-27 16:36:14 -07:00
Alya Abbott 8f316ce4e8 corporate: Remove technical writer job opening. 2022-07-27 16:36:14 -07:00
Alya Abbott ede6699d83 portico: Remove Senior Infrastructure Engineer position from /jobs. 2022-06-23 16:11:09 -07:00
Alya Abbott 15ae18fffa portico: Make minor updates to Senior Mobile Engineer job listing. 2022-05-27 14:56:24 -07:00
Aman Agrawal 7614f2203a pricing: Replace "Zulip Standard" with "Zulip Cloud Standard". 
Case sensitive replace.
 2022-02-09 11:00:24 -08:00
Anders Kaseorg b0ce4f1bce docs: Fix many spelling mistakes. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2022-02-07 18:51:06 -08:00
Alya Abbott 98de9b7843 policies: Remove unused definition from Terms of Service. 2022-02-07 14:37:33 -08:00
Alya Abbott 48ad52fa6d policies: Add change history links. 2022-02-07 12:15:21 -08:00
Aman Agrawal 37d7d6ccd4 tos: Adjust migration tos to look same as our new standard tos. 2022-02-04 15:48:38 -08:00
Alex Vandiver ca0bf10712 portico: Add an infra engineer position. 2022-02-03 09:42:34 -08:00
Alex Vandiver 9cc61a56dc portico: Remove an unnecessary <p>..</p>. 2022-02-03 09:42:34 -08:00
Alex Vandiver 490862922e portico: Remove designer position. 2022-02-03 09:42:34 -08:00
Alex Vandiver 157cbca1e0 corporate: Fix links for move in c4eede68d6. 2022-01-25 19:00:44 -08:00
Eeshan Garg 3b9455c9ce billing: Make all buttons the same size. 
Previously, the "Add Card" button was significantly larger than
the "Buy Standard" and "Submit" buttons.
 2022-01-19 16:11:31 -08:00
Mateusz Mandera a812d93c24 corporate: Fix wrong hyperlink in /policies/terms. 2022-01-18 12:36:30 -08:00
Tim Abbott 40ea121f50 policies: Fix heading for pre-2022 policies. 2021-12-13 22:44:34 -08:00
Tim Abbott e2670b76bb corporate: Add inline link to DPA. 2021-12-13 22:44:10 -08:00
Alya Abbott 64aa278249 portico: Update designer job description. 2021-12-13 12:00:38 -08:00
Alya Abbott 0836b51738 policies: Update Kandra Labs policies pages. 2021-12-10 17:56:12 -08:00
Tim Abbott ee77c6365a portico: Use /help/ style pages for displaying policies. 
This replaces the TERMS_OF_SERVICE and PRIVACY_POLICY settings with
just a POLICIES_DIRECTORY setting, in order to support settings (like
Zulip Cloud) where there's more policies than just those two.

With minor changes by Eeshan Garg.
 2021-12-10 17:56:12 -08:00
Tim Abbott 95854d9d94 terms: Rename and tweak FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE. 
We do s/TOS/TERMS_OF_SERVICE/ on the name, and while we're at it,
remove the assumed zerver/ namespace for the template, which isn't
correct -- Zulip Cloud related content should be in the corporate/
directory.
 2021-12-10 17:56:12 -08:00
Eeshan Garg 5aaeb1a432 use_cases: Rename /for/companies to /for/business. 2021-12-09 17:16:52 -08:00
Tim Abbott f533097487 corporate: Remove stray li closing tag. 2021-12-06 17:36:10 -08:00
Tim Abbott 9a7b9c8109 corporate: Add Zulip Cloud privacy policy and terms of service. 
Including these in the project makes it easier to do development on
the Terms/Privacy section of the Zulip website.
 2021-12-06 17:14:03 -08:00
Steve Howell ebf73b8692 templates: Tweak some templates. 
I remove some spurious whitespace and a stray period
in zephyr-mirror, and then for all three I try to
line-wrap/indent in a way that's nicer for humans
and parsers to read.
 2021-12-04 15:35:24 -08:00
Alya Abbott 3ee3621b62 portico: Edit designer job description based on feedback. 2021-12-03 17:16:29 -08:00
Steve Howell 2f0f27b841 templates: Fix minor whitespace errors. 
(we also add validation)
 2021-12-02 09:49:10 -08:00
Steve Howell 5b75a7373c minor: Clean up jobs.html template. 2021-12-02 09:49:10 -08:00
Alya Abbott 5f2ea69b9f jobs: Update designer job description. 2021-12-01 13:12:21 -08:00
Steve Howell 2134a26873 templates: Clean up zephyr-mirror.html. 
This allows us to eliminate conditionals related
to ignoring files and checking indentation.
 2021-11-24 13:56:41 +00:00
Steve Howell fdd63546b2 linters: Rewrite check-templates. 
I rewrote most of tools/lib/pretty-printer.py, which
was fairly easy due to being able to crib some
important details from the previous implementation.

The main motivation for the rewrite was that we weren't
handling else/elif blocks correctly, and it was difficult
to modify the previous code. The else/elif shortcomings
were somewhat historical in nature--the original parser
didn't recognize them (since they weren't in any Zulip
templates at the time), and then the pretty printer was
mostly able to hack around that due to the "nudge"
strategy. Eventually the nudge strategy became too
brittle.

The "nudge" strategy was that we would mostly trust
the existing templates, and we would just nudge over
some lines in cases of obviously faulty indentation.

Now we are bit more opinionated and rigorous, and
we basically set the indentation explicitly for any
line that is not in a code/script block. This leads
to this diff touching several templates for mostly
minor fix-ups.

We aren't completely opinionated, as we respect the
author's line wrapping decisions in many cases, and
we also allow authors not to indent blocks within
the template language's block constructs.
 2021-11-23 15:55:54 -08:00
Alya Abbott bd1f3ced4f portico: Clarify on /jobs that openings are remote-friendly. 2021-11-16 16:23:13 -08:00
Alya Abbott fb94e959c8 portico: Update jobs page. 
Note from tabbott: It's not clear we want fundamentally dynamic
corporate website elements like this jobs page to be in zulip/zulip,
but there's even less reason for there to be an out-of-date copy there.
 2021-11-15 17:19:05 -08:00
Vishnu KS 6c06858e02 billing: Migrate to Stripe hosted checkout page. 2021-11-05 17:23:10 -07:00
Eeshan Garg 763b3c27d6 corporate: Add contact support page. 2021-10-01 17:30:01 -07:00
Eeshan Garg a808f02a22 billing/sponsorship: Allow blank organization URLs. 
We ran into a bug in production caused by two issues:
- Some users came from orgs that didn't have a website and since
  the URL field was required, they submitted invalid URLs.
- We didn't properly respond to invalid form submissions, which
  led to UnboundLocalError exceptions in another part of the
  code.

This commit solves this by doing the following:
- We now allow blank URLs and have a convenient placeholder text
  label that tells users that they may leave the URL field blank.
- This commit refactors the code such that invalid form submissions
  result in an informative error message about what exactly went
  wrong.
 2021-08-19 03:08:17 -07:00
Tim Abbott 9fb5149f78 billing: Select the models organization type by default. 
Probably in an ideal world, something should make sure these values
are the same.
 2021-07-18 20:48:50 -07:00
Tim Abbott d7ef0c7232 billing: Fix options and help text for sponsorship requests. 
This makes several changes:

* Fixes a bug where the help text explaining our policies was not displayed.
* No help text was defined for many organization types.
* Copy-edits the help text somewhat.
* Offers all of the organization type options.
* Removes the 100% coverage requirement because it's annoying to test
  the e.currentTarget click handler.
 2021-07-18 20:48:27 -07:00
Eeshan Garg 0ac7d7d21d corporate: Store sponsorship request data in the database. 
We are starting to run into situations where this data could be
quite useful for making future decisions, so it makes to store it
in the database, not just in an email.
 2021-07-15 10:31:03 -07:00
Vishnu KS 5ad50b19cb billing: Show billing email in /billing page. 2021-05-18 17:46:38 -07:00
Vishnu KS 323ad83d98 billing: Allow updating licenses of plans on manual license management. 2021-05-14 15:10:02 -07:00
Vishnu KS 45f7a25351 billing: Rename licenses_used variable to seat_count. 2021-05-14 15:10:02 -07:00
Anders Kaseorg e015f3ed7d docs: Correct “webapp” to “web app”. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2021-05-14 13:15:38 -07:00
Anders Kaseorg dd3fa4ac52 templates: Mark all void tags as self-closing. 
This reverses the policy that was set, but incompletely enforced, by
commit 951514dd7d.  The self-closing tag
syntax is clearer, more consistent, simpler to parse, compatible with
XML, preferred by Prettier, and (most importantly now) required by
FormatJS.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2021-04-21 09:49:34 -07:00
Anders Kaseorg 72d6ff3c3b docs: Fix more capitalization issues. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-10-23 11:46:55 -07:00
Anders Kaseorg dd48dbd912 docs: Add spaces to “check out”, “log in”, “set up”, “sign up” as verbs. 
“Checkout”, “login”, “setup”, and “signup” are nouns, not verbs.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-10-13 15:47:13 -07:00
Vishnu KS d3c7277f77 billing: Show sponsorship message for organization on STANDARD_FREE. 
Fixes #16180
 2020-08-24 18:25:01 -07:00
Anders Kaseorg 6dea085187 docs: Correct “login” as a verb to “log in”. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-08-11 10:25:53 -07:00
Anders Kaseorg fb2e56e3c9 docs: Fix capitalization of keyboard keys. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-08-11 10:25:53 -07:00
Anders Kaseorg c155403884 docs: Fix various capitalization errors. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-08-11 10:25:52 -07:00
Vishnu KS e736bc3ec6 sponsorship: Ensure that all the fields are filled in form. 2020-07-31 10:36:53 -07:00
Vishnu KS cb01a7f599 billing: Restrict access to billing page to realm owners and billing admins. 2020-07-22 16:57:49 -07:00
Anders Kaseorg c2f9db4602 logo: Update Zulip logo. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-07-16 01:37:08 -07:00
Vishnu KS 4c6350fa4b billing: Add option to request a sponsorship in /upgrade. 2020-07-01 16:45:38 -07:00
Vishnu KS cde4486f8c billing: Support switching from monthly to annual plan. 2020-06-18 17:34:03 -07:00
Vishnu KS 98cd52cc3e billing: Mention how the licenses are managed in /billing. 2020-06-18 16:30:48 -07:00
Tim Abbott 7b8ba5ebd9 docs: Update most remaining references to zulipchat.com. 
In some cases, the cleanest tweak is to replace references to the
domain with Zulip Cloud, the product.
 2020-06-08 18:10:45 -07:00
Tim Abbott 4d2b1673f8 docs: Replace support@zulipchat.com with support@zulip.com. 
The new address is cleaner and shorter.
 2020-05-28 08:14:30 +00:00
Tim Abbott 368e9572cc billing: Clean up copy on free trial pages. 
This fixes some issues with unclear terminology and visual styling in
the pages for the new free trial.

There's probably more we can and should usefully do in the future.
 2020-05-26 21:31:07 -07:00
Vishnu KS be831e0085 free trial: Hide free trial message during payment processing. 2020-05-26 17:01:32 -07:00
Vishnu KS 8784539d53 free trial: Send users to /upgrade after realm creation. 2020-05-26 17:01:32 -07:00
Vishnu KS ad99bba121 billing: Add emojis to /upgrade page. 2020-05-24 17:35:17 -07:00
Vishnu Ks 66b1ad7002 billing: User FREE_TRIAL_DAYS instead of FREE_TRIAL_MONTHS. 2020-05-16 14:52:01 -07:00
Vishnu KS 8fb1f2af58 billing: Support downgrading plan from /billing page. 2020-05-11 17:20:54 -07:00
Vishnu KS f1b1bf5a0d billing: Add support for Zulip Standard free trial. 2020-05-11 17:20:54 -07:00
Steve Howell cf78cb0d6e templates: Use `<hr>` and `<br>` consistently. 
We now prevent these variations:

    * <hr/>
    * <hr />
    * <br/>
    * <br />

We could enforce similar consistency for other void
tags, if we wished, but these two are particularly
prevalent.
 2020-04-28 17:05:48 -07:00
Vishnu KS a9c1fa25d6 upgrade: Set the default billing period to monthly. 2020-04-17 08:57:15 -07:00
Vishnu KS 3f94195d51 billing: Show appropriate message when not on a paid plan. 2020-04-16 19:28:37 -07:00
Vishnu KS 05b4610381 bots: Remove feedback cross realm bot. 
This completes the remaining pieces of removing this missed in
d70e799466 (mostly in tests).
 2020-01-25 22:54:44 -08:00
Anders Kaseorg fda70a5458 templates: Use just one webpack entry point per page. 
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
 2019-10-28 15:53:15 -07:00
Anders Kaseorg 7494f1600c templates: Move page_params from an inline script to the <body> dataset. 
This sidesteps tricky escaping issues, and will make it easier to
build a strict Content-Security-Policy.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
 2019-09-17 16:06:33 -07:00
Anders Kaseorg 9b38bcc2a6 templates: Abstract render_bundle behind a Jinja2 macro. 
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
 2019-09-17 16:06:33 -07:00
Alexandra Ciobica 62a1e988f7 portico: Add `.markdown` class to `why-zulip` pages. 2019-07-25 15:04:09 -07:00
Vishnu Ks 8c249644b1 billing: Seperate out tests for invoice and autopay form fields. 2019-05-30 10:34:56 -07:00
Vishnu Ks e40addd181 jobs: Mention the email ID for applying to job. 2019-05-24 15:50:41 -07:00
Greg Price de66b3b0f1 corporate: Add a /jobs page, with job posts for mobile/fullstack. 
With various edits from Rishi and Tim.
 2019-05-22 22:20:58 -07:00
Rishi Gupta 81745ba171 billing: Show licenses_used and better renewal information on /billing. 2019-01-29 07:38:24 -08:00
Rishi Gupta 6a1017ea94 billing: Update text on /upgrade. 2019-01-29 06:30:19 -08:00
Vishnu Ks 2547d4ea07 billing: Remove mix option from frontend. 2019-01-04 23:52:00 +05:30
Vishnu Ks d94b0da3c8 billing: Separate billing.js into multiple modules. 2019-01-04 23:52:00 +05:30
Vishnu Ks 806fa1a834 billing: Make card change use create_ajax_request. 2018-12-30 08:00:23 +05:30
Vishnu Ks 41fbc699ad billing: Make invoice upgrade use create_ajax_request. 2018-12-30 08:00:23 +05:30
Vishnu Ks 938438364f billing: Use form.serializeArray in create_ajax_request. 2018-12-30 08:00:23 +05:30
Vishnu Ks 93b1795ed1 billing: Don't pass csrf token in Ajax requests. 
The Ajax request will automatically fetch the value
from input[name='csrfmiddlewaretoken'] and set the
headers. This is done in csrf.js.
 2018-12-30 08:00:23 +05:30
Vishnu Ks ed196bb980 billing: Rename #invoice_seat_count to #invoiced_licenses. 
Followup of b4a28f3147
 2018-12-30 08:00:23 +05:30
Vishnu Ks eebf526657 billing: Check for min license count in frontend. 2018-12-30 08:00:23 +05:30
Rishi Gupta 653416ab23 billing: Update /billing to work with new subscription model. 2018-12-23 00:18:21 -08:00
Rishi Gupta e7220fd71f billing: Do subscription management in-house instead of with Stripe Billing. 
This is a major rewrite of the billing system. It moves subscription
information off of stripe Subscriptions and into a local CustomerPlan
table.

To keep this manageable, it leaves several things unimplemented
(downgrading, etc), and a variety of other TODOs in the code. There are also
some known regressions, e.g. error-handling on /upgrade is broken.
 2018-12-22 13:39:30 -08:00