Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
49,441 Commits 28 Branches 142 Tags 698 MiB
Commit Graph

165 Commits

Author SHA1 Message Date
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
Rishi Gupta b4a28f3147 billing: Rename seat_count to licenses where appropriate. 2018-12-22 13:30:15 -08:00
Rishi Gupta 7ab1406962 billing: Prepare for moving Plan to CustomerPlan.billing_schedule. 2018-12-22 13:30:15 -08:00
Vishnu Ks 8176d112fe billing: Add frontend for license-based billing system. 2018-12-22 13:30:15 -08:00
Vishnu Ks 0fd6ff722b billing: Migrate /upgrade endpoint to JSON. 
The fixture changes are because self.upgrade formerly used to cause a page load
of /billing, which in turn calls Customer.retrieve.

If we ran the full test suite with GENERATE_STRIPE_FIXTURES=True, we would
likely see several more Customer.retrieve.N.json's being deleted. But
keeping them there for now to keep the diff small.
 2018-12-13 17:01:12 -08:00
Rishi Gupta 1ba037201c billing: Move all price computations into billing.js. 2018-11-30 11:19:07 -08:00
Rishi Gupta 7523282e48 billing: Move cost calculation from upgrade.html to billing.js. 2018-11-30 11:19:07 -08:00
Rishi Gupta 882cf224f8 billing: Update wording on /upgrade. 2018-11-24 16:06:52 -08:00
Vishnu Ks 189e5e1fbd billing: Add frontend for upgrading by invoice. 2018-11-24 11:56:13 -08:00
Rishi Gupta 6afbc2726f billing: Add billing_modality to upgrade form. 2018-11-24 11:56:13 -08:00
Vishnu Ks 4533f8f962 billing: Make URL hash work in billing page. 
This will change the hash of the URL when a new tab
gets selected. Vice versa when the billing page is opened
the appropriate tab is selected according to hash of
the URL. This means when the card gets updated the
page would be reloaded correctly to show #payment-method
tab.
 2018-11-01 12:50:24 -07:00
Rishi Gupta 458169928c billing: Rename Zulip Premium to Zulip Standard. 2018-10-24 10:42:16 -07:00
Rishi Gupta a4d3606bad billing: Assume we are charging right away when adding new users. 
The actual implementation of the change will be a cron job that runs once a
day and generates invoices for anyone with an account_balance > 0.

There are currently no tests for that part of the flow, so no tests had to
change.
 2018-10-23 16:19:47 -07:00
Vishnu Ks daf3b46262 billing: Move billing related templates from zilencer to corporate. 2018-10-01 15:43:39 -07:00
Yashashvi Dave a80d01f6dc zephyr page: Add style to zephyr page. 2018-09-21 12:42:05 -07:00
derAnfaenger 19bc55aa45 Fix various typos. 
The typos and their corrections were found with the
aid of https://github.com/lucasdemarchi/codespell.
 2017-11-09 16:26:38 +01:00
Aditya Bansal 8555770646 Clean zephyr.html to use 4 space and consistent indentation. 2017-06-06 22:04:55 -07:00
Tim Abbott c7ba9a2ae5 templates: Remove old Zulip, Inc. privacy policy. 
This isn't useful for anything anymore, especially now since we have a
sysadmin-configurable PRIVACY_POLICY settings.
 2017-05-03 17:59:53 -07:00
Umair Khan a45f8b463a app_filters.py: Use Django to load template. 
This commit allows us to load template using Django in
render_markdown_path.
 2017-04-07 15:52:15 -07:00
Tim Abbott bd6f71580e docs: Remove obsolete terms-enterprise page. 
This was documentation for the old zulip.com enterprise service that
no longer exists.
 2017-01-28 18:12:19 -08:00
Tim Abbott 9fec519b3d Zephyr: Remove obsolete mit.html template. 2016-11-16 17:33:42 -08:00
Tim Abbott dde6452638 Zephyr: Fix links to the old zulip.com service. 2016-11-16 17:33:13 -08:00
Tim Abbott 7950d3181e zmirror: Fix hardcoding of zulip.com support email address. 
We now use support_email == settings.ZULIP_ADMINISTRATOR just like
every other support email address reference.
 2016-08-18 18:36:07 -07:00
Tim Abbott 8d05aec4de zephyr-mirror: Eliminate use of old Humbug name. 2016-08-17 22:19:53 -07:00
Tim Abbott bc7c9a5bbb corporate: Update Zephyr mirroring docs. 2016-08-17 22:19:53 -07:00
acrefoot b7ccf64c79 Move Zulip's TOS to TERMS_OF_SERVICE markdown file. 
This reimplements zulip.com/terms using the new markdown system.
 2016-07-29 20:47:42 -07:00
