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

470 Commits

Author SHA1 Message Date
Yuvi Panda b59b5cac35 Fix TypeError in Google OAuth authenticator. 
requests 1.0 changed response.json attribute to response.json()
instancemethod. The code wasn't updated to match that change,
causing a TypeError when attempting to use the Google OAuth
Authenticator backend.

This is fixed simply by using response.json() instead of response.json.
 2015-09-26 13:51:27 -07:00
Tim Abbott 8967029729 Clean up GitHub API hook v1 comment. 
(imported from commit 3777f2c9305bb8000e5ea4142bd2974805fa3c90)
 2015-09-25 03:18:00 -07:00
Tim Abbott f31816072d Remove last customer-specific hack from github hook. 
(imported from commit 897d9fd91e4f6c558d687f5ae6c360fad80574d9)
 2015-09-25 00:47:15 -07:00
Tim Abbott da5fe944e1 Set limits for export tool. 
(imported from commit 0c582223f5b3ac4caf7685217719d4c32c5d2fae)
 2015-09-24 19:34:28 -07:00
Tim Abbott 38ca08b18f Add support for emphasize_branch_in_topic feature. 
(imported from commit 35a447ee7b94b83bd1c9425c678167003a398ae3)
 2015-09-20 15:21:12 -07:00
Tim Abbott 4a858d7d1b Clean up api_github_v1 logic around issues stream. 
(imported from commit d40997de594834d2ec6f8f190ad04b20bfd45a4c)
 2015-09-20 13:21:15 -07:00
Tim Abbott c5b44dc921 Simplify logic for the GitHub API hook. 
(imported from commit 95dd8e16930f512b13a0413cf18b25694bd6ba66)
 2015-09-20 13:21:15 -07:00
Tim Abbott 32878e8343 Enable GitHub issues messages for all realms. 
(imported from commit 108fddc0b1f8b2d1ae74c09d1e96cff40d8c2ab1)
 2015-09-20 11:49:03 -07:00
Tim Abbott ade363f3af Remove some GitHub hook hacks for old customers. 
These features are in most cases possible to setup directly via our
GitHub services integration UI, and the customers aren't using Zulip
anymore, so this is worth doing to clean up the code.

(imported from commit 1e6f4ec523d85b6233a8e5b4eaa13eacfbe6e5f4)
 2015-09-20 11:46:26 -07:00
Tim Abbott b68d116e3a Remove old is_super_user helper functions. 
(imported from commit 85655ea9369f5dc309f6f687bac578924571c9ee)
 2015-09-20 11:13:20 -07:00
David Roe 3ac95ddc1a Add UserProfile flag to control whether we have a left side userlist. 
Previously this was hardcoded for a single customer.

(imported from commit a6b7095050aa10cef976541505d9b09a35453f48)
 2015-09-19 23:22:59 -07:00
Tim Abbott 21ac93ae9c Remove the send_to_prod hack. 
(imported from commit ba2a4d5e7d83769add979cc05996dbd8b014e8a2)
 2015-09-19 21:54:51 -07:00
Tim Abbott fcec80461b Remove the SSO-only realm integration. 
It's messy code, only one customer ever used it, and it's not in use
today.

(imported from commit af3f512ac6af74af66c588c7d40d699e98514d0a)
 2015-09-19 21:54:51 -07:00
Neeraj Wahi 9f0a6272fa Removed dbx_branding flag and Dropbox corner logo 
(imported from commit d205898671643985e2de7c0d6d300bdca32cae21)
 2015-09-19 15:16:42 -07:00
David Roe 3f7cb34b00 enterprise => voyager 
(imported from commit 04be792bb480d5e5db1c91d296d1000cf1682571)
 2015-08-21 10:33:35 -07:00
David Roe edf7e732a2 ENTERPRISE => VOYAGER. 
(imported from commit 4f8080b9f506a87ca40bef32e39de5218cba916a)
 2015-08-21 10:33:35 -07:00
David Roe d702ddb3cf DEPLOYED => PRODUCTION 
(imported from commit a7d365c07916c5103fc721c712db94f9af977640)
 2015-08-21 10:33:35 -07:00
