paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 17:36:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,322 Commits 30 Branches 160 Tags
3dcde1c139c20ec77d57f7178ab794328b43bf9c
Commit Graph

26322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keegan McAllister
37ac9d2a91 select_message: Misc cleanup 
We can safely call .is(':hidden') on an empty jQuery result and get false.

(imported from commit a73932f63b8fec7c43d8603fca95adcd4f164317)
 2012-10-23 16:28:40 -04:00
Keegan McAllister
d34bebc584 select_message: Properly fall back to the first visible message 
Our old selector here was picking up the floating recipient label, or
something.  This was breaking narrow-to-all-huddles when on a stream message --
you get no selection and the code is sad.

(imported from commit d25fab03bd6d745df6d787c0b1b6452c8c539e32)
 2012-10-23 16:28:40 -04:00
Tim Abbott
7be626ff2f Run trac on top of Apache rather than the standalone server. 
(imported from commit 2e9ee69a6f36b4c145d83abdf975bbe5d7ec1c7d)
 2012-10-23 15:58:02 -04:00
Keegan McAllister
b049749cb2 New hotkeys for narrowing 
- s for stream or huddle
  - S for subject
  - p for all personals (still buggy)

We've eliminated the 'g' prefix entirely.  And the old 'g-a' un-narrow sequence
has no new equivalent, but you can still use Esc.

(imported from commit 6bdaacce9639e3f749418e06622a317937e7d014)
 2012-10-23 15:28:07 -04:00
Zev Benjamin
ce3ea9f019 Temporarily disable pointer sync 
(imported from commit 74e6bb347e0b8c01b6450914a50448b78b9749c9)
 2012-10-23 15:24:00 -04:00
Tim Abbott
c5f262987f Add apache2 site configuration for trac. 
(imported from commit 81d173070a449168d6d8e08a557134dbda66f2bb)
 2012-10-23 14:52:04 -04:00
Tim Abbott
7079efba8d puppet: Make humbug's authorized_keys file owned by humbug. 
(imported from commit 4237203722d7782cb5c479e408966494bc703149)
 2012-10-23 14:52:04 -04:00
Tim Abbott
7a56448a35 Move humbug-self-signed.key to new certs directory. 
(imported from commit ed8ff32739e21cca3d6173e19bb425da8a3a18ea)
 2012-10-23 14:52:04 -04:00
Waseem Daher
f69bd6ad4b Fixup display of huddle messages. 
(imported from commit 981fc7998c695b8e6a75d7b00da0a63e0cc4164a)
 2012-10-23 13:55:34 -04:00
Tim Abbott
9ed02e220c puppet: Disable creating new servers as wiki/frontend for now. 
(imported from commit 20250365a3d82479d5dd33ecb0ee9b5c3db68029)
 2012-10-23 13:32:34 -04:00
Waseem Daher
cd62827158 Fix issue with border on huddle messages. 
(imported from commit 6a671dee15bb407207d34f7495987cbcd012d9a0)
 2012-10-23 13:31:52 -04:00
Keegan McAllister
86159813df Hide the "Load older messages" button in narrowed view 
Ideally this would be part of hiding zhome, but right now zhome/zfilt are
assumed to the tables themselves, and changing that seems unfortunately
invasive.  And it's not crazy to think of the "loading controls" as a logically
separate thing that we might show/hide independently.

Longer term, we may want an indication in narrowed view that there could be
more messages on the server.

(imported from commit eb72d720da7c03f6f1378ae18ab6e973bf98247f)
 2012-10-23 13:28:08 -04:00
Luke Faraone
a139f8b6b2 Fix incorrect references to userprofile in the API 
(imported from commit 77c062b54c545185aee28189726f61a874a1fe77)
 2012-10-23 12:05:56 -04:00
Zev Benjamin
6403cc3592 Display a small gravatar in the nav bar when using the phone layout 
(imported from commit bdfc5faa7e93b0d90abc63423be1719611f89dc0)
 2012-10-23 12:03:56 -04:00
Zev Benjamin
fca4cade34 Ignore long-poll successes with no data 
The server will occationally return successfully with no data during
a restart.  Previously, when we would get such responses, the page
would stop working because of JS errors.

(imported from commit 39b89907dc5ae9a9eb54ebf60d0069281e401786)
 2012-10-23 12:03:56 -04:00
