Commit Graph

702 Commits

Author SHA1 Message Date
Jessica McKellar f407d6b935 Add UI for restoring a message draft.
(imported from commit 3e374048a59d2caf858eb1ce9eae3e22eb0835e4)
2013-04-22 11:14:56 -04:00
Luke Faraone c29061c4d3 Show curl examples first on /api
(imported from commit d3467d883579bee82969029ed4875b785dc10667)
2013-04-22 07:55:54 -07:00
Luke Faraone 1473009dbb Remove commandline documentation from the endpoints page.
We don't really provide many CLI tools yet.

(imported from commit 255a95987b800425d4a0c597084dcec0026c555b)
2013-04-22 07:55:54 -07:00
Luke Faraone cbe2441702 Correct inaccurate response to POST /v1/messages
(imported from commit e7f644b8c33296f09adfc39b095e5cfa0ca69e82)
2013-04-22 07:55:53 -07:00
Luke Faraone f7aacaa7ec Reword endpoints lead.
(imported from commit 243cce59c4a7f74529afd73c682b7c8b5be1da76)
2013-04-22 07:55:53 -07:00
Luke Faraone a36eba6a34 Simplify python example of client init
(imported from commit 37768e54af49e38915438f95586a472ca134452a)
2013-04-22 07:55:53 -07:00
Waseem Daher aad262d041 fonts.css is included in our compressed CSS; no need to import separately.
(Actually, it 404s if you try.)

(imported from commit 5fc022693f6c76efaf468c80d547c605b4742452)
2013-04-22 10:00:02 -04:00
Allen Rabinovich e28cef697f Switched the star icon to FontAwesome and made it bigger and green.
* renamed the 'icon-star' style to 'icon-vector-star' to keep backwards compatibility for icon-* classes
  * changed relevant styles in zephyr.css; added FontAwesome assets
  * changed relevant CSS classes in base.html, left-sidebar.html, ui.js, message.handlebars
  * added new fonts.css to start consolidating all font-based assets
  * added fonts.css to PIPELINE_CSS in settings.py under 'portico' and 'app'
  * modified the stars test suite to reflect new star icon class name.

(imported from commit 3116fcfd4b5fb4edecd457da554fea616bb7081b)
2013-04-21 17:31:50 -07:00
Leo Franchi 85df171753 Add integrations writeup for Pivotal tracker
(imported from commit 3e1601bbbae465a1c607ddf7258e9f24ddcdb1b6)
2013-04-19 13:46:41 -04:00
Luke Faraone 1e34114439 Add an example of the call_on_each_message function.
(imported from commit 164689ee246bcdfc0d39366b1c30f1af44935386)
2013-04-18 09:57:58 -07:00
Luke Faraone 3703d33219 Switch default tab to Python
(imported from commit 43fe8126f7eae218338c31ba96f6531d59232053)
2013-04-18 09:57:58 -07:00
Luke Faraone 546a376d1c Move API endpoint docs onto their own page.
(imported from commit 0472c9051ba75e8c8ea4f80941ca9ef3b7ad949e)
2013-04-18 09:57:57 -07:00
Luke Faraone a97d4b7cb2 Switch to pretty codehighlighted humbugrc
(imported from commit 3e4f156a3d017166d1339784c5b3593b402d7805)
2013-04-18 09:57:57 -07:00
Luke Faraone 724ecce063 Add breadcrumbs to static pages.
(imported from commit a2ad69953e320847c063026e2debaf0916167c35)
2013-04-18 09:57:57 -07:00
Luke Faraone f5d4925360 Create aggregate jobs page.
(imported from commit a7271fb7586252ee7168115f7cf9bbf4db58ef0e)
2013-04-18 09:57:57 -07:00
Luke Faraone ea7965d9bb Rework API documentation to cover all supported calls.
We now generate our API documentation page based off of JSON source.

