Commit Graph

659 Commits

Author SHA1 Message Date
Zev Benjamin 28b154bdeb Move integrations Javascript to a customhead block
(imported from commit 1483230e6b2ed5c7954c8cc3041ab9f8680ff790)
2013-04-04 11:34:05 -04:00
Luke Faraone 7256e5c2bf Switch existing documentation to the new API style
(imported from commit 12e4cb89900a5a6663c0d23cdf7367406333a1fb)
2013-04-03 15:35:59 -07:00
Leo Franchi d8bed8dc08 Update integrations copy to mention %40 hack
(imported from commit 3b952309289204317a2a5ba57ba17e75ae9732ac)
2013-04-03 10:21:06 -04:00
Keegan McAllister 5ebd281f38 Serve only the runtime part of Handlebars in prod
(imported from commit 8e55cb99deff680c832502396625b8cb1054e0cb)
2013-04-02 14:44:27 -04:00
Keegan McAllister 17d5406b55 [manual] Fetch Handlebars templates using Ajax
...rather than embedding them into index.html.

This is only acceptable for dev, but the next commit adds an alternative
mechanism for prod.

There isn't actually a manual deployment step here.  However, this commit won't
work on staging / prod without the next one (since we don't serve
zephyr/static/templates in prod).

(imported from commit dce7ddfe89e07afc3a96699bb972fd124335aa05)
2013-04-02 14:43:58 -04:00
Keegan McAllister 37c5e1acd5 Upgrade to Handlebars 1.0.0-rc.3
Not needed for any specific reason, but we will need the .runtime.js file
eventually, and we should use a version of the library that matches the
Handlebars compiler.

(imported from commit 5600bc8d44b681999e2e5bbf04b890e2bb8477a1)
2013-04-02 14:43:58 -04:00
Leo Franchi e727caa4e8 Add integrations blurb about Beanstalk
(imported from commit e8f952dd9614fd050891275084e5b2f7be1471c4)
2013-04-02 13:35:43 -04:00
Tim Abbott 1443edce00 Access the UserProfile's new email field rather than using User.
This is preparatory for stopping using the User model.

(imported from commit a1b0808c8cc2ddd19a25163f91c4f18620c9ce90)
2013-04-02 12:07:08 -04:00
Jessica McKellar 33a9bae5d1 Tailor empty narrow messages to what you were narrowing for.
(imported from commit 876afce2a63d4d6a522ac5300349b2be8805405f)
2013-04-01 14:26:50 -04:00
Waseem Daher 6067ada53e integrations: Clean up Jira documentation page a little.
(imported from commit bea7a499a2d4584bca136f5c77beff38a9498d59)
2013-04-01 09:50:58 -04:00
Leo Franchi 0712cc6279 Update integrations page with webhook info
(imported from commit 77a8100d09732d34923de79f03acfb8495ada6bb)
2013-03-29 16:14:39 -04:00
Jessica McKellar 08422009fe Add a `Starred messages` sidebar link.
(imported from commit 0109e64b412afcd8d0d58b5e027d30c82faa970c)
2013-03-28 16:59:59 -04:00
Waseem Daher 1b6d86ef88 Properly encode spaces in mailto urls.
Apparently + is just how you used to encode spaces in aim:
urls in 1999, not in mailto: links.

(imported from commit 156708378e6b1d6955063a0979c8bee9d5b0e849)
2013-03-28 14:43:51 -04:00
Tim Abbott 4a91b4a1ea [django 1.5] Use new-style url syntax in templates.
Checked using the following (relevant for rebasing):

git grep url templates/ | grep -v "'django" | grep -v "'zephyr"

This appears to not have a good backwards-compatability story (well,
there is one involving a %load from the future, but it seems to not
work).

(imported from commit d740831658aa23cadbbb82082ac6a3738d449a1d)
2013-03-27 08:19:26 -04:00
Leo Franchi ae42e77ad6 Fix copy in Jira integration page
(imported from commit 12bae68313ca7497686a59bfcad93802ec2991cb)
2013-03-26 18:37:54 -04:00
Leo Franchi 6573a4ebb0 Bump API version to 0.1.5
(imported from commit 7c8c66369971e44405219eddac7e8bb3ddb44063)
2013-03-26 18:20:08 -04:00
Leo Franchi 9de2442bd9 Add infomation in JIRA integration in our integrations page
(imported from commit 2aef274c630cc918a6fde8fa33a4598ba8ee7f3f)
2013-03-26 14:14:47 -04:00
Jessica McKellar 7104de7af1 Make message formatting accessible from gear drop-down.
(imported from commit bbd7a0562bc96206b2d692433aa8c35cf3f9010a)
2013-03-26 14:05:45 -04:00
Keegan McAllister 7309d57067 Output page_params as a single JSON object
This is a lot cleaner, and also cuts about 50-70 ms off of page load time in
local testing (with lots of users), presumably because there's less work to be
done by the slow Django template engine.

