Commit Graph

5862 Commits

Author SHA1 Message Date
Scott Feeney 6f0530ec46 Include Underscore in our "common" js bundle
This way it can be used throughout our JS, not just inside the app
proper.

(imported from commit 2bd97534cb7a3e433918747f0e397786fdfc4d2b)
2013-07-29 15:33:23 -04:00
Leo Franchi e0374cf761 Add sender_id to sent messages
(imported from commit 5ed87152143fbc2c5936ee3903b6dbef4f1c9e32)
2013-07-29 15:26:47 -04:00
Scott Feeney 0de1d3dc1f Fix "a[n] invite-only stream"
(imported from commit a4572dc1541b10f30ec0618e29371d6a187c1809)
2013-07-29 14:53:16 -04:00
Scott Feeney 85ce86c4fd "Already using Humbug" -> "Already using Zulip"
(imported from commit e05812ed3bae64f9daa7d60a7d5b2404edb306fc)
2013-07-29 14:53:16 -04:00
Scott Feeney 9e2e857a88 Fix narrow test calling .then() in a callback
As Kevin points out, un_narrow() itself calls casper.then() so should be
called outside of a callback, not inside one.

(imported from commit c5f02a14c750045697558aeafb070227e3a9d24c)
2013-07-29 14:51:40 -04:00
Scott Feeney c2ce181203 Fix race conditions in 02-narrow.js tests
(imported from commit 6a4b22992c35cdebc86194282d6a348ee9c4b810)
2013-07-29 14:51:40 -04:00
Steve Howell a004a15ff5 [important] Fix paths related to recent zephyr/static changes.
This fixes the previous commit to master.

(imported from commit 43637dcf0832a4e91de9fd98ebb777c77a3eee19)
2013-07-29 14:02:20 -04:00
Steve Howell 46c4a6a9b3 Add unit test coverage to unread.js.
This covers most of the module's functionality, with special
emphasis on lines that use underscore.js (_.each and _.filter).

(imported from commit 074181a0273286a258504be634bdd1cead2eecd5)
2013-07-29 13:47:57 -04:00
Steve Howell 3d8ce28964 Use underscore in unread.js
(imported from commit 91befaaaff5d9a791a3c1bb4ff99f4085c27c4cb)
2013-07-29 13:47:57 -04:00
Steve Howell 09bd52fff4 [third] Add underscore.js
(imported from commit ee17cc1d1dff2a6f816a81bb33fa04ca5562a441)
2013-07-29 13:47:56 -04:00
Steve Howell f92b3a9129 (css) Remove #bots_list width setting.
The width setting was unintentional, and it interferes with
the inline-block settings for the image and bot info.

(imported from commit 741c82829efed00b6d47badcf14b26223b47a7a9)
2013-07-29 13:17:26 -04:00
Tim Abbott bc4d7c687d Rename our custom JS events to use Zulip, not Zephyr.
(imported from commit 61ac456d394a6dbc14f3e9183a53313990db5059)
2013-07-29 12:11:26 -04:00
Tim Abbott 3bba0cc927 Move zephyr/static to just static.
It's not really a part of the server (aka the rest of zephyr/).

(imported from commit 27f6b6b064938ad927075a68d873e4b68710d279)
2013-07-29 12:11:26 -04:00
Tim Abbott 1e71d91455 Fix pipeline configuration for development environments.
Our code happened to work under python-django-pipeline <=1.2.7, but
newer versions correctly looks whether the files exist under
STATIC_ROOT, so we need to set STATIC_ROOT correctly.

(imported from commit ef48a75e0f6a4adae742dd1fd386a48e630f1850)
2013-07-29 12:10:54 -04:00
Tim Abbott ffc2f05cbb Rename zephyr.css to zulip.css.
(imported from commit 094580c1563fa05ecff58d6fb86bf2338a32b1a6)
2013-07-29 12:10:54 -04:00
Steve Howell a9da6e28e7 Made minor changes to test_message_tour.js
I added a comment at the top, and I made it run the test
more automatically.

(imported from commit db6e382d766d0cc35eed28d589608645253f23e8)
2013-07-29 10:28:14 -04:00
Waseem Daher b6d2682abf Remove inelegant gear menu hack.
Rather than play elaborate games to strip off the 'active' class, we
just neutralize it by making it the exact same as the inactive class.

(imported from commit d26a02ca0edef6ee86affa2fa5daee0426eb5f8a)
2013-07-26 18:37:07 -04:00
Waseem Daher 474a42a9bb Typo fix: mox-shadow -> box-shadow
(imported from commit ba8931c232d25d3bc5cd4e46110b923c1a9f63a9)
2013-07-26 18:36:40 -04:00
Steve Howell 945562fbe1 [bugfix] Fix the recent gear hovering regression.
It's a long story, but we need to set the actual-dropdown-menu
class for the gear, since it messes with bootstrap's notion of
active.

