Commit Graph

6206 Commits

Author SHA1 Message Date
Scott Feeney eb59d06aab Simplify subs member list rendering
(imported from commit 8772bc09341a89245c6013dcf106ce52c81abe7a)
2013-09-06 23:13:47 -04:00
Scott Feeney 1c2479c807 Fix overly-tight coupling in set_stream_color test
The test will fail if a new attribute is added to the structure that
gather_subscriptions() returns. It should only be concerned with the
subscription's color.

(imported from commit fd5bad97bbce2544e0078ee029f54d4e45da9c15)
2013-09-06 23:13:47 -04:00
Leo Franchi 828557c73e Niceties for alert_word editing: add on enter, handle tab properly
(imported from commit 317be7774c02d507ba69548fdc28c1aca75d6e70)
2013-09-06 16:49:56 -04:00
Leo Franchi cf59f07fed Replace alert_words as event contains full list
(imported from commit 489975f8bcbd0c3bcec07dd5ed62de5cae686140)
2013-09-06 16:05:08 -04:00
Leo Franchi a67d461139 Hoist joining of message content in alert_words processor
(imported from commit 5025b7108839ddc04d6d9e575a9a288223526fe8)
2013-09-06 16:05:08 -04:00
Leo Franchi 8c0e112aa7 Update generate-activity-metrics to use new graphite url
(imported from commit 4664e9f389d05edb014ddb3b7f271cfc32245f3f)
2013-09-06 15:14:55 -04:00
Leo Franchi 7d76c47321 Re-enable alert word bugdown processor for staging
(imported from commit a9fb8284a47d18b97b84d3ce37482132b21d3885)
2013-09-06 14:51:40 -04:00
Leo Franchi 8ad6a0daa9 Cache realm alert_words to avoid database hits when rendering
We found that since bugdown processes are threaded, the cost of
doing a db query in a markdown processor is quite high---each
thread must start up a new db connection including a SSL handshake
etc. We should strive to keep our rendering pipeline free of mandatory
DB queries.

(imported from commit 555066bd03da6c681b74ce6137acc264eb41c55d)
2013-09-06 14:50:25 -04:00
Leo Franchi 7b375634f9 Temporarily disable alert_words markdown processor on staging
(imported from commit ab3eed4ce36ebcd3d928d2d92fc34c9ebacc11f9)
2013-09-06 13:39:26 -04:00
Allen Rabinovich a6dc890686 Standardize unread counts for user list
(imported from commit 2b82fbb6cbf89b8590a3319ce5e30dadf18cc87b)
2013-09-06 09:05:40 -07:00
Allen Rabinovich 30ab909182 Standardize unread counts for global filters
(imported from commit 0158206d40e873309999c266f5aa4d79e17c5760)
2013-09-06 08:36:14 -07:00
Allen Rabinovich 67f05f4df4 Remove email from user info and add name linebreak
(imported from commit e76b6dba7fa6c3e9c179d91c575b809977774d94)
2013-09-06 08:33:05 -07:00
Leo Franchi 252045fe2e Fix assignee in JIRA created message
(imported from commit 5ebadd14dee58c20746c80dfd99ba70a3d772ab6)
2013-09-06 11:24:03 -04:00
Steve Howell ca8b497f1b Double the max height of the compose box
(imported from commit acf0ae068208153f027da84b636c307a20dccf43)
2013-09-06 10:58:49 -04:00
Steve Howell b97c60b635 Restore the compose box's original size after hitting send.
This fix required upgrading to 1.1.17, but it's not squashed
with the upgrade, because that would complicate keeping the
copyright-fixing commit separate from the upgrading commit.

The new version of the plugin makes it so we can trigger a
resize event, but it's backward incompatible with our old
compose box code.

A minor cleanup here is that we also don't trigger a resize
right before hiding the compose box.

(imported from commit 6b0cb9ccd2ddef919fd375a80cfca535b5b74c0f)
2013-09-06 10:58:48 -04:00
Steve Howell c0d1481e83 [third] Fix copyright for jquery.autosize.js
(imported from commit c680058ad5dc5e51e76308f5e79bd84a96c1de6a)
2013-09-06 10:58:48 -04:00
Steve Howell 7d3dfff9c7 [third] Upgrade jquery.autosize.js from 1.13 to 1.17.7
(imported from commit c6a3a911b4481a53000b3f937ea5a3b85a5be8d2)
2013-09-06 10:58:48 -04:00
Zev Benjamin f666e168e1 nagios: Fix argument expansion in check_postgres_alert_args command
This was apparently causing some quoting weirdness.