Tim Abbott
9779ca9e5c Shorten get_updates timeout to under a minute. 
(imported from commit fcc87011051c25051861e3c36e442398cd3ca3c0)
 2012-10-23 11:31:32 -04:00
Keegan McAllister
03a02ff439 zephyr_mirror: Un-linewrap messages coming in from Zephyr 
Reinstated from 65d00bf911231cb15d3a6713e64ed8dff28a613a .  The server's
Markdown parser now treats newlines as line breaks, so we need this again.

(imported from commit 242ed53b7f1308f21a6e6a194e24c176545a079b)
 2012-10-23 11:26:40 -04:00
Tim Abbott
386b48e80f Don't log tabbott/extra test messages. 
(imported from commit 8e1adecca14e5440298fd93b41e1a43da37c807f)
 2012-10-23 11:08:27 -04:00
Tim Abbott
6f4b0de057 Set a client name for the mirroring Nagios check. 
(imported from commit e90bf0277479c856dcb975c9b5a3a1178abf1379)
 2012-10-23 11:08:27 -04:00
Tim Abbott
de5d48f51f Make the client name a global property of the Humbug client. 
(imported from commit 3401686986a2670b3636e99fb11761c07a934bca)
 2012-10-23 11:08:27 -04:00
Zev Benjamin
02ec29a0ca Increase gravatar size in nav bar 
(imported from commit 1f3eee22bb298de53a749bbacca63022de9526b4)
 2012-10-23 10:55:19 -04:00
Tim Abbott
fdeab96b4c Add a default client name for the API. 
(imported from commit a14b2f8bd9ff604c5f522c85842d296be38d33e6)
 2012-10-23 10:54:36 -04:00
Zev Benjamin
ed05e28e55 Update server when selected message changes via scrolling 
(imported from commit a763baf064e73d358632f3754aba940d188f733d)
 2012-10-23 10:30:59 -04:00
Tim Abbott
a9667d81a8 Fix performance regression caused by last commit. 
(imported from commit f0abf93dbab92c5627903284fafad310de039fe6)
 2012-10-22 22:01:55 -04:00
Tim Abbott
8c16295301 populate_db: Fix replaying personal messages from logs. 
(imported from commit 685a426fe59fa240c8ae5cf357a43d4df0a3f05d)
 2012-10-22 21:36:32 -04:00
Tim Abbott
846469c39c [schema]: Rename userprofile to user_profile. 
(imported from commit adfb6152b7ec32557e3465d961695eb870506d5a)
 2012-10-22 18:55:45 -04:00
Keegan McAllister
cec9649b0d Brighten the hover color for huddle recipients bar 
The Bootstrap default color is too dark against a black background.

(imported from commit 2a0b320564d004ddc606856d004864ba21763a94)
 2012-10-22 18:34:12 -04:00
Tim Abbott
93616039bc Use the new client data model to deduplicate mirroring. 
(imported from commit 6ac38534aea11b1e7f8f332e76251f9501f9ab3e)
 2012-10-22 18:31:36 -04:00
Zev Benjamin
899d5c776f Check reason_empty on client when there are no new messages 
This fixes a problem where the client would never stop asking for old
messages (bug introduced during rebase)

(imported from commit eef9f19e1e9982b1e0a954eb36a81e1b7ee5b564)
 2012-10-22 18:19:14 -04:00
Tim Abbott
2374b6e16f API: Update error handling. 
(imported from commit 2084975c5476a4792a633bf70469be26082da8c3)
 2012-10-22 18:18:00 -04:00
Keegan McAllister
4828e3d7fb Add app.humbug.com cert with CA chain 
This is the format Nginx wants.  It contains the following files concatenated
together in order:

    app.humbughq.com.crt
    startcom.pem
    sub.class1.server.ca.pem

(imported from commit 6ed5679501f48729b4b4df19169042d5c0c37b5d)
 2012-10-22 18:00:37 -04:00
Keegan McAllister
9ff633ccfe Add nginx config 
This is not yet hooked up to Puppet.

(imported from commit 1d0368285a5a9ef5a4af0651001db4930cf77578)
 2012-10-22 18:00:37 -04:00
Tim Abbott
1b1d5cb577 Fix all mirrored stream messages appearing to be from me. 
(imported from commit 777f98a564d3f169d3c69fcda980ce5993910d88)
 2012-10-22 17:59:21 -04:00
