Commit Graph

610 Commits

Author SHA1 Message Date
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
Waseem Daher 3a25361a74 Make clicking "Home" in the sidebar from, e.g. Settings, actually work.
Previously it would unnarrow you but not actually change your view
to the home view.

This fixes Trac #839.

(imported from commit 226bb70b850685ed2727d920fd1303a94b6a5dd1)
2013-02-12 10:07:35 -05:00
Waseem Daher 30bed51a65 Style the green 'online now' dot entirely in CSS.
This lets us clean up the HTML a little bit in preparation
for a later change which will cause the stream and people
lists to scroll independently of one another.

Also it feels a bit more fun.

(imported from commit b3b49149d7ec2960fd752fe50b41e55d363c1a98)
2013-02-11 23:15:19 -05:00
Zev Benjamin 57b6d6eb50 Make integral easter-egg font-neutral
(imported from commit 2a6c751ab7e872e4b4ddd6bafcb86b0e5d091c1e)
2013-02-11 18:37:34 -05:00
Leo Franchi 83011f7f47 Show a user activity list in the sidebar
(imported from commit 95aaa55c7e4cc39f844518b5308866bedf2cd1c5)
2013-02-11 18:05:57 -05:00
Keegan McAllister 16d62fe5de Combine the actions popover with the timeinfo popover
The message timestamp is now always clickable, and the popover contains the
full long-form date and time.  This addresses one problem from usability
testing (see #470).

(imported from commit ad502dff128ad1c934fc0d3faaf5e2931c91c37e)
2013-02-11 13:59:18 -05:00
Keegan McAllister 520d7b1f97 Rename userinfo_popover -> actions_popover
(imported from commit fab5a44af1acaf93640a2f57ffc25b3e97f55d2e)
2013-02-11 13:59:18 -05:00
Luke Faraone 8dbda2cd64 Use full emails rather than just usernames in /activity.
(imported from commit c0397d6429fe85f0bd6e57731dd2132ed1e11b85)
2013-02-11 10:33:16 -05:00
Waseem Daher c94f561eda Promote our integrations on the API page.
(imported from commit 5091c88f8927c7a52af0d95a425211ed6b48ef06)
2013-02-09 21:35:29 -05:00
Waseem Daher 481dbf299e Remove an errant <p>.
(imported from commit 0ac6288c3fc3bfb608f3834a905595ad50a793ea)
2013-02-09 21:34:34 -05:00
Waseem Daher dc02e236df Document our Jenkins integration.
(imported from commit a2711e10eaf5ae4b06de5becf94f9857b535a63b)
2013-02-09 20:54:10 -05:00
Waseem Daher bc9133883b Typo fix.
(imported from commit a4426e0eda9de230debcb96b3c69e5ce8a38c589)
2013-02-09 19:38:57 -05:00
Keegan McAllister d68674be83 Remove CUSTOMER30-specific account views
Reverts c4b6f744 (inexactly, since there are some other changes along the way).

(imported from commit 5c7294fb13cd0bc523ae55c137dc5254b7cb0121)
2013-02-08 13:33:28 -05:00
Luke Faraone fd1d790b72 Don't show the stream list on Humbug for MIT.
(imported from commit d9f952aaeb910a7c57ce1174141686331224c8c0)
2013-02-08 12:02:05 -05:00
Luke Faraone 686c709788 Add a link to filter to all private messages
(imported from commit 115f84b42c14acdc8d1827bd8d914a9ac6acab43)
2013-02-07 15:35:46 -05:00
Luke Faraone 9c86db20fc Add support for "labels" in the left sidebar.
(imported from commit 5e942a8d0c7f459148a4961736f4c5305e0c51b4)
2013-02-07 15:35:46 -05:00
Waseem Daher 2a6fa085a1 Remove signup button from new-user.
Most people who have gotten this page haven't been in a position
to click this button; furthermore, most of our early users will
be invited into the system with an invite link.

To see this page with a button you can't actually use is kind
of confusing, so, removing it.

(imported from commit 20fbb1baf1ed4db6a6713fb112922d72a8360b03)
2013-02-07 14:58:49 -05:00
Waseem Daher 75ebd7c7fb integrations: Update path to integrations.
(imported from commit 38382cf03afe259ec044de2cfcf497664a5bb0c8)
2013-02-07 14:12:02 -05:00
Waseem Daher a44aa44e6c Add a somewhat cheeky explanation of what an integration is.
(imported from commit 76d3627333a4df04019101315c368136963887bf)
2013-02-06 19:30:22 -05:00
Waseem Daher 8bc57ecf42 Fix some integrations page issues.
* tickybox -> checkbox
* Fix up the "register" URL (a stray linebreak  was messing them up)
* Fix image blurriness issues
  (style != class)
* Wrap a long line

(imported from commit 47fd8bf5c9c2c9665aaf8a0cb3c65d08b399b3b0)
2013-02-06 19:17:30 -05:00
Waseem Daher 209a1bee3b integrations: Trac documentation.
(imported from commit 14978913711e3386ce3c845e434fc8e16ed0adf0)
2013-02-06 17:37:44 -05:00
Waseem Daher d8b9151a31 Initial documentation page for integrations.
(imported from commit cd73c63306ab7ed8c886c30488d5ab928fac6c06)
2013-02-06 16:53:13 -05:00
Waseem Daher c7447e19d9 Add a footer to all our portico content.
This makes /api look less abruptly cut off at the end.

(imported from commit 296e431dad2aa1f72b02bb59f5572c0bf33a7bc9)
2013-02-06 14:11:00 -05:00
Luke Faraone 3de93f2b2b Pass stream information in initial template.
This allows us to remove fetch_colors() entirely, and should speed up page
load a bit.

We also JSONEncoderForHTML instead of dumps so that the result is safe
to embed.

(imported from commit 013630911960e2ac1d0bae6f5df31ad342750594)
2013-02-05 15:34:37 -05:00
Jessica McKellar 018f45d151 subscriptions: add HTML and templates for new stream creation modal.
(imported from commit d19991c7fcdd29feafa877ca8203034028b1e0b2)
2013-02-05 10:01:44 -05:00
Waseem Daher d9a06ba8fd Initial API documentation page.
(imported from commit 06a5e902edf03ab781b30dd80f5fbfbaa790bc0a)
2013-02-04 17:58:12 -05:00
Jacob Hurwitz 1d113a4b03 Add the ability to show a custom notification in the bar
(imported from commit b7b763dc364e143409d862838322d63a05daacc1)
2013-02-02 01:16:26 -05:00
Jacob Hurwitz 61acc58947 Add a notifications bar when there are additional messages out of view
(imported from commit 38fa78f63fd520d0b1f09921ba064cba010a6f99)
2013-02-02 01:16:25 -05:00
Waseem Daher 768725cb7c Provide visual feedback that we're working on your invitation request.
This is a tricky one because it's kind of hard to see locally, but
there's a bit of a delay between when you click "Invite" and when we
get back to you. So we give the button a "loading" state so you know
not to click again.

(imported from commit 9c3389a3d06def777427c846d6106f6d9b30cc8b)
2013-02-01 11:26:46 -05:00
Waseem Daher 7e2271dd18 Replace HTML comments with Django template comments, in the navbar.
(imported from commit 3c313f2f4a0014ff705332cf068c40a4baed968e)
2013-02-01 10:36:17 -05:00
Waseem Daher 2c954c8f82 Move navbar code into its own "navbar.html".
(imported from commit 4fa1c5d5ffa0af0ae8d608fad762470bf737205c)
2013-02-01 10:36:17 -05:00
Waseem Daher f3bbb7b294 Move all of the "alerts" into a row in our navbar.
This is literally a pure "move HTML" operation; no actual code
changes.

This will make them always visible, even when we're in skinny mode
(and will also make more room for our list-of-streams-and-people
sidebar on the left.)

This does have the side-effect that the errors cover up the rest of
the application (in particular, the floating narrowbar). I don't view
this as the end of the world, though the more robust solution would be
for navbar-spacer to grow when the navbar does, and for everything
else to be correspondingly pushed down.

You can visualize an extreme version of what this looks like with
   $(".alert").show()
in the Javascript console.

This fixes Trac #720.

(imported from commit 7a3b12aebcca389465bd1e5852cef5d08fafe3e7)
2013-02-01 10:32:51 -05:00
Keegan McAllister 5178c663ae Remove documentation of italic syntax
(imported from commit ca487e3b2d89890c55d2061e338210afad9e674b)
2013-01-31 16:28:57 -05:00
Keegan McAllister 6990260b59 [manual] Minify JavaScript and CSS in production
Manual deployment steps: The same Nginx reload as for "Get rid of the
static-access-control mechanism".  If deploying both commits at once,
just do it once.

(imported from commit dd8dbbf14b95fce0a4b6f66f462fa0a6b50bfb8c)
2013-01-31 15:41:01 -05:00
Keegan McAllister 5e9b0ba79d [manual] Get rid of the static-access-control mechanism
We will minify our code, rather than trying to restrict who can see the
un-minified code.  Removing access control first simplifies things.

Manual deployment steps:

    scp servers/puppet/files/nginx/humbug-include/app root@staging.humbughq.com:/etc/nginx/humbug-include/
    ssh root@staging.humbughq.com service nginx reload

and then the same for app.humbughq.com once deployed to prod.

(imported from commit 63788aa3fa7ba5fd97fcf85b05760abb5e7cae4b)
2013-01-31 15:34:12 -05:00
Jacob Hurwitz 85db4eba46 The Subscriptions tab is now the Streams item on the gear menu
(imported from commit ca96339e2ceee4509fb6e3e2a35d1152b3415178)
2013-01-30 18:57:50 -05:00
Jacob Hurwitz b4ba07df0d We're a communication tool, not an instant messaging tool
(imported from commit 21230b2375a96b23e2af86e5778112f49c820d90)
2013-01-30 17:36:17 -05:00
Zev Benjamin 30a1409a3d Make 'create stream' input box size responsive
(imported from commit 5daf788bbf3ae7f2960da5f70ab5945880151287)
2013-01-29 15:58:51 -05:00
Zev Benjamin 1ba381c4a9 Account for the new top navigation bar when setting the main div height
This fixes #704

(imported from commit 5e73bf38cf0cda661a4c7070eea760934b30e454)
2013-01-25 14:09:30 -05:00
Zev Benjamin 65e5513bcc Rename 'Subscriptions' page to 'Streams'
I didn't rename all the files and HTML elements in case we decide we
like the old name better.

(imported from commit d8a8d30662e22e69e60df9cd2b1341a9128a1902)
2013-01-24 17:59:03 -05:00
Zev Benjamin df712b7794 Move the "create new stream" form into the subscriptions table
(imported from commit 6cfccf01b4253423e271a08c74f6077cbc10fce3)
2013-01-24 17:59:03 -05:00
Zev Benjamin 1ae42fba9b Remove dead form
(imported from commit 4f2b82c3945f184c416862ae59ebe9ae18f3dd05)
2013-01-24 17:59:03 -05:00
Waseem Daher 3b891d2f74 Use Glyphicons font for gear icon, rather than image.
(imported from commit 46e2524ab0bcf4e52bd09525b45d15198a82da03)
2013-01-22 17:23:18 -05:00
Waseem Daher 8c74164412 Use Glyphicons cogwheel for our settings menu.
This should also be prettified, with like, a hover effect
and stuff as well.

(imported from commit d06addbcf3992d5976c510eda7b1595d866a3196)
2013-01-22 17:20:43 -05:00
Waseem Daher 504dff9a51 Move search and navigation menu into a "settings" gear at the top.
This is really the first step of implementing the "Oppa Gmail Style!"
redesign, and is largely an HTML/CSS-based change, with some
slight JS tweaks to deal with things being renamed or being no
longer necessary.

(imported from commit e05adc283ea066f0f90009cf712c4f3657c2485a)
2013-01-22 17:18:50 -05:00
Waseem Daher f08dc13f73 Add a fixed navbar at the top of the page.
(imported from commit 1e131932503afe97ddd08e8538b2a0f43727313c)
2013-01-22 17:18:50 -05:00
Waseem Daher dfadc79dc9 activity: Display the user portion of the email address rather than short_name.
Apparently short_name is not consistently the person's username
in our system -- for many MIT people, it's their full name.

(imported from commit d975300a59c7afe5ee20b4a0db1bd51110c3df33)
2013-01-18 13:47:43 -05:00
Waseem Daher 068c702883 activity: Display short name instead of full email address.
As of this writing, short_name is the part before the @-sign,
and we already display the realm, so no need to display it
twice.

(imported from commit f5f9b29bff99b36b0c23176348c2869193467c38)
2013-01-18 13:34:39 -05:00
Waseem Daher 764047e113 activity: Add names to the table.
(imported from commit d4554690a9381dd0b72c7c03116dc01145960a5b)
2013-01-18 13:29:53 -05:00
Zev Benjamin 8b5e492c76 Clarify step 2 of the MIT confirmation email instructions
(imported from commit 2ed9c893fafafda8b01e6911c54edd73ef8f80c3)
2013-01-17 14:34:46 -05:00