(imported from commit 680d3cb9f4b1cf47cc1652feeb9f19855e7aa3e0)
2013-09-05 20:02:02 -04:00
Zev Benjamin abe07b34d5 Up the thresholds for nagios alerts about Postgres locks
We can hopefully lower this again when we figure turn on autocommit
or figure out why we're suddenly taking more locks.  For now, though,
the number of locks does not seem to be harmful to performance.

(imported from commit 0f8915d4a44aa28d1fa0969b93beea691d70d8d7)
2013-09-05 19:32:33 -04:00
acrefoot cf3e98d74a use staging for wdaher.com for the email script
(imported from commit fbad47386f5c48785f766886218370612db31c26)
2013-09-05 19:19:41 -04:00
acrefoot 592e1ead6b Actually use the realm specified by the email mirror when doing the markdown
(imported from commit 00b909b1d0c70a3523ab53d2f91815ab14ba2a6f)
2013-09-05 18:24:55 -04:00
Scott Feeney 70dd92efa0 Size emoji to be 20px by 20px
The previous setting of 1.4em translates to about 19.6px. In the case of
the CUSTOMER4 emoji, 19.6px looks bad in Firefox on Linux while 20px
looks fine.

(imported from commit 01de911076e5f54e4aee96dc9edd3d40f03a4bb3)
2013-09-05 17:35:31 -04:00
Zev Benjamin cb78014eef bugdown: Allow block-level block quotes
It is triggered by specifying the "language" of a code block to
"quote" or "quoted":
    Hamlet said:
    ~~~ quote
    To be or **not** to be.

    That is the question
    ~~~

(imported from commit 847a0602e335e9f2955e32d9955adf8ac8de068c)
2013-09-05 17:34:28 -04:00
Zev Benjamin dd26260884 bugdown: Clarify variable name
(imported from commit 27968536bd6a3fcda6d26d8dde7f82d9f0990dd2)
2013-09-05 17:34:28 -04:00
Zev Benjamin b3644ecfad Fix attribution of Github issues messages
(imported from commit 941e52e51dfd9fddfe4f86bb33f25877d6d0edbd)
2013-09-05 16:04:59 -04:00
Zev Benjamin 11a503667d Replace configuration references to trac.humbughq.com with trac.zulip.net
(imported from commit aa042a10ada3f04205fd8d3e94c2b13f12a5a1a7)
2013-09-05 15:43:08 -04:00
Zev Benjamin 2f1551e745 Replace comment references to trac.humbughq.com with trac.zulip.net
(imported from commit 231d0884345be525d58ce51f48a76bba6960f09d)
2013-09-05 15:43:08 -04:00
Zev Benjamin 5c81148839 Switch our trac realm filter to use trac.zulip.net
(imported from commit 19163f5be01a1d9370d9ed45c55bedd670772dac)
2013-09-05 15:43:07 -04:00
Luke Faraone d95da86299 Apache etc configuration changes to stats to support stats1.zulip.net
(imported from commit 3a20e31b6a5bf897aa700b55eba1bb0e8346c36c)
2013-09-05 15:43:07 -04:00
Luke Faraone 1c48aa7b8c Switch nagios to .zulip.net and add cert
We maintain a legacy hhq.c cert to avoid breaking links.

(imported from commit 4e8878185b02c0ed6c9193e21ff94ac96a2ef7b4)
2013-09-05 15:43:07 -04:00
Luke Faraone 4f6159049d Switch trac to .zulip.net and add cert
We maintain a legacy hhq.c cert to avoid breaking links.

(imported from commit e9953a3cc93f057abd79d7ce652e0942051ff5dd)
2013-09-05 15:43:07 -04:00
Kevin Mehall e58e6f1b7d Check admin permissions on the target realm, not on their own realm.
Trac #1772

Also abstracts this into a method.

(imported from commit f435b3379fb5387f8b3fdf7ca728ab760eadbf95)
2013-09-05 15:36:59 -04:00
Waseem Daher 8e1470fb05 integrations: Update desk.com blurb.
(imported from commit e1bbaca1c47fac7b194d6a531ffe4a7ce15dbd06)
2013-09-05 15:23:09 -04:00
Tim Abbott ce710292ca Always use external-content.zulipcdn.net for mit.edu realm.
(imported from commit 21d1101185bf52f21fcc345e791217311e9c0a13)
2013-09-05 14:35:42 -04:00
Tim Abbott b557b94d0b bugdown: Rewrite image urls to avoid mixed-content warnings.
(imported from commit fc0a41befb04f2a8aad2937a856366ac3cadb192)
2013-09-05 14:35:29 -04:00
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