Keegan McAllister
4ca720a0cd bugdown: Install autolink pattern after link pattern 
This fixes explicit links.

(imported from commit 6867d271344d35c2c8d54b3393219113a095bc4f)
 2012-10-22 17:48:48 -04:00
Tim Abbott
2b1902dcc7 Return a user_profile from create_user_if_needed. 
(imported from commit d71a9b1f326f783e387bb70b5215c934799fb5f2)
 2012-10-22 17:47:05 -04:00
Keegan McAllister
05c08b41c4 bugdown: Disallow ()[]{}<> in linkified URLs. 
This allows us to handle messages like

    my website (available at http://google.com)

(imported from commit 51330507947fc039b6f29f06dfa1c6d21f779aa4)
 2012-10-22 17:32:39 -04:00
Keegan McAllister
1c4bbd6a49 bugdown: Start a URL with a word boundary, not a space 
This fixes the bug where we were eating the preceding space.

(imported from commit 9eca01e6ad828ccc31ad10693339f381333e76a7)
 2012-10-22 17:32:39 -04:00
Zev Benjamin
0f474285bf Up idle timeout for reload 
(imported from commit 7d9c7dbd77f49865d7e1922ddcee08cd963f4abf)
 2012-10-22 17:30:26 -04:00
Tim Abbott
bce793005d Fix mirroring of personals. 
(imported from commit 91ae9e6bb20389a708bd6b1945c898b98b96ee4a)
 2012-10-22 17:21:07 -04:00
Zev Benjamin
f817bf6144 Pass the session that updated the pointer from Django to Tornado 
This allows us to check whether the session that updated the pointer
is the same as a session that is doing a long poll to avoid sending
new pointer information when that information is coming from the same
session.

We still return from the long poll early, though, which is sub-optimal.

(imported from commit 7d4be0956f112eacefb7d198ea929957cd2b05e3)
 2012-10-22 17:16:47 -04:00
Tim Abbott
d17db6687c Improve validation of zephyr mirror data. 
(imported from commit 9ebc43d17d1f4040da2deff271ba7e158908a29b)
 2012-10-22 17:08:09 -04:00
Zev Benjamin
732ca19729 Synchronize the pointer across sessions 
The client may now optionally send its current pointer during
get_updates and the server will return the latest pointer if it
differs and was updated more recently by a different session.

(imported from commit e43b377d7dfb52f83cefb0b1003863d5407caf80)
 2012-10-22 16:44:57 -04:00
Zev Benjamin
7e4b7fb881 Add message selection option to not update the server 
(imported from commit a5ef9506be24fee7652cd5479cb74789aa365216)
 2012-10-22 16:06:38 -04:00
Zev Benjamin
bb64eb717f Make select_message and friends take an options argument 
The select_and_show_by_id function is now subsumed by select_message_by_id.

(imported from commit 3dbe9cf9d253b64733f269b6dc78c144100927ca)
 2012-10-22 16:06:38 -04:00
Zev Benjamin
35bb3613cd Rate limit pointer updates to avoid hammering the server 
(imported from commit e1add1b64779f3d0caf5426eb99233e78de278ae)
 2012-10-22 16:06:38 -04:00
Zev Benjamin
66d7678423 Add UserProfile callback for pointer updates 
(imported from commit bfa9c15d82f092a1810cfcee1a88e1e292bc4cb8)
 2012-10-22 16:06:38 -04:00
Zev Benjamin
2a4c3b5bff Abstract the callbacks table in preparation for more kinds of callbacks 
(imported from commit 695d5bceb4657ef25ba5983212082ee0c76b9d33)
 2012-10-22 16:06:38 -04:00
Zev Benjamin
7ac0625e39 Add model field indicating which session most recently modified the pointer 
(imported from commit 819ab358d9fa6f22ad8ccee56fe723ea7711ebc5)
 2012-10-22 16:06:38 -04:00
Keegan McAllister
fcc21bec21 5xx: Reformat text 
(imported from commit eaafd17560714729b23df8947a94ebd1815cec23)
 2012-10-22 15:22:49 -04:00
Keegan McAllister
ba85e3babf Add a static 5xx error page, for nginx 
(imported from commit e0ca9ba4e88f4825954c3b70c7b1acadb5b37779)
 2012-10-22 15:16:04 -04:00