21a69f2188
nginx: Move common longpolling proxy configuration into include file.
...
(imported from commit 4ace82824c32cec8c6da8a1a6b8a527dae105a89)
2013-12-05 15:25:24 -05:00
9e24558092
nginx: Move common proxy configuration into an include file.
...
(imported from commit 2ee5afc74fe146f8ee98f18f846342351c61c7f0)
2013-12-05 15:25:24 -05:00
3760609f3f
Enable /sockjs handling on api.zulip.com (not used yet).
...
(imported from commit c2581e3243b2129c980fd3dd318eb3d99f3eb593)
2013-12-05 15:25:24 -05:00
953c3578dc
external-sso.conf: Fix missing proxy_set_header.
...
(imported from commit 64bcb06cf65f15908ee74d637ab3868916b1dfd7)
2013-12-05 15:25:24 -05:00
79910fa2b3
Disable proxy_next_upstream for sockjs in remaining proxy_pass lines.
...
(imported from commit f14c7962253b34040ed9ab077a58c8b200df5d9d)
2013-12-05 15:25:24 -05:00
30de0b3e77
Add a method for switching to full width and a feature flag to enable full width on staging.
...
(imported from commit bc7b3a5c8c17ca84e192a63711663cd605425b7f)
2013-12-05 12:41:25 -07:00
07cbbfdfda
Upgrade slow send restart of get_updates requests to blueslip.error.
...
Now that this is no longer a known problem with our product, we want
to hear about it when it happens.
I worry a bit that a 2s fuse may be too aggressive for the case of
customers in Europe, but it might be OK.
(imported from commit d1bd6b85cd8dffab9c0d0fd410de5331736b00af)
2013-12-05 14:37:01 -05:00
fed3902fc5
Clean up debugging logs from tracking down slow receive.
...
(imported from commit e4b1f763522406255ce8be3c8d51b5d855a770cd)
2013-12-05 14:36:29 -05:00
70b0e73a24
Support sender:me and pm-with:me search syntax.
...
We convert sender:me to sender:steve@zulip.com at parsing time,
so users will see the canonicalization in the search bar. Likewise
for pm-with.
(imported from commit aa9951f13d4633cfef85f03e5486d607fdef414f)
2013-12-05 13:49:04 -05:00
5e4e8af0c4
Document sender:me syntax.
...
(imported from commit 7c32ddc70528f110ba7d2f64637da0cc8eb0a0a6)
2013-12-05 12:10:43 -05:00
ce57cbf22a
Rename search-operators help to "Search help".
...
(imported from commit 29facc2965d975ae907d8d7f816f31e22ebd682b)
2013-12-05 12:08:16 -05:00
40057b2fd0
Change operand color to maroon in search help.
...
(imported from commit 2f0ed0548bce32bdb3ee4e07f75059c0d5695e69)
2013-12-05 12:01:34 -05:00
b612d0a53f
Make search help more explicit for is:{mentioned,private,starred}.
...
(imported from commit 736228d483372a571e5e07b0764da521febcc970)
2013-12-05 11:52:15 -05:00
424994ec9b
Put sender: adjacent to pm-with in search help.
...
(imported from commit 580079ba941252df8e19165f613a30ee9597e4c1)
2013-12-05 11:47:28 -05:00
686c039c81
Turn on topic zooming for everyone.
...
(imported from commit ca9664d1b838b09615380f48802384fbb33111fa)
2013-12-05 11:38:59 -05:00
052b8a3b59
Push experimental background colors out to MIT.
...
(imported from commit e7420e55b616f2e885a74391b9b3e4452d9bb25d)
2013-12-05 11:16:57 -05:00
bd68884607
Fix documentation for email gateway on Zulip Enterprise.
...
(imported from commit 82e706b4e8e82df3044e5fc3df70e46b2183bc56)
2013-12-04 16:39:39 -05:00
feaf6843de
Only document email integration if it is enabled.
...
(imported from commit d1f13ff30c56f7a2156e8c00621b6b955302ccf0)
2013-12-04 16:35:38 -05:00
97dd4b0cb3
Fix the whitespace in the Zulip Nagios config.
...
(imported from commit 5fcdac241ba075c919ecc7dbfaaa811d0089bf5c)
2013-12-04 16:30:58 -05:00
5d454afb74
api: Add support for setting site in mercurial integration.
...
(imported from commit 697f4697af27be6f4eddd6ddbf7affbc8739cffe)
2013-12-04 16:30:57 -05:00
9f016ed827
Update Asana/SVN integration documentation to show config files.
...
(imported from commit ba918f996c61294b6b7967e133ad715a8b928b79)
2013-12-04 16:30:57 -05:00
d7c7913a11
Document Zulip SITE option in most integrations.
...
(imported from commit d7266df1fa23a5fef5d5e7cce8d108da47f36da5)
2013-12-04 16:30:57 -05:00
44386b3615
api: Document options required for use with Zulip Enterprise.
...
(imported from commit 59f136cf0f1a5d9509bec054b060ab44695b77e0)
2013-12-04 16:30:51 -05:00
4e52ecce0f
api: Update documentation on ZULIP_SITE option.
...
(imported from commit 82109dc08847240440f90524343c0f9562e4a0bf)
2013-12-04 15:14:15 -05:00
a33eb6f61f
Update API documentation to use proper URLs for enterprise.
...
(imported from commit cbf9fba4b8281e8ce7a6dd2964c921d2ef906559)
2013-12-04 15:10:54 -05:00
e5be713103
Clean up EXTERNAL_API_HOST usage and defaults.
...
We now have 2 variablse:
EXTERNAL_API_PATH: e.g. staging.zulip.com/api
EXTERNAL_API_URI: e.g. https://staging.zulip.com/api
The former is primarily needed for certain integrations.
(imported from commit 3878b99a4d835c5fcc2a2c6001bc7eeeaf4c9363)
2013-12-04 15:10:54 -05:00
02304ca4a0
Remove api/examples/curl-examples.
...
It's out of date and we've never distributed it anyway.
(imported from commit 884e302ea4f55f9b3f986694a786cc5c17128e71)
2013-12-04 15:10:54 -05:00
010475d49f
Enable experimental background color for staging.
...
(imported from commit 833b25ae48e44bc7749463b7dd26418d6e25703a)
2013-12-04 14:15:23 -05:00
87814572c9
Create tools/get-handlebar-vars utility.
...
This basically prints out a template JSON data structure to
be used with a handlebar template that you specify on the command
line. (You can actually supply multiple files, too.)
Example usage:
$ ./tools/get-handlebar-vars static/templates/tab_bar.handlebars
=== static/templates/tab_bar.handlebars
{
"tabs": [
{
"hash": "",
"title": "",
"active": "",
"icon": true,
"data": "",
"cls": ""
}
]
}
(imported from commit d7239fcae7d94038fa0e4b34c8b1208a1070ecbb)
2013-12-04 13:58:04 -05:00
55047280c9
Include a newline at the end of our JSON responses.
...
Otherwise, it's super annoying to work with these using curl.
(imported from commit 0047f07786dc07d7ac5cb671492f8ca40986d8cf)
2013-12-04 13:47:48 -05:00
56e5bce173
Fix bugs in our API endpoint documentation.
...
* The "message" event type was incorrectly listed as "messages".
* The curl docs incorrectly used GET for the register API call.
* Fix missing \ in GET events documentation.
* We didn't have proper JSON format for the "message" argument.
(imported from commit f00e2f187375d24f8be4b8075b7cd7a38584fe01)
2013-12-04 13:47:48 -05:00
9f226e4cd2
Add a background switcher function.
...
(imported from commit a9bd0403637c5da04d93c0ff5e1dd0272238f0a6)
2013-12-04 11:07:12 -07:00
1a21db1170
Fix problem with presence list popovers persisting
...
This addresses Trac #2090
(imported from commit e98a3dae8e946ec7fdb027d3619ae2b0ddbdbf51)
2013-12-04 11:32:59 -05:00
b8a151ca4e
Revert "[puppet] Add cron job to restart our workers daily."
...
This reverts commit 0b0180b0751f6c618d877b9c9ffc2b8287254e4d.
(imported from commit a81c552100345d369ffcaf69f28a86dea0893128)
2013-12-04 10:27:45 -05:00
f7ac58bab5
Revert "Add user_activity_test worker that does nothing."
...
Now that we've debugged the memory leak, I don't think we need this
anymore.
This reverts commit 1bdc7ee2f72bdebb1cdc94601247834a434614d6.
Conflicts:
puppet/zulip/files/cron.d/rabbitmq-numconsumers
puppet/zulip/files/supervisor/conf.d/zulip.conf
(imported from commit ff87f2aebcbc71013fa7a05aedb24e2dcad82ae6)
2013-12-04 10:27:45 -05:00
606d8a4f9b
Add Nagios check for queue worker memory usage.
...
This is detect future memory leaks.
(imported from commit 75fd4c2ad41ea71e87a53fb33e2106c5773909d5)
2013-12-04 10:27:44 -05:00
a4c92093a0
Move #users_presence span.arrow click handler in file.
...
This is purely cosmetic, to keep similar click handlers near
each other.
(imported from commit 6238905462c7a2edae879cad3ee8822f9a854a1d)
2013-12-03 18:39:44 -05:00
d5b0093d0f
Remove unused last_sidebar_elem vars.
...
(imported from commit ec54c62dd0db68956184ec2ed6f07594e023ef64)
2013-12-03 18:39:44 -05:00
51fe87fcd6
Kill off dead code: show_user_sidebar_popover().
...
This code isn't really so much dead; it was never even born. :)
(imported from commit 0351b611dae7c0868cc5c3e2c76c010601c1e8ba)
2013-12-03 18:39:44 -05:00
ec56e946a7
Only manually update fading if the compose box is staying open
...
(compose.start() and compose.cancel() both update the fading themselves)
(imported from commit 63ce2f54106c8cce2306b0c1f3ce56e06f24235f)
2013-12-03 16:58:50 -05:00
2cd7c35875
Make c/C compose to a new destination instead of being identical to r/R
...
R means "I want to send a PM, you can guess the destination"
r means "I want send a stream message, you can guess the destination"
C means "I want to send a PM and specify the destination"
c means "I want to send a stream message and specify the destination"
(imported from commit 4c93cc3029892c21accadd9624da70ee818dec68)
2013-12-03 16:58:50 -05:00
da3f1704ed
A different kind of selection fix.
...
(imported from commit 377b1571cced9f1ed9e404bbc3f70abb16b7e819)
2013-12-03 14:12:48 -07:00
850eae3e8e
puppet: Disable proxy_next_upstream feature in nginx config.
...
(imported from commit 84cad76701f9ee40fa9601ae06b3f804948b96d4)
2013-12-03 15:20:45 -05:00
30eaae72e4
Revert "Disallow user selection on body, but allow on individual elements"
...
This reverts commit b3f8f8f79952c34cdf4087683210bab6e4e46a27.
This seems to break some of our copy-and-pasting code.
(imported from commit 052296a0f4bdb47342708a5e520be260863ccafd)
2013-12-03 14:42:47 -05:00
1e7a22f14e
Replace other non-zerver uses of iPhone client
...
(imported from commit 0988e2c9bd0499a0711daed97f89aa672776f085)
2013-12-03 14:35:24 -05:00
6808b5b5fe
Disable scrollTop blueslip error for now.
...
I think we've got plenty of data of user agent strings for when this
warning triggers at this point.
(imported from commit 8bf6601a325b8e35f5127914a447bd522439c531)
2013-12-03 14:32:44 -05:00
5007d4d87a
[puppet] Update set_real_ip_from to use lb0's internal IP address.
...
This is something we forgot to do in the VPC migration, so our IPs
have all been the lb0 IP in our logs :(.
(imported from commit 9d3fc69cf72a84f7bd7c54e50fb1e776a67d971f)
2013-12-03 14:29:34 -05:00
1b53a77f1b
Expect an ios client instead of iphone
...
(imported from commit d5d3cd129d7005fd9294096d3899df86155cd366)
2013-12-03 14:27:51 -05:00
5d79796465
Disallow user selection on body, but allow on individual elements
...
(imported from commit b3f8f8f79952c34cdf4087683210bab6e4e46a27)
2013-12-03 11:22:44 -07:00
878e07a5d8
Fix doubled query count logging when DEBUG=True.
...
(imported from commit 32dfc4c4e366ca80e659ca3d6ab4959b0235e861)
2013-12-03 12:21:06 -05:00
Tim Abbott
Allen Rabinovich
Steve Howell
Waseem Daher
acrefoot
Jeff Arnold
Leo Franchi