Commit Graph

6171 Commits

Author SHA1 Message Date
Tim Abbott a575ea997f puppet: Run GitHub Camo on lb0 for external-content.zulipcdn.net.
(imported from commit c03f2018fee1d88b747f45fc7841949f61e5c06c)
2013-09-05 14:35:29 -04:00
Tim Abbott cdfc6dc10a bugdown: Fetch youtube preview images over HTTPS.
(imported from commit 9dbf3c21083cbbcf1288789f400c33ec735d4416)
2013-09-05 14:35:29 -04:00
Tim Abbott 3f1c967e3d Clean up approximate_unread_count.
The new version is more accurate (doesn't rely on UserMessage IDs
being sorted, which they aren't necessarily) and simpler.

(imported from commit 671dd89dc8881ae2dcb8d0e804fd65458e074a29)
2013-09-05 14:35:29 -04:00
Tim Abbott ddc9c53e1b nagios: Set max_check_attempts to 3 for rabbitmq consumers.
This works around the fact that we seem to have a mysterous extra
checkup 40s after an error first occurs with these checks, which
always fails because the data is updated by a cron job that runs every
minute.

(imported from commit e7fe9c85e8399115443269287e695b140b4443ff)
2013-09-05 14:35:29 -04:00
Kevin Mehall 5b8aa359dd Make #notifications-area fully go away when hidden.
It had an invisible part that didn't hide, which covered the send button
in skinny, leading to Trac #1776.

(imported from commit faec9413539238c40c584ab636fc4d75618a5935)
2013-09-05 12:10:03 -04:00
Leo Franchi 663fd4653f Feature-flag alert words to staging + reddit
(imported from commit 1fe9c596b26ce6676514719e4ed2e185108685cb)
2013-09-05 10:21:39 -04:00
Leo Franchi 41b286232d Allow filtering to alerted messages with is:alerted
(imported from commit 99834f1ee1b9b2e0f5c7427afa1494bf404e3626)
2013-09-05 10:18:41 -04:00
Leo Franchi 802ea78fb0 Add a settings option to configure per-user alert words
(imported from commit b24d352fffdde13f2cf0467b31c706ebf0534d6a)
2013-09-05 10:18:41 -04:00
Leo Franchi c62c6359af Slightly shrink size of headers on settings page
(imported from commit d3471c641fb58dba18db6c1a8363bb268f5e8c74)
2013-09-05 10:18:40 -04:00
Leo Franchi 897dd87b94 Add a span around alert words to mark them visually
(imported from commit 9b8fbbd957086f1eeaa3409e5830aa6d7974fbe8)
2013-09-05 10:18:40 -04:00
Leo Franchi b2ddd670e4 [schema] Add backend support for per-user alert words
(imported from commit 7a9c596a010cbedbddf594c5d9c68bb9ed46d122)
2013-09-05 10:18:40 -04:00
Kevin Mehall 9428f40422 Add a `.expectOne` method to jQuery objects.
It asserts that the result set is exactly one element.

(imported from commit c78ff131deb4a13c65c2a68e4b8e09279ece3ea0)
2013-09-04 16:44:33 -04:00
Allen Rabinovich 2f8bd32ef8 Add background to 'You and' and adjust vertical alignment
(imported from commit 3bec31298c030299509e48596662a0618c359994)
2013-09-04 13:08:04 -07:00
Kevin Mehall e780502372 propagate_topic_edits feature flag: staging and CUSTOMER7
(imported from commit aca356a7c7f98066b13a51ede55c4925b95a476b)
2013-09-04 14:51:46 -04:00
Kevin Mehall 6b820038ad Server side tests for message editing, including subject propagation.
(imported from commit 0a68bdc337eda1b04976fb41a50a29f9f626ef25)
2013-09-04 14:51:46 -04:00
Kevin Mehall 19a835e7d5 Add a checkbox that propagates topic edits to subsequent messages.
Trac #1348

(imported from commit 28e2a8cb3ecda5ec50d17501f4ccbd8644212065)
2013-09-04 14:51:46 -04:00
Waseem Daher 07d692758e Script to help send welcome emails to new Zulip users.
(imported from commit 787c950a71f34a6137e53448594ba9ff42fc939f)
2013-09-04 13:30:06 -04:00
Scott Feeney 6f5cb9bf17 Document Desk.com integration
(imported from commit bcd48f3446cd8f65b25d928136bd09275d8196ea)
2013-09-04 13:19:23 -04:00
Scott Feeney 6adfed7f3d Add backend support for basic Desk.com webhook
(imported from commit 425a26b2ba5ffd4f4437e8d8438e8ef540d7b1ee)
2013-09-04 13:19:23 -04:00
Scott Feeney 002cba4496 Minor fix to API docs for topic names
"Subject" => "topic" in the prose description (though the API field is
still "subject"), and fix a misspelled word.

(imported from commit b5a65c87e419c2cacb9f87a03f32a1a8701b440d)
2013-09-04 13:19:23 -04:00
Scott Feeney a213fb5df2 Comment that authenticated_rest_api_view does Basic auth
(imported from commit 145ea6b0a17ab904c32e23e809410f56448baa72)
2013-09-04 13:19:22 -04:00
Kevin Mehall f0c447bb4b Fix typo in email integrations help
(imported from commit 65a108b4f052fd32f84812e199097835a80cb33d)
2013-09-04 13:13:02 -04:00
acrefoot 0cb72c6259 Unread counts on the toggle buttons when in skinny mode
(imported from commit 99102d1bf752c077ee4c23bf1aa0b095a9f739d7)
2013-09-04 12:35:48 -04:00
Leo Franchi 7e6af0a5d0 Mark messages from the desktop app as sent_by_human
(imported from commit 001073221387cbbaa541b17f9a377490562a28f1)
2013-09-04 11:00:11 -04:00
Steve Howell fdc589de3a Extract mit_edu_topic_name_match() in filter.js
(imported from commit e062cf7e987ca5af20417fe49785efa35574f628)
2013-09-04 10:39:00 -04:00
Steve Howell 26a8aee2d0 Extracted mit_edu_stream_name_match() in filter.js.
The original code was buried inside a switch statement inside
a for statement.

(imported from commit 768c4ee8596cb63b2caa14c5b113cc867db90293)
2013-09-04 10:38:59 -04:00
Allen Rabinovich 400f03fa60 Fix Firefox descender cutoff
(imported from commit 58f92325f137c80e9c98fd7b391af6393d4d3ca6)
2013-09-03 20:35:22 -07:00
Allen Rabinovich 4aa9798f29 Move the lock to the left and widen the topic input field
(imported from commit 1d70afdc82b653239f7d016997c7e9cbe9eb5f14)
2013-09-03 20:15:17 -07:00
Steve Howell 360cc754cc Extract last_check_ts var in nagios script
(imported from commit b391ef2832100a8140789b0d1b553b028e0b7af6)
2013-09-03 22:30:00 -04:00
Luke Faraone 085fdebc98 Use the X-Gm-Original-To header instead of iterating through To/Cc/Bcc
This will allow mail with an implicit destination (mailing lists, complex
forwarding) to be received by our system.

See http://support.google.com/a/bin/answer.py?hl=en&answer=2368151 for
documentation of Google's behaviour that adds this header.

(imported from commit f8fd500e3c27e12af5941c63c91d5c796a2cd24a)
2013-09-03 17:46:44 -04:00
Tim Abbott 221f6e6199 puppet: Add cron job to clear expired Django sessions.
(imported from commit 1426430785f483d450f3d044147fe0fad50cb898)
2013-09-03 17:10:40 -04:00
acrefoot a3753d8521 fixup 4c6c956118ae09fedca042e797a6029fdd26e00c
(imported from commit 2c1204b1da049e452a8af651c8ab90393d0c1e67)
2013-09-03 14:00:40 -04:00
Jessica McKellar 8c4ebb83aa integrations: fix typos in Bitbucket integration instructions.
(imported from commit 0ccdd670eabab8742f8cfa52b37465ec38f40b83)
2013-09-03 12:06:13 -04:00
Allen Rabinovich 6eeeb631c3 Fix lock icon position
(imported from commit 5f48abc8dc568cb501fdca648b7eb17d39d5830e)
2013-09-03 08:59:24 -07:00
Tim Abbott eeb04ed78e deactivate_user: Only delete sessions that aren't expired.
(imported from commit e3d844a55581a7e7faab8ea9ed6703480fae8f51)
2013-09-03 11:40:42 -04:00
Tim Abbott 4951ad2ce7 check_personal_zephyr_mirrors: Use newlines in display format.
(imported from commit d4114cde3575fafd0b37722681baf2e61517a6ad)
2013-09-03 11:40:42 -04:00
Allen Rabinovich ef937ec1a5 Update the styles and layout of the composition pane
(imported from commit 030318ffe4b898e224f2e7c709dd876194121b8f)
2013-09-03 08:33:32 -07:00
Kevin Mehall be5c90c217 Add test for realm-specific emoji
(imported from commit 2148038b300b71afe0a7517709ed0404536b69fd)
2013-09-03 11:01:01 -04:00
Leo Franchi 01c53e825f Update beanstalk sample message to new design
(imported from commit e23313d88f503b63561f75f87e716521f1b88f87)
2013-09-03 09:17:02 -04:00
acrefoot 08157d6f62 Render both the above and below time on date_row
If the date_row is between two messages, it tells you when the message
below was sent, but not when the message above was sent--for that you'd
either have to click on a message or keep scrolling up. This is especially
annoying when there are sometimes gap days on a particular stream (you shouldn't
assume that the message above is simply from the previous day).

This adds the date of the previous message (the time above) to the date_row.

(imported from commit 4c6c956118ae09fedca042e797a6029fdd26e00c)
2013-08-30 16:05:05 -04:00
Jessica McKellar 8176429328 Un-break PagerDuty and go back to using the e-mail integration.
(imported from commit 1b33336ad56d56e6d9e48a5b2497a5115fbd310f)
2013-08-30 11:32:12 -04:00
Scott Feeney 549c644480 Move webhooks views to a separate file
(imported from commit 73db9f5ccc03d19024f35001b0805ca17eeadff7)
2013-08-30 10:18:49 -04:00
Scott Feeney 6eea2d7988 Rename views.py to views/__init__.py
(imported from commit 6d2fc769b3997f8ae9aea1119ebe1c27872baf42)
2013-08-30 10:18:49 -04:00
Jessica McKellar 864ae3ad51 Enable the email forwarding UI for CUSTOMER6.
(imported from commit 587159412ad208d1f5e44479f50ca2f25a98f70a)
2013-08-29 18:13:21 -04:00
Jessica McKellar de383c43c4 integrations: document email forwarding.
(imported from commit db4b258382c3be5a03ed41a4c12a1972777112c4)
2013-08-29 18:13:21 -04:00
Jessica McKellar acdfb6afa0 email mirror: make being one of many recipients okay.
Previously the email gateway had to be the only address in a recipient
field or we'd mis-parse the recipient.

This commit also makes the mirror correctly handle addresses of the
form "Jessica McKellar <jesstess@zulip.com>".

(imported from commit 7435f2b59b8f47dc599cc869f64597a730af7d12)
2013-08-29 18:13:21 -04:00
Jessica McKellar c4157ed2b6 Make email mirror testing easier by using a different mailbox locally.
The mirror will use INBOX when deployed and Test locally. Send an
e-mail to the Test mailbox by including the word "localhost" in the
subject; a GMail filter will place it in Test on receipt.

(imported from commit bacf9a9554c8c5e1f3ec8497761edf2c15d3745d)
2013-08-29 18:13:21 -04:00
acrefoot 9e690e8625 Fixup 484bc12681a43cd01fe0189c072ab4230eb32c22 typo
(imported from commit ff4043b6ea0c2389560114dcda6269fd64932cd5)
2013-08-29 18:07:49 +00:00
Jeff Arnold 6a9b441853 Clear a desktop notification once its source message has been read.
Addresses Trac #1698.

(imported from commit 859fc7d436904f21427d15f6363c4e0ca859e02a)
2013-08-29 17:16:11 -04:00
acrefoot a25b77287e Documentation on the integrations page for the Basecamp mirror script
(imported from commit 302fbd4e14ca92e4462ddf19e5b874a69d4a96f3)
2013-08-30 20:06:32 +00:00