(imported from commit 94f2d9ee65014bc954e088e6c913d9682b7322f6)
2013-07-26 18:12:06 -04:00
Steve Howell 04df44f91f Allow a backdoor for styling dropdown hovers in bootstrap.
We had to turn off hover styling to make typeaheads work properly, but
some plain dropdown menus might need it, like our gear menu, and they
can set a class of actual-dropdown-menu to be unaffected by the
typeahead patch.

(imported from commit af41c1cfa6da3ff90ca4245a12c47993c65e6766)
2013-07-26 18:12:05 -04:00
Leo Franchi d68df4f142 Don't infinite loop if trying to bankrupt while pointer update is in flight
(imported from commit e23be332ff86239283b9568e8e4c92edf0c59f75)
2013-07-26 17:32:49 -04:00
Luke Faraone 942cc94b04 Install files to customise postgres for maximum performance.
Configuration provided by Zev.

(imported from commit 4d0cdbb6747689863208079e2c21864521e1cf02)
2013-07-26 17:11:54 -04:00
Steve Howell b8794e1a9d Revert "[third] Mouse-enable naturalSearch option in typeahead."
This reverts commit 02318d3d830e7e28d638efee0ef27023a73f52f7.

(imported from commit b6e48772dbef127a9e25e5ea5042d250cce6fed1)
2013-07-26 17:11:43 -04:00
Leo Franchi 7b6579c74c s/humbughq/zulip/ in graphite setup
(imported from commit 5c87bbe3d1ae4f57c5f66899b66cbd4417e49887)
2013-07-26 16:23:03 -04:00
Luke Faraone 7c2de24213 Make trac.ini world-readable
This is bringing our puppet configuration in line with reality.

(imported from commit 48a10676a9f28566dd89fff1337a4b34c23c0b61)
2013-07-26 16:14:55 -04:00
Luke Faraone 5e2dda4d73 Configuration for puppetized MediaWiki on trac.
(imported from commit cff2becbe590e50414f74a31ea2a2914de49f4bd)
2013-07-26 16:14:55 -04:00
Luke Faraone 85988df75d [third] Import Auth_remoteuser.php into puppet.
This is a module we're using for REMOTE_USER support in MediaWiki. It is
not used in any app code nor is it distributed, nor is it incorporated
into any comapny works.

License: GPLv2+

(imported from commit da9a81db251cf850335987697ea8383623b58c53)
2013-07-26 16:14:55 -04:00
Luke Faraone 41504762a1 env-wal-e: Use a different bucket if not running on an app postgres server.
(imported from commit e06be77d544532885fbc4769fedb55eedac22ccd)
2013-07-26 16:14:55 -04:00
Luke Faraone 76a58fe800 We are no longer using gitit nor is wiki running off git.zulip.net.
(imported from commit fbe1bc2804a5ed6ccecb7b3090b55d7e9fa5b1bc)
2013-07-26 16:14:55 -04:00
Luke Faraone a78718e299 Back up MediaWiki by dumping to an XML file and committing the result
(imported from commit 1f5d6b114e6dcf6940a56d9501ef41c15a772dd0)
2013-07-26 16:14:55 -04:00
Luke Faraone 639d963ff5 Split out app-specific postgres configuration.
(imported from commit 979811e69f436d02023a6c62e614a39c19bf64b8)
2013-07-26 16:14:55 -04:00
Tim Abbott ab74c5d0d2 Add error handling for process_user_activity bot.
(imported from commit 367e2c76d1d6de634bbbb70c9b1c1b8c82027c9e)
2013-07-26 16:06:59 -04:00
Zev Benjamin 603f0d7ace Speed up subscription table rendering
Previously, we'd render all the rows of the table except the first
(which is for creating new subscriptions) and append them all to the
table.  This ends up being really slow.  We now instead render the
entire tbody element and replace the existing tbody element.

When profiling on my laptop, this reduces the rendering time for a
few thousand streams from ~62 seconds to ~2 seconds.

(imported from commit 83a48e0e1f776f7663343662157298e89165ece3)
2013-07-26 16:01:13 -04:00
Zev Benjamin c87a58b27e handlebars: Add alternative partial support
Regular Handlebars partials require pre-registering.  This allows us
to treat any template as a partial.

(imported from commit fff785d4fa944547b7ad4c3a620ef9400777ec87)
2013-07-26 16:01:13 -04:00
Steve Howell 958955da23 Run node-based JS unit tests from test-all
(imported from commit 5bf9b690dfd3ac83296a58cf44a170960adaed39)
2013-07-26 14:52:33 -04:00
Steve Howell f258ce2127 Created test_message_tour.js.
I haven't hooked this into test-all yet, but I did modify
message_tour.js to accomodate the test.

