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

176 Commits

Author SHA1 Message Date
Kevin Mehall ca182ec062 Link to streams in notification bot messages. 
It's a little weird that these still open in a new tab, but it might
be best to keep them consistent with all other links?

This is a first pass on Trac #1927.

(imported from commit 390bdef790a83af4240ad5f5a82e572ef5824756)
 2013-11-25 16:12:57 -05:00
Jessica McKellar dbc1b4b501 Add a one-click unsubscribe link to missed message e-mails. 
(imported from commit 719eb61c9b7722eb1b0996b4d5f2f8f5929ad701)
 2013-11-25 15:18:40 -05:00
acrefoot 4cd1d69ea0 Add the ability to unsubscribe all users from a stream 
This resolves Trac #2022

(imported from commit 23d5129a6bec40c33eaf71953cd41ec387646a39)
 2013-11-22 17:12:51 -05:00
Luke Faraone dff03fafda Use LDAP-provided information if available for real names 
If authoritative data is available from say the LDAP database, we now
ignore the POSTed user name, and don't offer it as a form field.

We fall back to giving the user a text field if they aren't in LDAP.

If users do not have any form fields to fill out, we simply bring them
to the app without the registration page, logging them in using a dummy
backend.

(imported from commit 6bee87430ba46ff753ea3408251e8a80c45c713f)
 2013-11-22 16:51:26 -05:00
Luke Faraone af02e45a17 [manual] Support authentication and profile prefilling via LDAP 
The latter doesn't depend on the former; we can still fill in your full
name even if you didn't authenticate via LDAP.

This commit requires django_auth_ldap to be installed. On Debian
systems, you can do so via APT:
    sudo apt-get install python-django-auth-ldap

On OS X, use your favourite package manager. For pip, I believe this
will work:
    pip install django_auth_ldap

django_auth_ldap depends on the "ldap" Python package, which should be
installed automatically on your system.

(imported from commit 43967754285990b06b5a920abe95b8bce44e2053)
 2013-11-22 16:51:26 -05:00
Jessica McKellar ae2202caad Update bankruptcy unread count to not include muted topics or read messages. 
This should address user reports of huge bankruptcy counts even when
they are relatively caught up. The root issue is that we sometimes
don't mark messages as read for some reason.

(imported from commit 8799305a8665f9ee239575e6e95f603f89c1d427)
 2013-11-21 13:01:01 -05:00
Tim Abbott 3caee45cf4 Fix missing support email address in signup notifications. 
(imported from commit f1a4fbe5fbc68292080f87960f038fe530ba87e2)
 2013-11-20 11:01:11 -05:00
Jessica McKellar d1619b3f3c Use a more accurate "is admin?" check. 
UserProfile.show_admin was intended to be a check for users that have
administrative rights in other realms, which we've harmlessly but
erroneously been using to check if they are an admin in their realm.

Use the more straightforward check instead, with a more intuitive
name.

(imported from commit d81050c7dbbb19e59c5e31750be303a4630e1456)
 2013-11-19 14:31:02 -05:00
Tim Abbott c66113104c Clean up logging of send times to not waste a log line. 
(imported from commit 824488a323a4361ef058f27da6e0768dffc43b6d)
 2013-11-18 18:05:19 -05:00
Tim Abbott f3fa78d30c Rename do_[rd]activate to do_[rd]activate_user. 
For similarity with do_activate_user.

(imported from commit 2874af84dbe1ce666de10e0d8ffe2daa8bad9731)
 2013-11-16 11:35:26 -05:00
Tim Abbott a78ec1d0d3 get_members_backend: Report a bit more data on users. 
(imported from commit af1c2a30abed4aa2796f0babe311f993965a008b)
 2013-11-16 11:35:26 -05:00
Steve Howell 0b16dfc999 Add /json/users/<email>/reactivate endpoint. 
(imported from commit 7afa29f7718430ea2df7c489ab2af4d93d4ce497)
 2013-11-16 11:35:25 -05:00
acrefoot 1a904185f2 fix path for do_confirm redirect 
(imported from commit d61d8f155fc06fbadc68155f32f510e212adf6c0)
 2013-11-15 21:31:37 -05:00
Tim Abbott 337c22f9e1 Fix redirects landing newly registered users at :8888/accounts/do_confirm. 
This is similar to the related issue we had with the remote_user_sso
codepath.

(imported from commit 5c2c99be9699a1bce88c4a7de15dae4348fc7967)
 2013-11-15 15:04:13 -05:00