David Roe 63e576b811 STAGING_DEPLOYED => ZULIP_COM_STAGING 
(imported from commit 25419979292218932c53cface59c1e8e2348a7c2)
 2015-08-21 10:33:35 -07:00
David Roe 8778c4726a Add settings.DEVELOPMENT as a complement of settings.DEPLOYED. 
(imported from commit 0437140d9fee7eec7b28abe583cfe8cde3e07c21)
 2015-08-21 10:33:35 -07:00
Reid Barton ab9539cffe Remove OpenID authentication 
(imported from commit 70a859041a851ed10dc40cfc068330e472d2ed09)
 2015-08-20 23:52:48 -07:00
Reid Barton d88efef74b Fix field name in get_bots_backend 
Django 1.8 noticed that it was wrong.

(imported from commit d9578719e7713c1fd6756b80aac13f4d93f12fa7)
 2015-08-20 23:15:45 -07:00
Reid Barton 0aab583bb1 Django 1.8 compatibility: transactions 
- autocommit is now the default
- commit_on_success is now atomic

(imported from commit b6166ca666ff23d34f2871ca365ce3ec66b0fa86)
 2015-08-20 23:15:45 -07:00
Anders Kaseorg bded0d9d54 Remove corporate beta signup form 
(imported from commit 1b3a0cd8a59a124905fa4cbd3121a78d23aeb3a2)
 2015-08-20 18:40:34 -07:00
David Roe 3515a69e43 Remove public_streams_disabled. 
(imported from commit 1d0c8db92bf8e4c44bd1c96063acfd6eea74925c)
 2015-08-20 18:12:53 -07:00
Kate Buckner 4d0f7c7ea4 Add a user-visible setting for 24-hour time display. 
(imported from commit d934824fd6b72e64a455aac9ff4585b262145f02)
 2015-08-20 17:33:16 -07:00
David Roe bfa70675cb Remove notify_for_streams_by_default. 
(imported from commit 9963c97ffec82fe7cf2921bd51422545c29a8915)
 2015-08-20 17:33:16 -07:00
David Roe 086d8eee22 Add name_changes_disabled realm field. 
(imported from commit 6b04ba2f7ad64c44f2ef18302f0fbd819259d632)
 2015-08-20 15:29:46 -07:00
David Roe 5b7f3466ba Add feature where only admins can invite new users. 
This is controlled through the admin tab and a new field in the Realms table.

(imported from commit e78a6f48160e2a1bbc68d278beb726fe31515266)
 2015-08-20 15:29:46 -07:00
David Roe 809efc4f2b Add realm option to show or not show digest e-mail. 
(imported from commit e9cfe519aa9f2857a1dcc7c75f5e1889834fcb86)
 2015-08-20 15:29:45 -07:00
David Roe e5cb2a468f Enable Lab features for all users 
(imported from commit 4e2658d28a5e02067ad472fec76c66f46592d520)
 2015-08-20 15:29:45 -07:00
David Roe 90e2f5053f Add mandatory topics as a realm option. 
(imported from commit 929a884b8610669aa24a167367b899683e33a045)
 2015-08-20 15:29:45 -07:00
David Roe 472898cfc6 Allow adding users to realms more easily in Dev VM. 
Include new field on Realm to control whether e-mail invitations are required
separately from whether the e-mail domain must match.
Allow control of these fields from admin panel.
Update logic in registration page to use these fields.

(imported from commit edc7f0a4c43b57361d9349e258ad4f217b426f88)
 2015-08-19 22:24:53 -07:00
David Roe 32783ebbfb Admin users in red, at beginning, in dev login view 
(imported from commit 530f0a5d26d5c2b637834281e45adb399852ae0a)
 2015-08-19 22:24:53 -07:00
Jonathan Dahan 6f77e68622 Add GET /export endpoint, which dumps important tables in json. 
Meant to be used in tandem with the manage.py import command.
The following sensitive data is scrubbed:

  * user api keys
  * user password hashes
  * stream email keys
  * invite-only streams
  * messages from invite-only streams
  * messages from users from other domains

(imported from commit 8e58dcdcb80ef1c7127d3ab15accf40c6187633f)
 2015-08-19 15:31:08 -07:00