(imported from commit 257b700238ee5d9a4ae00a53011ed5bce018124c)
2013-03-26 13:51:21 -04:00
Keegan McAllister 6d9aca5f1a Move "page parameters" (email, enter_sends, etc) into a single object
(imported from commit 842b2371bf6364982f1358f1cd2d91118c7fb2bf)
2013-03-26 13:50:03 -04:00
Waseem Daher ba35dd8a77 Update Capistrano integration instructions.
As per feedback from Wes of TurboVote, the original submitter.

(imported from commit a2aab5c779f4c4519222365d957c991e3fa99f4b)
2013-03-26 13:12:00 -04:00
Waseem Daher 0f333fcd62 Remove misleading comment from jobs page.
(imported from commit 1974aeb5f20e80117ed51d029ca206df78b80d7d)
2013-03-22 14:37:54 -04:00
Waseem Daher 6760e68f94 integrations: Document Capistrano integration.
(imported from commit e26774e3657a71e8f21bf8ef2b1b1a9c289707da)
2013-03-22 14:37:54 -04:00
Waseem Daher 1d503d75ac apps: Don't make fun of Windows users.
(imported from commit 40dc16dfebffe8c26867340dbb9eed2263668144)
2013-03-21 11:15:53 -04:00
Waseem Daher e1e7978fae "Lead designer" job posting.
(imported from commit 1f9e00e45f69d47842524d715fe5e8a8a4a8b7df)
2013-03-19 13:28:53 -04:00
Leo Franchi 6d6c3364dc Rewrite message flag handling to fork out to a subprocess for batch handling
(imported from commit 1ef846f542950cabf32f8b176f5591cf5794a0ff)
2013-03-19 09:55:12 -04:00
Waseem Daher 797b5ee63f Add page describing our Humbug apps.
(imported from commit 2e071782a13a497e57225b2a84c41d58f5e120b5)
2013-03-15 19:16:44 -04:00
Leo Franchi ff42774551 Refactor unread client handling to use 'read' flags per message
(imported from commit ca48745396e7fbac456e5eb2e7dbe4adc62b3492)
2013-03-13 14:14:45 -04:00
Zev Benjamin a5b7c86303 Show an error message to users on fatal errors
(imported from commit a1ee2329e6b9dfa6f575106f1e32574bef0598a2)
2013-03-13 10:55:34 -04:00
Luke Faraone 3c95013a15 Iconify public/private streams on subs page and new stream modal
This will hopefully make stream privacy more noticeable. We still don't
allow people to modify privacy after stream creation, however.

Since we now use a radio box on the stream creation modal we had to change
the selector used by subs.js to determine if a new stream was to be invite-
only.

(imported from commit 641a4fab74301a9b3ecd4b3859f010dd4ece193e)
2013-03-12 15:14:29 -04:00
Waseem Daher 33dc3a2fb7 Properly start tutorial on first run, even if you have new messages.
We were previously having an issue where the tutorial could
be pre-empted if you got a few messages while you were first
logging in.

I have some reservations about this being slightly fragile, and a
better approach might be to just have a bit that we use to determine
whether or not you've already seen a tutorial. (Or potentially that
checks whether or not you've ever sent a message.)

(imported from commit f8858f64a36bcd25887b76314caff283929f340c)
2013-03-12 09:56:57 -04:00
Keegan McAllister d0105dd35d templates: Eliminate block porticocustomhead and use block.super
(imported from commit 18270ae59d97031a424c416406e685d93829f892)
2013-03-11 15:48:13 -04:00
Zev Benjamin dc0913077a Add a new frontend error-reporting system
The new system, called blueslip, makes errors fatal when in debug
mode and only output a message when running in production.  In the
future, it could also send user errors back to us automatically.

(imported from commit 1232607c0311e885c8b5a5e8a45ffb28822426e0)
2013-03-11 13:22:12 -04:00
Luke Faraone 34ecfb339f Add an alert to indicate bankruptcy is processing.
We also grey out the box to prevent the user from clicking twice.

This closes trac #1030.