(imported from commit 0e8a91ef4278684dbcad89cad39a1977672245fc)
2013-04-18 09:57:56 -07:00
Luke Faraone 4601db82e5 Bump API version on /api to 0.1.6
(imported from commit 41a0e4f77fe2960d55b4302a502f8d3b8721c787)
2013-04-18 09:57:55 -07:00
Waseem Daher 191fb3cb49 Capitalize "Your messages" consistently with the others.
(imported from commit d049e8b500a60e40c1f910837343d48973cb2b93)
2013-04-14 20:51:48 -07:00
Zev Benjamin 5069140116 Align star icon with home icon
(imported from commit c8ba6b53ce9faf9e003cb7b1a0096f13fc85002e)
2013-04-12 16:08:49 -04:00
Tim Abbott 0e1842f77c Rename 'Home' to 'Your Messages'.
(imported from commit 879c8f135f4a5aee1e819fd8be07d47928f68d1c)
2013-04-12 15:43:42 -04:00
Keegan McAllister 10e823704e settings: Change "Your avatar" to "Your picture"
(imported from commit fc971b0217509058f9276119fbfc7a3df950309e)
2013-04-10 18:05:02 -04:00
Keegan McAllister af25f8a5f1 Add password strength checks to password reset
(imported from commit 3723d2bfa6012c3d4cef2199c5efd3530e9e6d2b)
2013-04-10 18:05:02 -04:00
Keegan McAllister 1211061f6a Color the password strength bar red or green
(imported from commit 6b3fa7d3565a7e4f61a952fc26e1e9e564d894f9)
2013-04-10 18:05:02 -04:00
Keegan McAllister 966545403b Move password strength bar update into password_quality
(imported from commit 054d9487e325cff819e80fb0e1cb85f5c0db42d8)
2013-04-10 18:05:01 -04:00
Keegan McAllister 5487f794a2 settings: Clean up API key box show code
(imported from commit a8fc8c769ae11cb0bdab882ead4531ade5d2b12b)
2013-04-10 18:05:01 -04:00
Keegan McAllister f399e29fe9 settings: Hide password change controls behind a link
(imported from commit 6d0f3861ef97f45231d388378f429974e876ddbe)
2013-04-10 18:05:01 -04:00
Keegan McAllister 525c0bcd3f settings: Shrink Gravatar to match left sidebar
(imported from commit ff4853af6e7163e90dc9bc7ea5dd87983d4343ef)
2013-04-10 18:05:01 -04:00
Keegan McAllister 481f07d948 settings: Move success / failure indicator to the top
And scroll there on any error (previously, we would scroll only if we end up
submitting the form).

(imported from commit 63597c4da78ac92cd5c2314d6d174d178b1caaf3)
2013-04-10 18:05:01 -04:00
Keegan McAllister e54e97ffda settings: Reduce whitespace at the top
(imported from commit 7d697f6d985abcfb5e5144f0563760eadf4274d9)
2013-04-10 18:05:01 -04:00
Keegan McAllister b6e97541f2 settings: Format API key link like other forms
(imported from commit 805d3cfffcbd7f1b4274f49b0b6c2c6902b111c2)
2013-04-10 18:05:01 -04:00
Keegan McAllister 3e31646567 Add a password strength check on the settings page
(imported from commit 68ae1732e62be076a4619b522009a76215d69757)
2013-04-10 18:05:01 -04:00
Keegan McAllister 4932b030b5 settings: Clean up code and layout
(imported from commit 7a9a12c745954ea04f9f7de79e3a0833b31713fd)
2013-04-10 18:05:00 -04:00
Keegan McAllister 2211b2f572 settings: Clean up bankruptcy UI
(imported from commit 31b0092899192353ae3ba525f272f839bb4d8113)
2013-04-10 18:05:00 -04:00
Keegan McAllister 627bcc3add settings: Remove unused class
(imported from commit dedb4c02098f3cec9c2e3d67c377672925a04f4b)
2013-04-10 18:05:00 -04:00
Keegan McAllister 38517b3ff4 settings: Redo form using Bootstrap CSS instead of <table>
(imported from commit 3266cdc84c9af3b2a000370c64b45125f8165a53)
2013-04-10 18:05:00 -04:00
Keegan McAllister 07bb220194 Add a password strength check on the signup page
(imported from commit a44101485e49fd7a7951bda05ba10a021b6d3ee0)
2013-04-10 18:05:00 -04:00
Keegan McAllister 7eb0bf4fc1 signup: Use a large button
...and move it closer to the controls.

(imported from commit a9a2dd28d4ceb48b59e5aa0ff25dda31f078ffba)
2013-04-10 18:05:00 -04:00
Keegan McAllister 63d739ef17 signup: Rename forms
(imported from commit cd7e90aa56da4982b627af757f8c4684f5103bc2)
2013-04-10 18:04:59 -04:00
Waseem Daher 062e106400 Update Jenkins integration instructions.
Now that our plugin is in the Jenkins marketplace thing,
we don't need to have the user laboriously download it
from us and upload it themselves.

(imported from commit 25e9926f7f2314db8f3ea6c00c40514b6fd546c3)
2013-04-05 17:32:41 -04:00
Luke Faraone f20f605376 [manual] Add file upload support.
This allows users to drag and drop content onto the compose box, storing
their data in Amazon S3.

New dependencies:
 - python-boto

(imported from commit 339874e483db5c36312c9ceae56db29da6ca0d99)
2013-04-05 13:07:13 -07:00
Zev Benjamin 9d1548fe08 Add empty feed notices for private messages
(imported from commit e4067336f6b2e9e82b794599d30dfc3825852652)
2013-04-04 11:36:51 -04:00
Zev Benjamin de1f4b0be2 Remove all inline event handlers
This allows blueslip to catch exceptions from the event handlers on
these elements in addition to the other benefits that not using
inline handlers provide.

(imported from commit 2bdcb2496c6c08fa7228a20ce6164b527cf64e41)
2013-04-04 11:34:32 -04:00
Zev Benjamin db3ded4e84 Fix 'resend email' link for email confirmation
(imported from commit 744a4c13b50ad32b8feb4e51b632346c6f283ad4)
2013-04-04 11:34:05 -04:00
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