Tim Abbott f792b67098 Fix send_to_prod redirect to not run on the Dev VM. 
(imported from commit 6006c71348706d39740b0d6302df0a548e65b65e)
 2015-08-18 20:17:47 -07:00
David Roe 46e224997e Add a new dev login page for logging in without a password on the dev VM. 
(imported from commit ac8f2504771c9907b7e92dc91cec5f7220ce951b)
 2015-08-18 20:17:47 -07:00
Zev Benjamin 4d3f0cdc74 Encode unicode strings using UTF-8 before applying search highlighting 
(imported from commit 45ded691fb89ccff12e76d5ca3b593ce3ff3f2e0)
 2015-03-19 15:25:42 -07:00
acrefoot 0b7ef24a34 Add option to explicitly add pagerduty topic 
(imported from commit 39ee1b37a807b19570d494f56bf7557228813ed5)
 2015-02-10 23:56:03 -08:00
Leo Franchi d865732e0d Maintain two APNS connections and send correct notifications to each 
Now we have 2 different Zulip apps out there, and they are signed with
two certs: Zulip and Dropbox. The Dropbox-signed apps are going to need
to be sent APNS notifications from the appropriate APNS connection

(imported from commit 6db50c5811847db4f08e5c997c7bbb4b46cfc462)
 2015-02-11 06:57:25 +00:00
Leo Franchi 64a0b86917 pagerdudy -> pagerduty 
(imported from commit 7cd25db67a8b20875edceafe881c872061a48fab)
 2015-02-10 07:25:46 +00:00
Jason Michalski 3ad140e5a7 Convert all template strings to unicode 
(imported from commit ddf60d53d30a02e1bb87fac35bb45768d17e378c)
 2015-02-08 22:12:33 -08:00
Jason Michalski 179bf06940 The subject is an optional field in the pagerduty API 
Pages from MP are using the description field not the subject field.
Include both in the page if given and don't fail if the key is missing.

(imported from commit 4351e5656d4ea025a03c07c8bb3bb5d406ef2d3d)
 2015-02-08 21:30:19 -08:00
Jason Michalski f4239d60ca Add pagerduty webhook 
(imported from commit 06219066b423f53d08094f3f97a98016e145b2a7)
 2015-02-07 18:16:11 -08:00
Luke Faraone a901677be1 Use a unicode string when grabbing SSO unames 
(imported from commit 5742147003928e2207d9eac8704aa6090fb8cb8a)
 2015-02-06 09:56:39 -08:00
Jason Michalski 6ba5271824 Fix the SSO path to support mirror dummies 
The SSO flow which was never used on a realm with mirror dummies before.
Also change the redirect to stay on the same doain.

(imported from commit 0f1b8a8fcef82ae6eaa5a264686f98d62a683fac)
 2015-01-30 20:07:13 -08:00
Jason Michalski bb9ced6e57 Redirect users on the dropbox realm from stage to prod 
This commit should only be pushed to stage after c290b630e has been
pushed to prod otherwise it will create a redirect loop.

(imported from commit 408407b845ded596705b1abd8ad13c0aedf6d732)
 2015-02-06 00:07:06 -05:00
Jason Michalski 7b82db214c Update the last SSO redirect to use the host header as well 
(imported from commit 4392543d5ea4fd4c29c221338e8c5f7919e40b7c)
 2015-02-05 23:49:33 -05:00
Jason Michalski 01d018ba31 Change the other use of EXTERNAL_HOST in the oauth2 flow 
(imported from commit ff92fcbb43ee19bb2b1520e68c5f6768649246f5)
 2015-02-05 23:32:59 -05:00
Jason Michalski 35d22949ed Build the oauth redirect url with the host from the request 
(imported from commit 972fed686b556bc8845cf7ae5bca555dc9cbeb13)
 2015-02-05 23:14:04 -05:00
Jason Michalski 7e9c121ad3 Use the full_name if available 
We were trying to default the users first name when using google auth,
but it was getting lost when rendering the form.

(imported from commit 710e0c2ce591488920458dca74209c75e7031abd)
 2015-02-05 21:54:28 -05:00