(imported from commit eec810e3fbc5b7c9350c2d91e448fb27d4c856f8)
2013-03-07 15:50:16 -05:00
Waseem Daher 68e7a052cb Remove the link to 'activity' from the gear menu.
I find that I never use it, and I don't totally like our
experience in the app to be different from our users'.
Admittedly, this is a small way in which that's the case :)

Finally, since we do usability studies in @humbughq.com,
the link appears there too, and I'd like it not to.

(imported from commit 1225c4ae79de52fa98b21ce00a6542df76b667ea)
2013-03-07 13:12:45 -05:00
Reid Barton 6bb9ad4e3c Avoid cross-site logout attacks
Require POST method for /accounts/logout. This has the side effect of
automatically enabling Django's CSRF protection.

(imported from commit 44b1b6ebaadc1c03006e21ae54ac768e31234801)
2013-03-06 19:10:04 -05:00
Tim Abbott 1302f61d09 Rename Home to Messages in the gear tab.
(imported from commit 546063f88d58fb988363e5c89a13507deeb20afd)
2013-03-06 18:07:29 -05:00
Waseem Daher c41fa46fb4 Always show the searchbar 'x'.
This simplifies a bunch of fragile resizing logic in our code,
and also addresses the Chrome Canary bug where clicking in the
searchbox causes the navbar to get huge.

This fixes Trac #764 and Trac #1039

(imported from commit fc8c3995109de384b71dfba2b986a8500ff7f08d)
2013-03-06 15:06:35 -05:00
Tim Abbott 3d02caac79 Add redirect on our prod/Django DEBUG=False 500 error page.
(imported from commit d23eacefec269b80b15a64feeba9206e08470f33)
2013-03-06 13:34:59 -05:00
Waseem Daher 932aeb86b5 Add a tiny visual indicator that the message is sending.
This fixes Trac #1035.

(imported from commit f8d179f6f5e59922fdc5391624c6efb3da59395d)
2013-03-06 12:09:00 -05:00
Waseem Daher 2ecd09b682 Properly align the 'x' in a composebox error message.
To see this bug, you need to trigger a multi-line
error message, like sending to stream 'asdfkljasdkfjasdfa'.

(imported from commit 11ea901ae491cd2cc4e0699888074fb71db46a21)
2013-03-06 11:28:43 -05:00
Waseem Daher 707796b37b Cause login page to be more responsive.
Prior to this commit, at 800px, e.g., the Google button
is smushed into the login form.

(imported from commit 422d1b677439460785f6b31ea2fe2c819e23e259)
2013-03-05 17:24:46 -05:00
Tim Abbott 3be748ad25 [manual] Bump API version to 0.1.4.
To incorporate the site parsing fix from a couple weeks ago.

Before deploying this to prod we need to run build-api-tarball and
deploy the code to humbughq.com as for usual API releases.

(imported from commit f6711f5cc07d174c30866029032a595ecee785a3)
2013-03-05 10:17:57 -05:00
Waseem Daher 67040923e2 Document emoji in 'Formatting help'.
(imported from commit 7205af18fc9b16f4ed45c21db7c662b3926aefaf)
2013-03-04 11:08:10 -05:00
Luke Faraone f533b92d63 Add a halfing to the Home link.
(imported from commit 6ddf4d996d09373eb2509c65760df9280f7402c8)
2013-03-04 10:59:41 -05:00
Luke Faraone d88107567a Remove "find in page" functionality.
This was a source of user confusion and didn't provide that much value.

(imported from commit fbe9405d8bc4cb6661baa7fe7583eab5ed73d886)
2013-03-04 10:59:41 -05:00
Waseem Daher 812fce0534 More nicely align your name and email in the sidebar.
It's not quite what the CUSTOMER4 person wanted, but
I think it scratches the itch.

This fixes Trac #1023

(imported from commit 9186499c8f6bacb230a2d1ed6d5ca7ffa7416ac3)
2013-03-03 11:34:41 -05:00
Waseem Daher 6632d84f0b Show "Enter sends" as an option for everyone.
I think this has burned in on staging long enough that I'm
comfortable showing it to the world when the prod deploy
goes out.

(imported from commit 19ceaaa3300d4bd65fdd357aaa3c48c7fcf1dec2)
2013-03-03 11:09:06 -05:00
Waseem Daher 3ce48f8a45 Make layout more responsive.
To be fully responsive, we can basically never specify the width of
our container in a fixed number of pixels; otherwise we'll run into
the situation where there's an inordinate amount of wasted space on
our left and right.