Luke Faraone 5c28b0340a Don't show Zulip.com terms on other sites 
While we already don't link to /terms anywhere on the site, they can still be
accessed if you navigate to /terms directly. Now, those routes will only be
exported on the Zulip.com service.

We should ideally provide a mechanism for deployments to specify their own
terms without modifying source code; in the interim, sites that have already
customised the provided Zulip.com terms can simply carry a patch reverting this
commit.
 2016-03-21 05:46:28 +00:00
Anders Kaseorg bded0d9d54 Remove corporate beta signup form 
(imported from commit 1b3a0cd8a59a124905fa4cbd3121a78d23aeb3a2)
 2015-08-20 18:40:34 -07:00
Anders Kaseorg cb88147ca9 Remove corporate marketing page 
(imported from commit 24128853fd78ef9e89df7f3353f45ac2531a42e1)
 2015-08-20 18:40:34 -07:00
Anders Kaseorg 1b5f9e4374 Remove corporate jobs pages 
(imported from commit 3f1789f6a4f90a33ddd2352fab85d3cf751b0f46)
 2015-08-20 18:40:34 -07:00
Waseem Daher 202ac0fe10 Restyle /hello to be more consistent with current app style. 
(imported from commit 7e1df8cb885908f40569692283e98ac851ca3d2e)
 2014-03-14 20:48:51 -04:00
Waseem Daher 4eded59dbe Revert "signup: point to /register at the top too." 
This reverts commit 517df29d10182c05780017c15225c9f95b844225.

(imported from commit 7820bb2dad7010579342450040d0f5c72ad2c627)
 2014-03-14 20:48:51 -04:00
Jessica McKellar 1c5110dbad Send you a registration email if you try to sign up for an existing realm. 
(imported from commit 9104096b424f31a22ee7c8b72378f05309bb978b)
 2014-01-31 16:40:19 -05:00
Jessica McKellar 7c788c1a17 signup: point to /register at the top too. 
The message to use /register if your group is already signed up is
below the fold on my laptop -- this probably contributes to people
trying to sign up their group when they are just trying to register.

(imported from commit 517df29d10182c05780017c15225c9f95b844225)
 2014-01-31 16:40:19 -05:00
Luke Faraone d6c1bbb5fa Update employee count on jobs page. 
Go with an approximate number to avoid twiddling this at least for a few
months :)

(imported from commit d6834d68ae17b0a3cd1229f5d111988851707958)
 2014-01-17 11:16:06 -05:00
acrefoot c30f2bbe3e slightly stricter linting of html templates 
(imported from commit 5bd0aa3c49d6ff95559a73bd5f134cc50ae98ce9)
 2013-12-17 12:05:23 -05:00
acrefoot f943d3c351 Move /features, /hello from corporate to zerver 
This makes these pages available on Enterprise installs too

(imported from commit 4eaca13dfa0de8a05829ac5d642cbdb1e581add9)
 2013-11-22 13:50:24 -05:00
Steve Howell 1c91d1a5bc Clean up back end HTML templates. 
The check-handlebars-templates script now looks at most of our
back end templates to try and find imbalanced tags.  This commit
fixes a bunch of the existing templates.

(imported from commit fad4a5d85d68160370dd588b41d6f125f64d198f)
 2013-11-19 10:43:56 -05:00
Waseem Daher 5a1d779450 signup: Make "product" input form slightly bigger. 
"Carrier pigeon" and "smoke signals" weren't fitting.

(imported from commit b7bb0129333637ffc864c2ee1ea67afb597f1435)
 2013-11-06 13:22:00 -05:00
Steve Howell c3d176a480 Move marketing pages to corporate app. 
(imported from commit 70528b544ceb4be12fb02be32889e1b9ca8caeb4)
 2013-11-06 12:07:32 -05:00
Steve Howell 6193f60d45 Move static MIT-related pages to corporate app. 
(imported from commit e2c5f72d3f3e4d8f8fa888326b2ba455beb9156c)
 2013-11-06 12:07:31 -05:00
Steve Howell a827d727cc Create non-localserver "corporate" app with jobs pages. 
The corporate "app" is not a full-fledged Django app, but it has
a urls.py and a templates directory.  This commit creates the app
and moves the jobs pages into it.  Localserver deployments will
not see any of the corporate code.

(imported from commit 35889c3cf92329258c30741fdfa564769a4fac1a)
 2013-11-06 12:07:31 -05:00