Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,734 Commits 28 Branches 143 Tags 625 MiB
Commit Graph

7734 Commits

Author SHA1 Message Date
Steve Howell d5b0093d0f Remove unused last_sidebar_elem vars. 
(imported from commit ec54c62dd0db68956184ec2ed6f07594e023ef64)
 2013-12-03 18:39:44 -05:00
Steve Howell 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
Jeff Arnold 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
Jeff Arnold 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
Allen Rabinovich da3f1704ed A different kind of selection fix. 
(imported from commit 377b1571cced9f1ed9e404bbc3f70abb16b7e819)
 2013-12-03 14:12:48 -07:00
Tim Abbott 850eae3e8e puppet: Disable proxy_next_upstream feature in nginx config. 
(imported from commit 84cad76701f9ee40fa9601ae06b3f804948b96d4)
 2013-12-03 15:20:45 -05:00
Waseem Daher 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
Leo Franchi 1e7a22f14e Replace other non-zerver uses of iPhone client 
(imported from commit 0988e2c9bd0499a0711daed97f89aa672776f085)
 2013-12-03 14:35:24 -05:00
Tim Abbott 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
Tim Abbott 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
Leo Franchi 1b53a77f1b Expect an ios client instead of iphone 
(imported from commit d5d3cd129d7005fd9294096d3899df86155cd366)
 2013-12-03 14:27:51 -05:00
Allen Rabinovich 5d79796465 Disallow user selection on body, but allow on individual elements 
(imported from commit b3f8f8f79952c34cdf4087683210bab6e4e46a27)
 2013-12-03 11:22:44 -07:00
Tim Abbott 878e07a5d8 Fix doubled query count logging when DEBUG=True. 
(imported from commit 32dfc4c4e366ca80e659ca3d6ab4959b0235e861)
 2013-12-03 12:21:06 -05:00
Tim Abbott f86de8c7a0 Augment update_pointer logs with new pointer value. 
(imported from commit bbe9835c2ef089dd85b7515f02ad1297026061e9)
 2013-12-03 12:21:06 -05:00
Tim Abbott f765c88ac9 The iPhone app now handles unread counts properly. 
(imported from commit 4afe4d082d9d575142087e12088a1d563e43096e)
 2013-12-03 12:21:06 -05:00
Tim Abbott abded5f886 Upgrade event flag collapsing to support all flag changes. 
(imported from commit a2ca74b779d67148aee41e92e4a4cb716620e566)
 2013-12-03 12:21:04 -05:00
Tim Abbott d2486670a8 event: Add deduplication of server restart events. 
(imported from commit e464aa8b68958fb9f9fe8c199b9e73df510d22bc)
 2013-12-03 12:20:36 -05:00
Tim Abbott 0156e72352 Add tests for our event queues data structure. 
(imported from commit 5c00251998d25cf2283737173e5af0b26ccbdad4)
 2013-12-03 12:20:28 -05:00
Tim Abbott 54b06d046b events: Add support for not storing redundant events. 
This should dramatically improve the speed of the dump/load part of
our restart process, especially with large long-lived event queues.

(imported from commit ae4ae20ba2ca4433e25a5e7beeb4fa4882c53972)
 2013-12-03 12:19:42 -05:00
Tim Abbott ad9659ea54 events: Fix zulip_finish to not make assumptions about how queues work. 
Previously, we had an issue with the ACKing protocol, where if a
virtualizable event (like a "read" flag) was dispatched to a queue
client immediately, we would not properly ACK the change because it
had been made a virtual event.

(imported from commit ea09812f8a5ba1d5aad65f536022e3dbc77b0f9e)
 2013-12-03 12:19:42 -05:00
Luke Faraone dc5c410257 Remove django-jstemplate, unused per trac #1973 
(imported from commit 97b2e75766e3576f17b7dab0f1a4a00c34a5c2e5)
 2013-12-03 11:36:18 -05:00
Steve Howell 80ec6ff8bc Remove transitional show_huddles flag. 
(imported from commit 37f6cdb4f62076faa1e977ec9b0a53cc461f0d11)
 2013-12-03 10:45:01 -05:00
Steve Howell fa5681d93b Turn on clicking_notification_causes_narrow for CUSTOMER4. 
(imported from commit edf7a341fb66a3783fe933424eeb8dea65cf2954)
 2013-12-03 10:45:01 -05:00
Steve Howell 36a7944d2a Give topic zooming to CUSTOMER4. 
(imported from commit 7f509f3d32b61708c64bfe2d5982485d8488a44e)
 2013-12-03 10:45:00 -05:00
Waseem Daher 2223d2e465 Un-blue the (more topics) link. 
(imported from commit 91f06b1d213b3ea4e7db9fcedf7f4f41437c060d)
 2013-12-02 22:33:40 -05:00
Steve Howell b09884e589 Re-style the "(more topics)" link. 
For some reason "font-style: italic" causes the "(more topics)" link
to be invisible for a while.

(imported from commit e75610e4b1f1263a48dac76ab8d01bb4a29c3d47)
 2013-12-02 21:42:31 -05:00
Jessica McKellar c46e5fd0f1 Feature flag the digest emails setting to staging. 
(imported from commit 1239ce31281850dccf8f65d0c7156bd2c86ca3a7)
 2013-12-02 18:58:04 -05:00
Jessica McKellar 11d5f8bbc5 Add a test for unsubscribing from digest emails. 
(imported from commit 145c25ae99cf66b9a447b2e3a44a3b7344dc9f59)
 2013-12-02 18:58:04 -05:00
