4e03ed0b7e
Fix narrows_by_subject treatment when a private message is selected.
...
Previously, we were calling util.same_stream_and_subject on a pair of
messages, one of which was a private message, which is not valid. We
should have instead been calling util.same_recipient, which checks the
message type as well.
(imported from commit bc5715807036bff1fd4f214dafad00e33678e91d)
2013-04-22 16:21:34 -04:00
41e2bd3f40
blueslip: Fix BlueslipError definition
...
This fixes a problem where normal exceptions weren't triggering
blueslip.
(imported from commit 1cc0f8bcf0676eb2aa34ebd74d93af29251c5823)
2013-04-22 16:04:51 -04:00
fba9ae983c
integrations: Remove unused Jenkins images.
...
(imported from commit 6e88b4e050b217e2dd6a1201e08b5d71145d2e67)
2013-04-22 11:48:25 -04:00
84443310df
integrations: Simplify the Jenkins installation instructions.
...
(imported from commit 612070ccef7f1637a093503fa2e902c540b00a8e)
2013-04-22 11:48:25 -04:00
26b0eb341e
Fade around new recipient when restoring a draft.
...
(imported from commit 7888ae124bfba150b354ba27cb12c99364b43263)
2013-04-22 11:14:56 -04:00
f407d6b935
Add UI for restoring a message draft.
...
(imported from commit 3e374048a59d2caf858eb1ce9eae3e22eb0835e4)
2013-04-22 11:14:56 -04:00
de902be108
Add client support for restoring a message draft.
...
(imported from commit 64da07d4f9a7ba8e1548271f98e455ecd202da4a)
2013-04-22 11:14:03 -04:00
679c409ca3
Rename message content option to compose.start to content.
...
(imported from commit 4d609e6f6915af4474955b054d834efaba4327b9)
2013-04-22 11:14:03 -04:00
bc60be9ad5
Clean up the send_message processing of the message recipient.
...
(imported from commit 1e6d7783901743650cfb759b3136ae1de0f2989e)
2013-04-22 11:14:03 -04:00
de5038f4d7
Store the recipient stream name in message.stream.
...
Previously we were using message.display_recipient everywhere, which
is actually pretty confusing.
(imported from commit a58471172e28c039af8e290362e54b6660543924)
2013-04-22 11:14:03 -04:00
6e00c9ca3d
util: Compare recipient streams by name, not recipient id.
...
This is more consistent with how we compare subjects etc., and can be
used for comparing the subjects of a potential future message that
doesn't have a recipient id yet.
(imported from commit 93251c62dc74b3f12c6140b12fc8d6c756d35f37)
2013-04-22 11:14:03 -04:00
3c993db1cd
Tweak format of signup statsd log
...
(imported from commit eecc741f76894f2403b8302b8a6114fba0b06c5d)
2013-04-22 11:07:42 -04:00
e28cef697f
Switched the star icon to FontAwesome and made it bigger and green.
...
* renamed the 'icon-star' style to 'icon-vector-star' to keep backwards compatibility for icon-* classes
* changed relevant styles in zephyr.css; added FontAwesome assets
* changed relevant CSS classes in base.html, left-sidebar.html, ui.js, message.handlebars
* added new fonts.css to start consolidating all font-based assets
* added fonts.css to PIPELINE_CSS in settings.py under 'portico' and 'app'
* modified the stars test suite to reflect new star icon class name.
(imported from commit 3116fcfd4b5fb4edecd457da554fea616bb7081b)
2013-04-21 17:31:50 -07:00
bdcca69233
Manually iterate over DomStringList since chrome and firefox differ on API
...
(imported from commit fc9c073372f56eb5bcdb463d2d23946df85c4485)
2013-04-19 18:04:50 -04:00
1d930e8c43
Show paste file name when pasting
...
(imported from commit 8648ef26085f5f01fbc1ddf85b2de1ad1bab2967)
2013-04-19 18:04:50 -04:00
c4fa29a9d5
Allow pasting images from the clipboard to upload an image
...
(imported from commit 0d0ebecdb35521819433691c2d3a07fb13572eb4)
2013-04-19 18:04:50 -04:00
7902ecf9b5
Refactor filedrop code to allow for other senders
...
(imported from commit 861db4a5d4036d6c77f7e9921217fbf83e217c8b)
2013-04-19 18:04:50 -04:00
80e8e7b21e
Allow dropping of raw text and urls without showing an error
...
Don't show an error if we can't handle the drop contents, since it may
just be empty rather than being a browser unsupported issue
(imported from commit 986495b4a94f4afacf75ffb35ea507d86c369b2f)
2013-04-19 18:04:50 -04:00
14fd888a08
Handle mime-type if uploaded image specifies it
...
(imported from commit 716908a528fd21daedd4df4d7a71f7606acce671)
2013-04-19 18:04:49 -04:00
85df171753
Add integrations writeup for Pivotal tracker
...
(imported from commit 3e1601bbbae465a1c607ddf7258e9f24ddcdb1b6)
2013-04-19 13:46:41 -04:00
d34bdedcdb
Add tests for pivotal tracker integration
...
(imported from commit 3d3cff2eed91029ebacc5a0be284572db1a01135)
2013-04-19 13:46:41 -04:00
082ea8642e
[manual] Add support for parsing Pivotal XML activity
...
This adds a dependency on the python package 'defusedxml'
(imported from commit bd5c7655e636ab1aa945e619e7a0063187bafb83)
2013-04-19 13:46:27 -04:00
7b0423efc1
Use incr instead of gauge when sending events to drawAsInfinite to statsd
...
(imported from commit 08a4b6920c7a4a8f472f147ddce7c04710fe5c0a)
2013-04-19 09:56:41 -04:00
7b87c201f0
Revert "Automatically condense long messages"
...
This reverts commit 057f08f2fcef43070b0838a600f6a89c479b4ee8.
(imported from commit ba1dbfcaeef6bc1d5befb2d59122217f532065ac)
2013-04-18 21:45:59 -04:00
484095d815
Revert "Center the message condenser messages with respect to the message body"
...
This reverts commit a56ca3e9f20e9b01236b58be7a279d28b97e74bc.
(imported from commit a6068566828b21dec150fcb9ad2c458bb369aa30)
2013-04-18 21:45:55 -04:00
13f5d30d83
Revert "Don't collapse messages that would only be collapsed by a small amount"
...
This reverts commit 56e8df87d3eae62080962474eae23ab75f009819.
(imported from commit 15d71ab73d269eaa3d8a2f52c5781290ee183627)
2013-04-18 21:45:34 -04:00
955f1febdf
Revert "Increase the threshhold for triggering collapsing./"
...
This reverts commit cd1dac8b4726cef82eb2dc957fc7edced298fa9c.
(imported from commit 6ddaad88d3d2b402ef162e5b9a7e450238feb5fd)
2013-04-18 21:45:13 -04:00
29ad205b01
Add a management command to send a statsd message
...
(imported from commit 25ead4a0dee185a139eb5401e109c9cbe937c7bf)
2013-04-18 18:05:52 -04:00
652b821d64
Add a bunch of statsd logging
...
(imported from commit 8c17a76fed08c34abab3cc45d76a0fb30774d73a)
2013-04-18 18:05:52 -04:00
46415d4984
Add statsd helpers and wrappers
...
(imported from commit 9d5b805ae416a65ac49dda8e8e11d9831308116c)
2013-04-18 18:05:52 -04:00
1d25f36554
Add a decorator for sending count information to statsd
...
(imported from commit 5263e39d8c235ac56517f0a69a1b1337e6f8942a)
2013-04-18 18:05:52 -04:00
9e85e6e0b9
Fix ordering constraint on get_old_messages query to UserMessage table.
...
Amazingly, this saves about 250ms on every get_old_messages query in
my testing on postgres.humbughq.com (previously, we were scanning all
rows in the zephyr_usermessage table rather than using an index).
(imported from commit 566a5ef0bbf3c2198fa9e0b63d34e38ac9c57d18)
2013-04-18 17:15:29 -04:00
5afe06e8cb
Decrease idle event queue timeout back to 10 minutes.
...
(imported from commit 1ca1c99c013f3e7f7e70e1fd9c5386b0d5a27b98)
2013-04-18 16:58:31 -04:00
aa75f51d5e
Catch IncompatibleProtoclErrors as well, since our failure to connect might happen during the initial handshake phase
...
(imported from commit 55115f19a5a101676e3ce1ca2a7b9cd2a2d5b028)
2013-04-18 15:46:43 -04:00
3811bcc025
Increase the threshhold for triggering collapsing./
...
(imported from commit cd1dac8b4726cef82eb2dc957fc7edced298fa9c)
2013-04-18 15:39:45 -04:00
cce1213320
Don't collapse messages that would only be collapsed by a small amount
...
(imported from commit 56e8df87d3eae62080962474eae23ab75f009819)
2013-04-18 13:17:22 -04:00
546a376d1c
Move API endpoint docs onto their own page.
...
(imported from commit 0472c9051ba75e8c8ea4f80941ca9ef3b7ad949e)
2013-04-18 09:57:57 -07:00
ea7965d9bb
Rework API documentation to cover all supported calls.
...
We now generate our API documentation page based off of JSON source.
(imported from commit 0e8a91ef4278684dbcad89cad39a1977672245fc)
2013-04-18 09:57:56 -07:00
8bc0de19dc
Center the message condenser messages with respect to the message body
...
Previously it was centered with respect to its enclosing div, which
looked slightly off.
(imported from commit a56ca3e9f20e9b01236b58be7a279d28b97e74bc)
2013-04-18 11:29:32 -04:00
33c8368734
Automatically condense long messages
...
Addresses Trac #747 .
(imported from commit 057f08f2fcef43070b0838a600f6a89c479b4ee8)
2013-04-18 11:29:32 -04:00
fb2b3ae21a
Handle multiple preregistration user objects when choosing streams
...
(imported from commit 52faa0256a719bed8a8ccc120f8177cce20450e2)
2013-04-17 15:48:30 -04:00
1bd5f788b3
subs: remove redundant call to add_sub after create_sub.
...
(imported from commit ad47d9e9964a850892baeff17d3c94cfedbc9f0f)
2013-04-17 13:27:48 -04:00
a87e41d66c
Make inviting users to your realm case-insensitive.
...
Before this commit, foo@Bar.com couldn't be invited to bar.com.
(imported from commit 04b16f66a6ec9e157bdc7523972b37432358f5cd)
2013-04-17 13:27:48 -04:00
3e9e8eec1b
tutorial: move script creation down the file to appease the linter.
...
(imported from commit 77b2b18874a19b39ec0a60c3c25b8459b50ce9ee)
2013-04-17 13:27:48 -04:00
7d389d8c13
tutorial: fix broken pipelining of asynchronous requests.
...
Some functions invoked by the make_script framework weren't returning
their Deferreds. I noticed this as the hello stream not getting picked
correctly because loading your real subs hadn't completed yet.
(imported from commit fac3fa36b77585bd5c03bf8fbaec052fe397a481)
2013-04-17 13:27:48 -04:00
e15dd90bd9
tutorial: don't recommend saying hi on a tutorial stream.
...
Now we don't unsub you from it until after we've picked the hello
stream.
(imported from commit b1489007e972af7713804ba5ff98764a6393a0b6)
2013-04-17 13:27:48 -04:00
750b8326d7
subs: fix incorrect stream_info re-initialization.
...
Using [] doesn't cause incorrect behavior, but it's a mismatch with
how stream_info is initially declared and gives you a confusing
representation at the console.
(imported from commit c03d9e6a29ff990659f41ee478f631a019a5ac25)
2013-04-17 13:27:48 -04:00
6b4196a74a
tutorial: fix race that could cause you to not see the goodbye message.
...
(imported from commit 52afce208890dbd863fc1661729e4351160d09ac)
2013-04-17 13:27:47 -04:00
3945335e6e
tutorial: don't let punctuation get in the way of exiting.
...
(imported from commit 7b97f382684bd2ddb92fc3efa6e1a635c4662aef)
2013-04-17 13:27:47 -04:00
a76977f57f
tutorial: don't let the tutorial recommend saying hi on a non-existent stream.
...
Previously we added some names to your subs to use them as examples
during the tutorial. We no longer do that, but the tutorial could pick
a name from that list to recommend that you say hi on, even if you
aren't subbed.
Don't do that, and instead try to pick a stream that is in turn:
* your company name
* a probably-good stream name like social
* a stream that is hopefully not an alert stream like nagios
* eventually give up and pick anything
(imported from commit ec20c7722ea95b025dec62bcf47e33c62d1a8029)
2013-04-17 13:27:47 -04:00
Tim Abbott
Zev Benjamin
Waseem Daher
Jessica McKellar
Leo Franchi
Allen Rabinovich
Jeff Arnold
Luke Faraone