(imported from commit e58f595f4fe1160f539c18ec09dbe22eebf1f104)
2013-07-26 14:52:32 -04:00
Scott Feeney a8c749f62b Use normalize_recipients() when adding message metadata
This change also adds comments to make it clear what the function does
and why it's used.

(imported from commit 68382abaf2d7c41c7de7d92cbf6e7583003aaf2a)
2013-07-26 14:44:30 -04:00
Scott Feeney d11a997dc3 Show space between multiple recipients (#1606)
Also adds a CasperJS test to verify multiple huddle recipients are
displayed properly.

(imported from commit 07f5f5ed30e360ac3f524d89e512bb1f20acaaa7)
2013-07-26 14:44:07 -04:00
Steve Howell 5b066c2289 Added comment to message_tour.js
(imported from commit 498ab9be3d499a1b8dbba97c051fbbd9a5f7290f)
2013-07-26 14:16:36 -04:00
Steve Howell 625003cbe1 Nudge pointer past visited msgs when coming home.
When you return to Home, we normally restore your last
position when in Home, which might have been before the
first unread message.  This is cumbersome for sidebar readers,
so now we keep track of messages that you visit while on a
tour away from Home, and when you return Home, we skip forward
any messages that were in the tour, landing on the last visited
message.  This all happens before rendering.

(imported from commit 9124a231d94f153e283e5ea95e40c50a58406275)
2013-07-26 14:03:55 -04:00
Steve Howell 41f744c3b8 Refactor how we mark a message range as read.
The goal here is to make it so that we can do other stuff with
the range of messages between two subsequent selections, besides
marking them as read.

(imported from commit f6eb07844fb2ccda195c9d4dfcdf1c15f3f40aff)
2013-07-26 13:58:01 -04:00
Steve Howell 6217c1a3be [third] Mouse-enable naturalSearch option in typeahead.
When hover over a typeahead menu item, the semantics have always been
to make it active, and now we also respect the naturalSearch option
there, which will set the text of the search box to the suggestion
immediately upon hover.

(imported from commit 02318d3d830e7e28d638efee0ef27023a73f52f7)
2013-07-26 12:00:30 -04:00
Steve Howell 7a3a3be7e5 [third] Fix sticky hover background color in typeaheads.
See https://github.com/twitter/bootstrap/issues/7392.  I seem to
have fixed it with just the CSS part of their suggested patch.

To repro the bug prior to this fix, enter search, hover over a
typeahead, and then hit the up arrow key.  You'll see two items
appear to be selected.

(imported from commit 383d60a606d7c19344a326208312a1555d060877)
2013-07-26 12:00:13 -04:00
Waseem Daher 647ae655b0 Revert "Don't allow content to overflow out of messageboxes."
This commit broke unread dots, since they're in the .messagebox
but absolutely positioned outside of it (so they got clipped.)

This reverts commit e0071851d2dc7d99c9acd93a1fc6fa1ce0c3b70e.

(imported from commit b3181b3a02cef905cc8f400f8c1cc3c92b5f0e15)
2013-07-26 10:51:18 -04:00
Zev Benjamin b478ccc347 Rename button to regenerate bot api keys
(imported from commit ee7c30d051e7532e4e8091c3bbc6575602ba360f)
2013-07-26 09:14:10 -04:00
Waseem Daher b277e6cc1b Start unread fade sooner.
The total duration of this animation is the exact same, but
it starts immediately - let's see if this feels any better.

(imported from commit de86c259a25adb64514613579476480bdac29cb2)
2013-07-26 09:05:32 -04:00
Zev Benjamin f7b7f074e9 Add tool for migrating users from Gravatar to user avatars
(imported from commit e3fbeb74489952f00f9063303f4026ee6a7148fc)
2013-07-26 07:39:16 -04:00
Steve Howell 91b05ffe88 Make sure stream:x foo suggests stream:x topic:foo
There was some misguided code that eliminated the suggestion when
the user typed out the full topic, and since then there is more
generalized protection against duplicate suggestions.

(imported from commit 857e74458d10995170d312b77d99d839706ae680)
2013-07-25 18:11:50 -04:00
Waseem Daher ed76d14e42 Don't call compose.start twice when on staging.
I'd encourage you all to review this diff thoroughly, since I am not
very familiar with this code. However, it seems to me that, prior to
this commit, if respond_to_cursor is true and page_params.staging is
true, compose.start gets called twice! (once by `respond_to_message`
and once by the "if (page_params.staging)" under the else, after it
returns.)

I eliminate the second call by sticking it inside the first else; now,
as far as I can tell, we call compose.start once and only once.

(imported from commit 319f51392541def358a138c104dd21722b4f8ba8)
2013-07-25 17:53:31 -04:00
Tim Abbott 975f4aa59f api: Fix path in send_message example.
(imported from commit 6aab581bf00736986ffcd11042c757eff0c78653)
2013-07-25 17:27:46 -04:00