Jessica McKellar e15cc972ec digest: refactor sending the emails into a function for easier testing. 
(imported from commit 2f3c8fb8e812c04ab838b1034ae0811309186625)
 2013-12-02 18:58:03 -05:00
Jessica McKellar c1058355f6 Add a digest emails checkbox to your settings page. 
(imported from commit cf1dbae6ca30d2489a77e822c34941a986b93bbd)
 2013-12-02 18:58:03 -05:00
Jessica McKellar 207cfc449d Add unsubscribe links to digest e-mails. 
(imported from commit 4e2a324decf4bc694752cc24b9085361338a08a5)
 2013-12-02 18:58:03 -05:00
Jessica McKellar 1b068d5433 [schema] add boolean field enable_digest_emails to UserProfile. 
We'll use this to track the user preference for receiving digest
e-mails.

(imported from commit a56644b1a359444ded45f9437c954194b9ae47a1)
 2013-12-02 18:58:03 -05:00
Tim Abbott 7aef6423de Include /usr/lib/nodejs in node search path. 
(imported from commit c818905a91a5fe5754a0bddeb12caa00b50bfed3)
 2013-12-02 17:49:08 -05:00
Tim Abbott 16f3f585c3 Fix composebox typeahead tests. 
(imported from commit ca6e7ea00d79139a0d7db0f1dd5f3ba8d8da5ce3)
 2013-12-02 17:42:24 -05:00
Tim Abbott d57404683f Add documentation on search operators. 
(imported from commit 9ed5692685b52d6e4d4f1a59c1b4cc0fde252ff2)
 2013-12-02 17:15:24 -05:00
Steve Howell 2423c9bc15 Speed up ./tools/pre-commit by checking only staged files. 
(imported from commit 2669635c94c41890bfe712f609b640b013a61782)
 2013-12-02 16:14:06 -05:00
Steve Howell 3e51ac2f3d Add -m to lint-all to check modified files. 
This uses git ls-files -m, which will show modified and added files,
but it doesn't seem to show staged files, so buyer beware.

(imported from commit 6ecc1d5ee628deae17197addf5586f1f6bcd4b9c)
 2013-12-02 16:14:06 -05:00
Steve Howell 72e2fbd725 Allow specific files to be checked by lint-all. 
(imported from commit a17800e3ab079e95033243bc82446737dc456b68)
 2013-12-02 16:14:06 -05:00
Steve Howell 95320b7369 DRY up forking code in lint-all. 
(imported from commit f4c52596c9e9cf0a1be5d4bea26f9793c67f93d5)
 2013-12-02 16:14:06 -05:00
Tim Abbott 55acdb546e Add @-everyone to the composebox autocomplete. 
(imported from commit 32476a92d4df06b566eeb701bab119c395d9d4bd)
 2013-12-02 16:03:21 -05:00
Tim Abbott 9d8adba30c settings: Add some new IP addresses to ALLOWED_HOSTS. 
(imported from commit e2794219b7393bc2513142e074b43513ba120e9c)
 2013-12-02 16:03:21 -05:00
Tim Abbott ef906c3cd3 Fix traceback when unnarrowing before home message list has loaded. 
If we load a browser window in a narrowed view and then un-narrow
before the home message list has loaded, we end up attempting to
select message ID -1 from home_msg_list even though it is empty,
triggering a traceback.

(imported from commit eb8b686f6e9c1fa518028e5755ac6196781e92d7)
 2013-12-02 16:03:21 -05:00
acrefoot da1466cfa9 handle case of message getting read while processing missed_message 
(imported from commit cd53efe3645f5dc8943becc2b8dbd3d607bb8eba)
 2013-12-02 16:00:56 -05:00
Steve Howell 00946f97df Log more data for "Cannot select id -1". 
Show the incoming id and the length of this._items.

(imported from commit 106dda862918a4f40481a5692cbfee1738218150)
 2013-12-02 15:45:40 -05:00
Steve Howell 45a23712ff Select first unread msg when narrowing from user sidebars. 
(imported from commit a57508fb2084559c968b23ec4643b7484cbba6cb)
 2013-12-02 15:43:34 -05:00
Leo Franchi 42e23dc82e [manual] Release desktop app 0.4.1 for OS X 
This requires a puppet apply on prod0, and an update of the
Zulip-latest.dmg and Humbug-latest.dmg symlinks in
/src/www/dist/apps/mac and /srv/www/dist/apps/sso/mac

(imported from commit e83170a19ac2de6458a0fd43140068fab4135483)
 2013-12-02 15:24:32 -05:00
Zev Benjamin 9fa9f81a0a puppet: Add ptop to postgres-common packages 
(imported from commit 085bf7d0ef33f8287bea9152e328908a89144b8f)
 2013-12-02 14:54:53 -05:00
Waseem Daher ca85e5bc51 Link to our API page from the Github repo README.md 
(imported from commit 2dfa7a3bf27a15f1f43ee2ecef5d501c17669bde)
 2013-12-02 13:18:04 -05:00
Waseem Daher 89844c6ced Revise day1/day2 emails. 
(imported from commit dc5e78cccb22b024be46b3066d44f09ea1b53345)
 2013-12-02 11:15:13 -05:00
Tim Abbott 559f0896a1 Revert "events: Add support for not storing redundant events." 
This reverts commit cc493fa50b4c339257e060b3f0c0956c682e449d.

(imported from commit 9e8edfc11d415d61581da482d66bc9fa30cbefdf)
 2013-12-02 11:03:04 -05:00