Leo Franchi 7f2936a985 Allow enterprise customers to disable name changes 
(imported from commit 1f2039f3e88a4ec0cc48dba75f714563c1de4af8)
 2013-11-15 11:26:10 -05:00
Kevin Mehall 53c76aa657 Move enterprise-registration to zilencer/ from zerver/ 
(imported from commit d8a58913040376dbdbc9dcee13ab8a7910733da7)
 2013-11-15 11:21:52 -05:00
Tim Abbott 52ca432745 remote_user_sso: Redirect to EXTERNAL_HOST, rather than a relative /. 
This fixes a problem where the desktop app would attempt to load
https://zulip.akam.ai:8888/ after authenticating the user, which fails
with CSS issues.

We should probably, separately, change our Django-under-apache to only
serve the one URL that it needs and redirect the rest back to
Django-under-nginx.

(imported from commit 3e3251863618269790f61b371e88af57b6cfb272)
 2013-11-15 11:10:19 -05:00
Tim Abbott 8b64833b8a Give the first user in a realm admin privileges. 
(imported from commit 9d4c598f76cdbf5cc3b79f1498e9fec2005f08fa)
 2013-11-14 12:39:36 -05:00
acrefoot 54d72d9a55 Fix Invitations on ONLY_SSO deploys (Zulip Enterprise) 
(imported from commit 6807adbd39682ba91a5746e8a75d7ce53f632ab3)
 2013-11-14 11:32:29 -05:00
Tim Abbott ce2da6c18a Use NOTIFICATION_BOT for communicating with users. 
(imported from commit 98afc575259a4487a7fefbd3e8bd91a2a46cc9c9)
 2013-11-14 11:16:15 -05:00
Tim Abbott be99b4438c Don't send stream invite notifications to bots. 
(imported from commit b45ef40b056f451c5085e5fb2afec4bbb68fa3f5)
 2013-11-14 08:19:20 -05:00
Luke Faraone 8120382b12 Fake authenticate users if they have previously authed and settings.ONLY_SSO is set 
(imported from commit d5f4bf400c4bdcaf8b858bd17a0082e5bc62419d)
 2013-11-13 17:57:33 -05:00
Kevin Mehall 98caa8eaf1 Add option to disable error reporting 
(imported from commit 3621aa6e7a5badd21b22891026285099db393df0)
 2013-11-13 16:22:21 -05:00
Kevin Mehall f7f2ec0aca [puppet] Report enterprise and prod errors to staging. 
Errors are sent to a queue processor that posts them to staging,
just like the feedback bot.

(imported from commit 4a8d099672a1b3e48a8bc94148d8b53db73d2c64)
 2013-11-13 16:22:21 -05:00
Jessica McKellar 76e1c80ac5 Add an enterprise registration page. 
(imported from commit 5888f588ad219ba25b235477a7137853e5954bb5)
 2013-11-13 16:20:42 -05:00
Tim Abbott c70adde1cd Send users whose sessions have expired to the login page. 
(imported from commit 9ffdc414b9a0874d2cd6f7a4f91596b82390ab38)
 2013-11-13 15:35:45 -05:00
Tim Abbott a5d64e4288 sso: Fix missing context instance. 
(imported from commit dd4116282bd57e1682d9b3fb3ace66c2ab9b58c1)
 2013-11-13 15:23:09 -05:00
Leo Franchi 62ba16a829 [schema] Allow a realm to have aliases for multiple other domains 
(imported from commit 5d0340afd4c77f50db63550a3ec8d81e885c285c)
 2013-11-13 14:17:43 -05:00
Steve Howell 2238807e59 Add /avatar/<email> URL. 
The /avatar/<email> URL redirects to the appropriate
avatar URL for an email, whether it's hosted by Gravatar
or Zulip.  (This will work even for external users, as
it falls through to Gravatar.)

(imported from commit 7e6f226659cb2e5a7f6426da0be8aa9bae9cff14)
 2013-11-13 13:45:08 -05:00
Tim Abbott 79ef54d6fa Fix remote_user_to_email argument. 
(imported from commit f3a7fbf071cd7da1a4d55c6842207a054412feb3)
 2013-11-13 12:07:16 -05:00
Leo Franchi 6274c33f86 Allow disabling of feedback system in UI 
(imported from commit ce16b2916784e9cf10a230cb47515ffc65888778)
 2013-11-13 11:18:02 -05:00
