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

7773 Commits

Author SHA1 Message Date
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
Tim Abbott 2a0c2207d2 Revert "Add tests for our event queues data structure." 
This reverts commit 5be116d6cc983edaac240e83d1b950faa08d164c.

(imported from commit bc47f42235e9800906270a5776167f5ea001d9a2)
 2013-12-02 11:03:04 -05:00
Tim Abbott 5b601d8492 Revert "event: Add deduplication of server restart events." 
This reverts commit 05467929ba376a0ce173119c5d90d83671fc544b.

(imported from commit 4f24a0f1fe72e71fa368e1d818d9406a76c131be)
 2013-12-02 11:03:04 -05:00
Tim Abbott 2c2f404cb6 Revert "Upgrade event flag collapsing to support all flag changes." 
This reverts commit dadf3852f2ca7aaa85fb97b3d265c990b4e5a38a.

(imported from commit de5a95572aa955b4a9419b80a99d2446c51730e7)
 2013-12-02 11:03:04 -05:00
Tim Abbott 10bce7ffe8 Revert "Fix loading event queues that don't have a virtual_events attribute" 
This reverts commit 99c5ae332d253313ed728883a388c61191ed3021.

(imported from commit d7b601a2897bac6e14b675e689ee63ccc6e8d67d)
 2013-12-02 11:03:03 -05:00
Tim Abbott 5bc826067e Revert "Add comment in ClientDescriptor.to_dict and EventQueue.to_dict to avoid future bugs" 
This reverts commit 45560539d09e9e1922130349be729005b786e632.

(imported from commit aa266941f03cdbe12f4315e65ec6c472cc207204)
 2013-12-02 11:03:03 -05:00
Waseem Daher ebfcdfd35e Disable user-visible UI for editing messages, for MIT. 
This doesn't actually prevent a user from making the API call into our
servers to actually go and edit a message, so this isn't a bulletproof
solution for realms where messages ABSOLUTELY MUST NOT be edited.

(imported from commit 5bf043a201e2952189b45f93b8c5ca7648f6aee7)
 2013-11-30 18:32:14 -05:00
Waseem Daher aeaac45fd0 Hide right-sidebar user/group PM list from MIT. 
(imported from commit 2e3ba1ffd3a33450580a164c0aa1ced23eee37c2)
 2013-11-30 18:31:05 -05:00
Waseem Daher 57b6ba4250 Revert "Respect enter-to-send in edit box" 
I love press-enter-to-send but find this behavior confusing when
I'm in an edit box -- if we're going to respect it, we should
do so obviously (with a checkbox visible).

This reverts commit 6e3fc6495b7012aa12728a78b8bdd95701bb21e1.

(imported from commit d1ae16110f5504e879e315037c85c211ba3bca9a)
 2013-11-28 13:51:45 -08:00
Zev Benjamin 20cf06013e Add missing newline to crontab 
(imported from commit fe14ff383ff6915f0e60d3e6904ecdedc5ff5bf7)
 2013-11-28 02:17:07 -05:00
Steve Howell c6a5e8de34 Give MIT topic zooming. 
(imported from commit f68db6e21d91f5eb9a57c10b5abdbea9c039fd4e)
 2013-11-27 19:17:09 -05:00
Steve Howell 15d520ae1d Turn on topic zooming for three realms. 
Turn on topic zooming for three realms with users who
requested to see more than five topics (tracked on #1248).

(imported from commit 56c73926a9f3c1006451a3e4a01b7661807908b5)
 2013-11-27 18:34:22 -05:00