So everything needs to change from, e.g. row to row-fluid,
and that has a whole cascading series of changes that that implies.

(imported from commit 7e2771d916f429548c65c0a00fc4c11397054656)
2013-03-03 11:04:57 -05:00
Waseem Daher 0b6876012b Move composebox into its own file.
Similarly, here, no code should have changed.

(imported from commit 0d739a28b4894dd28acea0a3d9ee503109368425)
2013-03-02 19:58:09 -05:00
Waseem Daher f78966d306 Move left and right sidebars into their own templates.
This is purely a "move HTML around" commit; nothing should have changed.

(imported from commit 09968a0e838cbdff86cd824ab9c0fb39d20c78f3)
2013-03-02 19:45:44 -05:00
Waseem Daher e4eb917c37 Update Jenkins plugin version number.
I had updated the file and the hyperlink, but missed the part in the
instructions. Making this a variable or something in the future might
save me from making this mistake again later.

(imported from commit 74e9c7add573826254793fff884a163c4c021206)
2013-02-28 12:42:01 -05:00
Keegan McAllister 50512328a1 register: Use "Full name" label instead of "Your name"
Should make it more clear that we're not looking for a username, though anyone
who really prefers to go by a username is free to do so.

Fixes #975.

(imported from commit 3d10f2fab4d5a4c14153dd706468caebb1b2a9c2)
2013-02-28 12:29:52 -05:00
Keegan McAllister 5a1e42d96f register: Open Terms of Service in a new tab
Fixes #976.

(imported from commit 8d9485880d99a4316ab946d921a623a75a8bfe14)
2013-02-28 12:29:51 -05:00
Tim Abbott 43d64bfb21 Swap Navigation and Composing tabs of Keyboard Shortcuts.
(imported from commit 9e8f878ef68e0fba0ade0b1e275cfede0dd88ec7)
2013-02-28 11:38:05 -05:00
Waseem Daher 4e4e15bb4a Allow you to click the 'enter sends' label to toggle the checkbox.
(imported from commit 2c0d6d2547adb5233589765fa2ef851f1712ee52)
2013-02-27 23:42:58 -05:00
Jessica McKellar 6a56ed0c94 Add a button on the Settings page to declare Humbug bankruptcy.
(imported from commit 6ca635e997ada54b816abe3425980102ad8f5d2c)
2013-02-27 18:16:51 -05:00
Waseem Daher 94219b48d0 Hide "Enter sends" options for everyone but humbughq.com.
This will allow us to continue to do prod pushes while allowing
this feature to burn in on staging for a while longer.

Determined users can get past this and enable enter-sends for
themselves, but I'm basically OK with that.

(imported from commit 0ee83ff14179c98104368f9bb16ed4fd543ea808)
2013-02-27 17:47:59 -05:00
Jeff Arnold fcd033e33e [schema] Save enter_sends on the server in the database.
(imported from commit 4d82f6aaf5918f155a930253c9cc334dbcc0d97a)
2013-02-27 17:25:29 -05:00
Jeff Arnold 221d3a6740 Introduce an "enter sends" checkbox that defaults to off
(imported from commit abd0f260acac9fa92c651dc677e636781d75e6fd)
2013-02-27 17:19:08 -05:00
Luke Faraone d48fdcc781 Show button to enable users to log in with Google.
(imported from commit 52343e7e408c46f148b88e5eede9167fc77edce5)
2013-02-27 10:16:54 -05:00
Luke Faraone 0fe0cf0ffb [manual] Implement backend support for authenticating a user via Google.
This code adds a dependency on python-django-auth-openid, installable as
django-openid-auth from PyPI.

On prod, one needs to run a syncdb in order to create the required
tables. A database *migration* is not required, as these are new tables
only.

(imported from commit c902a0df8d589d93743b27e480154a04402b2c41)
2013-02-27 10:16:54 -05:00
Zev Benjamin fc085cbd77 Add a bottom border to the left sidebar streams list
The idea here is to better hint that the list is scrollable.

(imported from commit 75a415535f47807ef146d4dc9a2806d193d31fe7)
2013-02-26 17:18:56 -05:00
Zev Benjamin e7604e170a Make left sidebar HTML more standards-compliant
(imported from commit 4cfc7789d4b930ea074596ddf06d16638e91c9a2)
2013-02-26 17:18:56 -05:00
Waseem Daher 3dfd2fa80f Add a "What is Humbug?" page.
(imported from commit 7197f6cd5f51eec155ccac10c45409bb1a2add58)
2013-02-25 17:23:47 -05:00
Keegan McAllister 49e16b0ba6 Add portico and misc CSS and JS to Pipeline
Fixes #963.