Luke Faraone 046c2927ab Redirect to / instead of the login page on successful login. 
(imported from commit 9bb61dc48861c580baf170dbdbdc2564e177e8a5)
 2013-11-12 19:18:35 -05:00
Luke Faraone 74b6a940e8 Actually log the user in when they authenticate via SSO 
(imported from commit aa33e8781d08f7a2793a3738e44e09701122e10c)
 2013-11-12 19:18:35 -05:00
Tim Abbott 5293cdebe8 Rename LOCAL_SERVER to ENTERPRISE. 
(imported from commit 7edf353eefe6c9e7aac74b7bbc37b923cac1b913)
 2013-11-12 15:57:01 -05:00
Zev Benjamin 53ec292022 Store logging data in a dict instead of individual attributes 
(imported from commit f7d76670428d5d8298c572a23cbfffc1d9695f23)
 2013-11-12 15:24:30 -05:00
Leo Franchi ffbadf61df Restore original desktop_home redirect 
Without it, a reverse lookup on zerver.views.home would return /desktop_home

(imported from commit 037bd532162441ca070bcb90a86d372048518cd4)
 2013-11-12 15:02:18 -05:00
Kevin Mehall 59757b37e2 Get user API key without password when SSO is the only login option 
(imported from commit 195ff68cc54cd2e7d200702c699bb3a258d3e868)
 2013-11-12 10:37:33 -05:00
Kevin Mehall 4a6b7cb20b Disable password change when SSO is the only login option 
(imported from commit fd1a14237e2d6ea574331ed178bfc0db5beb18c6)
 2013-11-12 10:37:33 -05:00
Leo Franchi 7126610298 Add a generate_204 method to our backend for the desktop app 
(imported from commit 3fa61b7e09884c83a27740087abba25dbcd8a9cb)
 2013-11-08 14:13:44 -05:00
Tim Abbott 3b41e79074 get_events: Log queue ID in home and get_events requests. 
(imported from commit 8be1427c6c9ec3d1eb4a02f3c6ad5c2726542596)
 2013-11-07 15:44:19 -05:00
Leo Franchi 9a0faf9ca8 Clean periods for our domain statsd keys 
(imported from commit d89b860566a7845774f470a215a3f3697b871d3c)
 2013-11-06 15:45:03 -05:00
Leo Franchi 591d06cb24 Only log valid stats to statsd 
(imported from commit 449b7f5e750913c04e4df8f2a895274ded99ddd9)
 2013-11-06 15:41:46 -05:00
Tim Abbott 4aa7ce3bd2 Also display the time until new work is scheduled after rendering. 
(imported from commit 33562f105d5dd6ed81ca60d0517277d908ec2ffd)
 2013-11-06 15:35:49 -05:00
Tim Abbott f670fdc717 logging: Also log the end-to-end receive time for messages we sent. 
This is the amount of time between when it is sent, and when it is
rendered into the user's home view.

(imported from commit 468c28e77ba16c7256c359e90ab5aacf9d497585)
 2013-11-06 15:35:49 -05:00
Leo Franchi 8dd4bf8f00 [puppet] Log endtoend send time on a per-realm basis as well as aggregate 
(imported from commit 07226b20081d203af1f52776475228d9b6783869)
 2013-11-06 11:25:00 -05:00
Luke Faraone 3daca0ca9c Fix rebasing errors that rightfully made the linter sad 
(imported from commit fbed798c7d752ea2b058aeebb5ae31a620684a3a)
 2013-11-05 17:52:53 -05:00
Luke Faraone 00e72cd97d Switch url parameter to full_name from service-specific gafyd_name 
(imported from commit 21541da29d2846cfd912d19b73e239e96606f9e5)
 2013-11-05 16:17:06 -05:00
Luke Faraone c11b65590b SSO / REMOTE_USER support 
(imported from commit 4f4fad7af5d3c6099cac95d7708338c182626d72)
 2013-11-05 16:14:13 -05:00
Luke Faraone b4ad8d2a5a Factor out Google Apps user-not-registered logic 
(imported from commit ba1d9da60df01f063cbfc0374130b655b7555b4a)
 2013-11-05 16:14:13 -05:00
Steve Howell 5ff6bc7330 Move activity reports to zilencer. 
This commit moves the view code and the URLs.  It doesn't touch
the templates yet.

(imported from commit dbef5eafe4956b29154c1134c05aa586c9e417b2)
 2013-11-05 15:41:03 -05:00