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

530 Commits

Author SHA1 Message Date
Vishnu Ks 3b026559d4 stripe: Make stripe.error stubs more similiar to stripe python lib. 
This will also fix the error that is generated during
the mypy 0.641 upgrade in PR #10691.
 2018-10-22 13:51:05 +05:30
Rishi Gupta 690705858a billing: Update test_upgrade_where_..._fails_at_first to use @mock_stripe. 2018-10-18 11:16:00 -07:00
Rishi Gupta 03d77bc6af billing: Replace instance.save() Stripe API calls with class.save(instance). 
This will make it easier to mock the calls in our new stripe mocking
framework. I believe the two forms are equivalent, assuming the Stripe
Python bindings aren't doing anything crazy. And if not, well hopefully our
new testing framework will catch it :).

[Idea originally from Vishnu KS.]
 2018-10-18 11:16:00 -07:00
Rishi Gupta 80c482428d billing: Update test_upgrade_with_outdated_seat_count to use @mock_stripe. 2018-10-18 10:08:40 -07:00
Rishi Gupta 509707007c billing: Update test_billing_page_permissions to use @mock_stripe. 2018-10-18 09:49:50 -07:00
Rishi Gupta c4bad258f7 billing: Import from mock in test_stripe.py. 
The string 'mock' appears over 200 times in this file. This removes about 80
of them.
 2018-10-17 21:06:09 -07:00
Vishnu Ks 50de59102d billing: Add system to generate fixture data from the billing tests. 
This will improve both the maintainability and accuracy of the fixture
data. It also makes it less scary to upgrade Stripe API versions.

[With significant changes by Rishi Gupta.]
 2018-10-17 20:35:42 -07:00
Vishnu Ks d8c19cb003 models: Move billing models from zilencer to corporate. 2018-10-11 14:54:29 -07:00
Vishnu Ks 59865797ac billing: Move billing tests from zilencer to corporate. 2018-10-01 15:44:02 -07:00
Vishnu Ks c01ebaa8d8 billing: Move billing management commands from zilencer to corporate. 2018-10-01 15:43:55 -07:00
Vishnu Ks 93b398bc0a billing: Move zilencer/lib/stripe to corporate. 2018-10-01 15:43:44 -07:00
Vishnu Ks daf3b46262 billing: Move billing related templates from zilencer to corporate. 2018-10-01 15:43:39 -07:00
Vishnu Ks 6914ee126c billing: Move billing-related views and urls to corporate. 2018-10-01 15:43:21 -07:00
rht c4f09156ff corporate: Remove unused imports (F401). 2017-11-07 16:37:04 -08:00
K.Kanakhin 4891a8d850 Add default response for `terms` and `privacy` endpoints. 
- Add setting for `privacy policy` template defining.
- Configure default templates for `privacy policy` and
  `terms of service` pages.
- Add route for privacy page.
- Remove condition for showing `privacy` and `terms` pages.
- Add `privacy_policy` setting to context processor.
- Add documentaion part for `privacy` and `terms` templates
  configuration.
- Add tests.

Fixes #3686.
 2017-04-12 14:09:14 -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 9cc83f87fc lint: Clean up E241 PEP-8 rule. 2017-01-23 21:21:14 -08:00
Tim Abbott 9fec519b3d Zephyr: Remove obsolete mit.html template. 2016-11-16 17:33:42 -08:00
Umair Khan b140236fcf Django 1.10: Do not use patterns function. 2016-11-04 10:06:00 -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
Umair Khan f9bbc5d6ff Enable i18n support in URL configuration. 
This supports i18n using all of the following:
- I18N urls
- Session
- Cookie
- HTTP header
 2016-05-19 08:33:30 -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
acrefoot 3a982c7c06 Modify /hello to go to register instead of signup on Enterprise 
Also move the urls.py lines to the right place

(imported from commit f9d9805fe599ceffb6cdd1ed572d8656cb0d6d95)
 2013-11-22 13:50:24 -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