(imported from commit 63ec313a41fd13350657c78356efc16422a5fff1)
2013-02-25 16:18:35 -05:00
Jessica McKellar 11a01dac6c When a narrow would have no messages and just be grey, show a notice instead.
(imported from commit 2b2b653805cb1ebdb545f83b20c01f1d6cbde9b7)
2013-02-23 14:38:25 -05:00
Jessica McKellar 021ed669a4 Correct the widths of the search bar and settings page.
(imported from commit 14904452cf3b246287e039adb0cdef3d3fa41e27)
2013-02-21 22:40:18 -05:00
Luke O'Malley eec2487b9e Remove sub-and-send javascript and add 'X' to all error messages
(imported from commit 66fd42914e4fc33719c4f21ad401748989f20b49)
2013-02-21 22:31:23 -05:00
Keegan McAllister 56d183ea06 Remove lurk mode from web client and API examples
See #796.

(imported from commit e238ce571c3f30d8312b630df7048ad1d9cad6d2)
2013-02-21 15:11:10 -05:00
Jessica McKellar 382f94b5b5 Move presence information to a right sidebar.
(imported from commit c5533988606f1fc05de6b83eeb39f8f913f6ad42)
2013-02-21 09:23:59 -05:00
Waseem Daher 6913d16f28 Make your name and gravatar clickable as a way of returning home.
I kind of expect this to work, and hopefully this'll help with
people getting stuck on the "Settings" page in the tutorial.

(imported from commit 1159d884dcd331bcfb74864a0176fa293e8c3714)
2013-02-21 14:05:40 +00:00
Leo Franchi af58956f9e Only show All messages link in sidebar if there are non-homeview streams
(imported from commit b247b651e531debbac2ad34a15b9a758de936348)
2013-02-20 14:24:49 -05:00
Keegan McAllister 947d450a6d Draw user presence dots as actual list bullets
This keeps the name to the right of the bullet even if it overflows
onto two lines.

Fixes #909.

(imported from commit 60528bb30c2d9e29687b773abc76c18369a8a068)
2013-02-19 18:26:58 -05:00
Leo Franchi 5d79bb6a20 Add a 'show in home view' toggle to the stream settings
(imported from commit af8bcc4df6fcd9f6ffed4ccb1b9be5261ffe619d)
2013-02-19 15:43:27 -05:00
Luke Faraone 85b6b551f2 Add a notion of "All messages" to the sidebar.
(imported from commit 740711d1fa925055b26249071f79fc0b287d78c1)
2013-02-19 15:43:26 -05:00
Keegan McAllister f214be92c2 Draw stream separator ">" using > rather than a bare >
(imported from commit 97df1e7c8d16f87962784265d37ff40fd1fc858c)
2013-02-19 15:33:35 -05:00
Keegan McAllister bb5f59d310 Use white text for recipient labels on streams set to dark colors
Fixes #577.

(imported from commit 0518e33b96bc0028fc80d533f6b8ec35fd5cdc04)
2013-02-19 15:33:35 -05:00
Tim Abbott 861cb405f6 Move MIT Zephyr setup instructions to humbughq.com/zephyr.
This makes it possible to point users back at the instructions they
followed originally in the event that their Zephyr mirroring bot has
died.

(imported from commit 24ab2dc0df3dc88f8155d58761a89fe44c111fd9)
2013-02-19 14:17:54 -05:00
Keegan McAllister eaec3c03d4 Import jQuery Caret plugin
(imported from commit 814f32cd68c07be224b3f793670e764c5d470679)
2013-02-19 11:25:03 -05:00
Keegan McAllister 45dd9e8ec9 Remove Safari Tab-Enter workaround
These days we explicitly handle the Tab hotkey in composebox_typeahead.js

(imported from commit e554a20bf0517f928359ad83f8ba83abb22aa68e)
2013-02-19 11:25:02 -05:00
Tim Abbott 8c2c65f718 [manual]: API: bump version to 0.1.3.
We need to run build-api-tarball and release it on prod when pushing
this commit to prod.

