Steve Howell
b822c83b02
Avoid redundant query clauses for muted topics.
...
If we are already narrowing to a stream, then we can disregard
muted topics in all the other streams and create a simpler query
for the DB to execute.
(imported from commit 35a074a76eec99922034a381741355da3fdd5b39)
2014-02-27 20:25:36 -05:00
Steve Howell
fab6b0f7ae
Handle non-existent streams in exclude_muting_conditions().
...
Due to the way we store muted topics, it is possible that a
muted topic stream name may no longer exist, and we need to
handle that case gracefully.
(imported from commit 4d18ec55e45213657a67e160848229678f212765)
2014-02-27 20:25:36 -05:00
Steve Howell
9d21787cd7
Extract exclude_muting_conditions() in messages.py
...
(imported from commit 97144097406377eb40383c7d1314c74dd713719c)
2014-02-27 20:25:35 -05:00
Steve Howell
f47a3c62e8
Add test_use_first_unread_anchor() test.
...
(imported from commit e2b4d30730725fd08e76868d9af6f36ddfd3b6f2)
2014-02-27 20:25:35 -05:00
Steve Howell
630187d91b
Avoid glitches running single tests involving SqlAlchemy connections.
...
(imported from commit 90b34ead998e2daf9e73fff867c3efb78076f4e1)
2014-02-27 20:25:35 -05:00
Waseem Daher
243c327d0a
Properly preview images from Dropbox photo albums.
...
Reported by jhurwitz (sorta).
(imported from commit 8ae4c5f7af86c5492842142b89be8cab1a2c3fae)
2014-02-27 20:25:35 -05:00
Leo Franchi
b80293c80d
JIRA: Show all updated fields as long as one is not truthy
...
(imported from commit 543204b84a0b5625c4185b9ae32d5a3725cd9f9e)
2014-02-27 20:25:35 -05:00
Luke Faraone
e80c4f13b9
Don't include an "@" in mailname(5)
...
(imported from commit 84486373966c90d5fe2dd4af5966ae614628188f)
2014-02-27 20:25:34 -05:00
Allen Rabinovich
3fb3b564ae
Make slow fade longer for unread markers
...
(imported from commit 728e977f1f128d4e9b3f5f602538b7b2caaa9303)
2014-02-27 20:25:34 -05:00
Leo Franchi
f605a7df22
Return an empty list instead of undefined when no groups are visible
...
(imported from commit 5a02b6b94acb20948c9959e9620df7fa5f945625)
2014-02-27 20:25:34 -05:00
Leo Franchi
63bcf98e71
Fade properly via groups when toggling fade on compose
...
(imported from commit 865c9daf8a267cfa65f7daceddff55a816b9c22c)
2014-02-27 20:25:34 -05:00
Leo Franchi
9275901277
Refactor viewport.visible_messages and add a viewport.visible_groups
...
(imported from commit 2cd29c41c1fb7ffc4c88673e81e638bbaad91f5f)
2014-02-27 20:25:34 -05:00
Leo Franchi
840ba90512
Show on-hover topic edits in message list
...
(imported from commit c2cd996c5e17b801e4e10b0a28451c0fb51c5e21)
2014-02-27 20:25:34 -05:00
Leo Franchi
b51ea69db0
Handle topic edits and rerender view if topics have changed
...
(imported from commit b59f6b532138d660e0acfb949b2eb223b5c5ed0e)
2014-02-27 20:25:33 -05:00
Luke Faraone
7658886b02
email_mirror: Use internal_send_message instead of the API
...
Previously, the email mirror queue worker used the API bindings to send
messages to Zulip, as if it were any other API client.
This is inefficient since we're running the worker inside the Django
context on a machine with database access; we can instead just use the
internal message-sending functions we use elsewhere. This also resolves
potential issues with SSL certificates, etc. that might occur when we
were previously making a HTTPS connection.
(imported from commit 6de8015829bec440f1af0199a2138828e86ed2a4)
2014-02-27 20:25:33 -05:00
Zev Benjamin
a547043831
Fix search highlighting for message content and topics
...
Previously topics weren't being highlighted at all and messages had their
highlighting persist across different narrows (because we were only checking
whether the message object had a match_content property, not whether it should
currently be used).
(imported from commit 44c91c6d5799dcdf765e19e1a17bd727ce80c918)
2014-02-27 20:25:33 -05:00
Zev Benjamin
865c57fa72
Allow our template partials to take additional named arguments
...
(imported from commit 20e7dae7b5d27ee34936d400394357fc31c8e628)
2014-02-27 20:25:32 -05:00
Luke Faraone
409bc7b657
Ship NOTICE for emoji and link to them from the web interface
...
(imported from commit d0020a3a0115f16540a256061078025fa1ae6526)
2014-02-27 20:25:32 -05:00
Leo Franchi
5aef8b8fad
Maintain scroll position when removing selected message
...
(imported from commit 1021eac527e677fbcac46d0a7d44dd3244bb903e)
2014-02-27 20:25:32 -05:00
Jason Michalski
4a58241b17
Revert "Change out the gemoji emoji for android version"
...
This reverts commit 05a7245f7b52edf4f55e40d1467022d9f06d5792.
(imported from commit e2bb0346fc2913046e977d539326510fdcab73a5)
2014-02-27 20:25:32 -05:00
Leo Franchi
240050093b
Preserve scroll when rerendering due to out-of-order messages
...
(imported from commit 9c339cbe8d5bbd75bbdf24a8f14da4f1556cc407)
2014-02-27 20:25:31 -05:00
Leo Franchi
f93ccd4df1
Enable local echo for all
...
(imported from commit 8c2e66009303b6937c7e0f1743293623e7404c3b)
2014-02-27 20:25:31 -05:00
Zev Benjamin
5dfd6eee2d
Enable negated search for randomfish.org
...
(imported from commit 0a999aa18b47e1f021d7dc56f4ef5d4b0a8c8001)
2014-02-27 20:25:30 -05:00
Allen Rabinovich
ccfaee8412
Add left side color bar
...
(imported from commit cdba90d3a4e693838338b0a93cae38a741aa28c4)
2014-02-27 20:25:30 -05:00
Allen Rabinovich
efe8fe4650
Fix right sidebar offset to prevent it from overlapping the chevron
...
(imported from commit f5b979c30fa813ab5ac93382a68828415d7e0040)
2014-02-27 20:25:30 -05:00
Luke Faraone
f304b93b91
Quote "/"s in stream/topic names for digest emails
...
Previously, digest emails provided links to Zulip that didn't correctly
encode "/" if it occurred in a stream name or topic. By explicitly
specifying «safe=""», we can request that urllib.quote escape such
slashes.
Closes trac #2294 .
(imported from commit 2e6334672969d4cf4032d2ea5dc80091af96d672)
2014-02-27 20:25:30 -05:00
acrefoot
7ebb3ec05d
Fix message for PM outside current narrow
...
This resolve Trac #2270
(imported from commit ab814e8e50f48a53054c28f07579f65040edceb8)
2014-02-27 20:25:29 -05:00
Steve Howell
09958cbf66
s/Restore last draft?/Restore draft/ in compose box.
...
(imported from commit 6f15b35e4ced62628709ec039e477a8a3a16738e)
2014-02-27 20:25:29 -05:00
Leo Franchi
7fe74a9d2e
Add a background color property to each message
...
(imported from commit add776a0814353650903258894e0db6fc8ec67b6)
2014-02-27 20:25:29 -05:00
Steve Howell
15f5884247
Focus textbox when editing PMs.
...
(imported from commit 152cb829779f808bf6ec65daa2cdc35da66e7e25)
2014-02-27 20:25:29 -05:00
Leo Franchi
dbb3bf6a4d
Fade by groups when rerendering
...
(imported from commit 31f472bb87eaa03bf38dddcc696e843d93e68e08)
2014-02-27 20:25:28 -05:00
Leo Franchi
0e55e54bec
Remove `last_message` class when manually splicing in new last message
...
(imported from commit d828cd56e797f3174c0a52240d673b708d894c33)
2014-02-27 20:25:28 -05:00
Leo Franchi
ffdfa203e8
Don't error out scrolling when there's nothing there
...
(imported from commit e2af794dafb93e3509c6fa5f28314ac8e21849b0)
2014-02-27 20:25:28 -05:00
Allen Rabinovich
13045f953f
Fix casper tests
...
(imported from commit 9376ba39e827794e0c7bd2404c08d702596786a4)
2014-02-27 20:25:28 -05:00
Allen Rabinovich
3cd33c0fea
Fix unread markers and selection border
...
(imported from commit 275f4f7d95c7842bfbfd5c47509b19275bba254e)
2014-02-27 20:25:28 -05:00
acrefoot
7390b6ec53
Use 'forced' when available to determine if it's a force-push
...
(imported from commit afbd1ed2efe2ce86ebd9639d514837211b7517b4)
2014-02-27 20:25:28 -05:00
Leo Franchi
1d601134ed
Don't error out if we get an edit for a message that's out of view
...
(imported from commit 042cadc8657d048d0fd3a410af5adbbaeac7d92d)
2014-02-27 20:25:27 -05:00
Leo Franchi
5d013b78eb
Show EDITED message on rerendered edited message
...
(imported from commit e06a951222597561a3e4dab7740fff00d95b2dd4)
2014-02-27 20:25:27 -05:00
Leo Franchi
cd16eb952c
Keep selected message selected when re-rendering single message
...
(imported from commit 8f034dfe9037cb513506714fd9c369e22af7f83f)
2014-02-27 20:25:27 -05:00
Leo Franchi
54e8bb872c
Use the dark color classes for recipient rows when needed
...
(imported from commit a77409964a185e6a8856e0577cc95bc78aa96e6d)
2014-02-27 20:25:27 -05:00
Leo Franchi
8ec1d9b552
[manual] Release desktop app 0.4.4
...
This requires a puppet apply on prod, as well as manually
updating the symlinks of Zulip-latest and Humbug-latest on
prod0
(imported from commit c5ef8cd0e2d156144531b35af9a8c5226f5bf750)
2014-02-27 20:25:26 -05:00
Steve Howell
71de0ac565
Add a test for rendering realm-specific emojis in JS.
...
(imported from commit 5909c02f9a7931f03d7131ae16b5fb70c74746aa)
2014-02-27 20:25:26 -05:00
Steve Howell
7f2f1ad533
Add test coverage for stream_data.home_view_stream_names.
...
As part of this, I also made test_basics() have a third
stream that makes false positives in the test less likely.
(imported from commit d5ba64ec9346741818e30abe9e9594788c339fab)
2014-02-27 20:25:26 -05:00
Jessica McKellar
f9d5a02710
Fix bug that hid digest email settings box for customers.
...
(imported from commit 6c1e3f53998eca0232fbfe66c62ab87b009bccd8)
2014-02-27 20:25:26 -05:00
Jason Michalski
5ad256fee7
Fix navigating away from the page in Firefox
...
When navigating away get_events will fail after we delete the event
queue before leaving the page. In that case we try to reload the page to
correct the problem. This happens before the page navigation is
complete, and then we reload zulip keeping the user captive. This was
only observed on on Firefox.
(imported from commit e001172e87a9f2ab7cf07a477e46b9d87752ac04)
2014-02-27 20:25:26 -05:00
Leo Franchi
fe826cdf2b
Grab the message id from the FRB when narrowing
...
(imported from commit 5b33a1ef09b70bf4f244fe0305a3da3f1d027391)
2014-02-27 20:25:26 -05:00
Leo Franchi
0dbcdb94af
Set the zid of the FRB parent to be a valid row id
...
(imported from commit 31c559270a1f848e11b45f5ebeea68eaf7385ce4)
2014-02-27 20:25:25 -05:00
Leo Franchi
d9bfef4848
message_list.view is a member not a function, do not try to call it
...
(imported from commit b1d609b5633a9ab42da7123a2d31a63d7627aeec)
2014-02-27 20:25:25 -05:00
Allen Rabinovich
1686d27633
Tweaks and changes to adjust for new message block markup
...
(imported from commit 78210c2b98976243ee1b516bd9400a3071dd8cd9)
2014-02-27 20:25:25 -05:00
Leo Franchi
f22885223f
Remove message id list from group divs
...
(imported from commit 620a219b5e11db79bfea971fe40deb09173deb10)
2014-02-27 20:25:24 -05:00