(imported from commit 09e86500d2d208b1972c87444b4c2d56faafc8e6)
2013-02-19 09:17:08 -05:00
Tim Abbott 4caafd66ce Rewrite git hook for distribution and document it.
(imported from commit c3238bc5b5e29727cddb43bc55ab418326226acd)
2013-02-19 09:17:06 -05:00
Keegan McAllister e25d9a8492 Remove unused Notificon library
(imported from commit 8c0717b4e305d28f30b9088a974e99d510ab3021)
2013-02-15 16:19:58 -05:00
Jessica McKellar b8ad7f235a Replace the pipe character between stream and subject with a '>'.
It helps to clarify the relationship between subjects and streams.

(imported from commit 53ed623f3875939c5b6f812de54ccbe616cdb1db)
2013-02-15 11:01:06 -05:00
Tim Abbott f0be25ec9d [manual] Bump API version to 0.1.2.
Before pushing this to prod, we need to build the 0.1.2 API tarball
and deploy it to the appropriate place on our servers.

(imported from commit ec1a07b3cc2a3e360dac32823ff7cd9de9de1da2)
2013-02-14 17:50:00 -05:00
Tim Abbott 63827c2301 Make the Nagios integration configurable, available, and documented.
(imported from commit 1208fc08ed366a892763c3b29b9aeafa90b29981)
2013-02-14 17:50:00 -05:00
Tim Abbott 61369c87ec Move trac integration to a subdirectory.
(imported from commit fea539e275a5c81d9fde7f66ef8396d77f8d8b6d)
2013-02-14 17:50:00 -05:00
Tim Abbott 93f090655d Update the trac plugin documentation to match current reality.
(imported from commit 34b9a93d2c01293870dd232ae8a3b3d8939877c6)
2013-02-14 17:50:00 -05:00
Luke Faraone 32a406a5cf Display a total count of the number of PMs you have pending.
This is accomplished by continuning to have per-conversation PM counts
but then summing them up into a global count.

We may split this off into per-conversation counts in the future.

(imported from commit 311e3b74715c3a01c0b75837e397a386ab65505c)
2013-02-14 17:32:22 -05:00
Keegan McAllister 6c12fd3909 Add a basic font size menu
(imported from commit ff0c27ccb177ddc69a31bf8997d31e7cfb5b78b5)
2013-02-14 14:39:32 -05:00
Waseem Daher a01cac24b4 Bump Humbug Jenkins plugin version number.
The previous version had a NullPointerException
encountered by CUSTOMER2. This version fixes it.

(imported from commit 22b65f0e4b3e0ca5a174d6ae3b168f5543de8826)
2013-02-14 13:51:57 -05:00
Tim Abbott 678a51c3e6 Don't display the years on the activity page.
(imported from commit 80aae448af75b9ed34fb612ee930b6d068dda7b7)
2013-02-13 11:04:23 -05:00
Waseem Daher 2f43f0e797 Reorganize /activity page to put information I care about closer to the left.
Right now the table is too wide for my screen and I have to scroll it
to see some stuff I'm actually pretty interested in seeing; this
rearranges things to make that less the case.

(imported from commit b06088c59d9ba21ecc24fa55367226a2aa09d907)
2013-02-13 10:59:11 -05:00
Waseem Daher 442ef8ea72 Spruce up password reset email template.
(imported from commit 324dfbe4e88ca3cf58225a44d94b3e061273ab95)
2013-02-12 22:04:24 -05:00
Jeff Arnold d0f422979b Change the favicon on notification (great for pinned tabs)
(imported from commit 025ad165d15b2e6d979c246776148f13ebc555fb)
2013-02-12 16:27:07 -05:00
Zev Benjamin ae97854d17 Bump API version number for addition of integrations/ directory
(imported from commit c5990ef963b5e7b7919fdef9f461a75e82015113)
2013-02-12 16:11:20 -05:00
Waseem Daher 94ceac9980 Add an initial message to greet you.
(And to let you know that it's OK that you have no messages.)

This fixes Trac #850 for the case where you first log in.

(imported from commit 47741856e34f67bfc2cc91bdc21def75ab6fe09d)
2013-02-12 15:21:28 -05:00
Waseem Daher c3cb9a6246 Allow the stream and user lists to scroll with mousewheel.
The previous commit stopped the mousewheel event at .bottom_sidebar,
which means it was never getting to our individual scrolling lists.

(imported from commit 92d32c21bb596d0e14d887ff779a857223d45342)
2013-02-12 11:54:34 -05:00
Waseem Daher 7975b36a45 Reorganize the sidebar slightly.
Until we have filters, let's keep Home and All Private Messages together.

(imported from commit 8737ceee21d692169df0abf9bbc9052916d244d2)
2013-02-12 11:54:34 -05:00