Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,142 Commits 28 Branches 143 Tags 628 MiB
Commit Graph

150 Commits

Author SHA1 Message Date
Zev Benjamin 195bdb07c9 Unify huddles and personals into private messages on the send path 
Personals are now just private messages between two people (which
sometimes manifests as a private message with one recipient).  The
new message type on the send path is 'private'.  Note that the receive
path still has 'personal' and 'huddle' message types.

(imported from commit 97a438ef5c0b3db4eb3e6db674ea38a081265dd3)
 2012-11-13 15:40:53 -05:00
Waseem Daher cb0f48b59d Restyle subscriptions 'undo button' slightly. 
Some stylistic tweaking to the solution to Trac #127.

(imported from commit 5f9a84c91716e6e57cce2cef1d8ca0915e4b135f)
 2012-11-09 17:13:15 -05:00
Jessica McKellar 3af5e246be Don't cache your personal gravatar across gravatar updates. 
(imported from commit 06f82faaa350db8a64cebef24b738b5e93bebb98)
 2012-11-09 12:44:09 -05:00
Jessica McKellar 7dcd8a5a3c Don't have clicking in the blue background on a row update the pointer. 
(imported from commit 384c91454b15ddf3ce80e71603a594916c2916d4)
 2012-11-06 16:33:22 -05:00
Jessica McKellar 0700b96f37 Hover the sender name on gravatar and e-mail hovers as well. 
This clarifies that clicking on any of those three pieces of
information will pop up the user info tooltip.

(imported from commit 1e57550d66acbb2e8d5d244d2997bbd394c334c3)
 2012-11-06 16:33:21 -05:00
Waseem Daher c654520c73 Display email on currently moused-over message. 
(imported from commit ae27dc6068fefa9df7b5a03992df0253da9ec61a)
 2012-11-06 16:33:21 -05:00
Waseem Daher 9e090b2d28 Make sender name more obviously clickable. 
(imported from commit e75a6a051c939dd780d4815385b9c1eef0a07255)
 2012-11-06 16:33:21 -05:00
Waseem Daher 6b149af91d Rename 'huddle'->'Private message' in user-facing strings. 
(imported from commit d3bdccc37a4fb7b373c6c1c69091353f39fecafd)
 2012-11-06 13:37:24 -05:00
Waseem Daher 8e6aa3d2d7 Use "huddle" consistently. 
(If nothing else, because it will make the inevitable rename easier.)

(imported from commit 5077b04412ba9d5f885bf2c2e898bfd702adbe6c)
 2012-11-05 18:39:20 -05:00
Keegan McAllister 5a7b307d71 Create the narrowbar using a Handlebars template 
This fixes an XSS hole (#249).

(imported from commit 5f70c0bc23e0d992f2d85889e2ba9157f1b73b3a)
 2012-10-31 16:02:17 -04:00
Tim Abbott 5a3d52baa7 Make the narrowing tooltips a bit more verbose. 
(imported from commit ab2cbaa7bfe4eeb0b1d1dd00b6db6aa76574cbff)
 2012-10-31 14:06:35 -04:00
Waseem Daher e8225973ba Make subscriptions page look a little nicer. 
(imported from commit 86c77b6bf6ef673b39e85a7a5555847fce7707b6)
 2012-10-29 18:26:34 -04:00
Waseem Daher c6e64291c1 Use full name in popovers. 
(imported from commit e6463ef9331ad9c4defebf827ddef52312d21ddd)
 2012-10-29 15:02:25 -04:00
Waseem Daher 6632bac97d Show userinfo popup if you click on email address. 
(imported from commit ae3c1e5983520e945193c02561ebebf26ebb488a)
 2012-10-29 14:40:04 -04:00
Waseem Daher e5d89cb377 Make context menu a little bit smarter/clearer. 
Don't, e.g., show "start a huddle with me" when you're
already in a huddle with me.

(imported from commit 58a646ebcf7ab7f0b2bcc901e9e081cce782ee46)
 2012-10-29 14:17:27 -04:00
Waseem Daher 689014fe23 Don't allow userinfo popover contents to overflow. 
In particular, long email addresses.

(imported from commit 3ee9121c577e01277ac7888bed13bdb654ef77b9)
 2012-10-23 20:18:20 -04:00
Waseem Daher 037f523990 Hide unimplemented, currently-greyed-out options in navbar, etc. 
(imported from commit f33c3949979530b691743e29fb05f54808111b4e)
 2012-10-23 18:07:04 -04:00
Waseem Daher 17d44be14a Display huddles as 'You and...'. 
(imported from commit 35fe0e56751b1a2993bd99181e8bbd57e8c3ce81)
 2012-10-19 15:11:13 -04:00
Waseem Daher 7fdac68787 Tone down some of those icons. 
(imported from commit efd22df34b87ccb0603b73fed85b10f08bbd47b0)
 2012-10-19 14:53:31 -04:00
Waseem Daher 92045f2c9e Experiment: Use icons in more places (instead of the word Huddle). 
(imported from commit 6e27da4e54634c1f2fe05e2bffac24dc00576d2c)
 2012-10-19 14:42:43 -04:00
Keegan McAllister e6d42f60f1 Use narrow.by_recipient in message template 
(imported from commit 147eb8b652d7b4dee3ad6415b6c8e23e04067d15)
 2012-10-19 12:57:34 -04:00
Waseem Daher ba1a2a2732 Restore 'narrow to stream' functionality when you click on the stream name. 
(imported from commit efb82e44205e41979062ec6a1b1a989ea52d2c97)
 2012-10-19 10:24:24 -04:00
Waseem Daher 34fc2266ce Pop up a little box of info/actions when you click a name or gravatar. 
Known issues:
* Not all of the options in the menu are functional yet
* The wording isn't totally perfect on some of these options;
   I kind of want to use a 'first name' in some of them.

(imported from commit 5a333fb939fcca7e0d0ecb2c43e79501139ac0db)
 2012-10-18 21:19:49 -04:00
Keegan McAllister c4bf81a312 Module pattern for narrow.js 
(imported from commit f1df2e884216560cfe80f29a7e3eda5cea17cefe)
 2012-10-18 14:41:24 -04:00
Waseem Daher 0fba2d2df3 Attempt at making stream names more prominent when skimming. 
Known issues:
 * Narrowing links sort of broken
 * "S/H" is a terrible selector

(imported from commit 14d309b55dfaa4c4bc5cb1310a111a46f2fb7e20)
 2012-10-17 18:12:32 -04:00
Waseem Daher bca36ba4c2 Eliminate some inline styles (visibility: collapse). 
(imported from commit a29f12ea2f82672ef05e5dcca486ec527acbd6dd)
 2012-10-15 22:47:41 -04:00
Jessica McKellar d07f4c05f3 Keep the top-most recipient row floating at the top of the screen as you scroll. 
(imported from commit e597b60c86f5b38a55dc78df80d84dfe112c8d8f)
 2012-10-15 22:47:41 -04:00
Zev Benjamin b42cf1d4c8 Fix persistent message selection across narrows 
(imported from commit 958ce299108f8bbc8579e7446053d7fc9f018b81)
 2012-10-15 13:25:39 -04:00
Tim Abbott 41e935fd28 Send the sender_short_name to clients. 
(imported from commit 1652f5cadbe9c90d4c6d53c97cb23305aaaaa34d)
 2012-10-12 18:35:28 -04:00
Tim Abbott ac3f4393ff Rename instance to subject. 
(imported from commit 6b4693da03f106448c137cf81cf9801cac44f2b8)
 2012-10-10 18:01:39 -04:00
Tim Abbott 0562e52974 Rename newstyle_class to newstyle_stream. 
(imported from commit b5b9dc1a899c31a07c9c5eba84fd4846aeb4cd08)
 2012-10-10 17:48:18 -04:00
Tim Abbott 98ba39700c Rename is_class to is_stream. 
(imported from commit 6a68581c8a3ab72b13907af651a772a4a190ac40)
 2012-10-10 17:48:17 -04:00
Tim Abbott 081f82c50c Rename narrow_class to narrow_stream. 
(imported from commit 4654718c1226f7d0d945436f8dafdfa64d74c92c)
 2012-10-10 17:48:17 -04:00
Tim Abbott 8070377c7e Rename zephyr_sender to message_sender. 
(imported from commit 14eb36342c10c341de299eb262af6ec1c0d51ca3)
 2012-10-10 10:37:19 -04:00
Tim Abbott 42c05b9690 Rename the zephyr template to the message template. 
(imported from commit c15e2cc08d3604a82d90a96efa4f70d101971df4)
 2012-10-10 10:32:59 -04:00
Tim Abbott 2170c7a352 Rename zephyrs to messages in various local variables. 
(imported from commit 91ac7e47c51fdcaf6559b06f07e36b041aad3e2c)
 2012-10-10 10:29:48 -04:00
Tim Abbott 27b84f7705 Rename zephyr_row to message_row. 
(imported from commit 5975c7fe5e792ec294e55764581474fa55f62b70)
 2012-10-10 10:27:59 -04:00
Tim Abbott 0bc9287254 Rename zephyr_time to message_time. 
(imported from commit a058826bbbe5a881dfed62bd723344da0268ef7e)
 2012-10-10 10:27:39 -04:00
Tim Abbott 5e2d3ab74b Rename zephyr_mousedown/zephyr_mousemove => mousedown/mousemove. 
(imported from commit e479ae44fd18099dc616591cef740c382dd7e0d0)
 2012-10-10 10:21:40 -04:00
Tim Abbott 2748625ed2 Rename zephyr_picture to message_picture. 
(imported from commit 829ccc59184ff7728c6da61d4ed71db1695e1729)
 2012-10-09 22:42:19 -04:00
Tim Abbott 836971d3b3 Rename zephyr_content to message_content. 
(imported from commit 05e255ec275a8aeaf3967d6a4305cc4440c81913)
 2012-10-09 22:42:19 -04:00
Tim Abbott a259244f0b Rename zephyr_newstyle_* to message_newstyle_*. 
(imported from commit 774588d19c782255ce128cbadb20aef8373d0030)
 2012-10-09 22:42:19 -04:00
Tim Abbott 760b540e55 Rename zephyr_sender_{name,email} to just sender_*. 
(imported from commit 9bfa197a391e5dbdabf616244afb3634cdab1921)
 2012-10-09 22:41:17 -04:00
Tim Abbott f66124cbe2 Rename select_zephyr(_by_id) to select_message_*. 
(imported from commit 91619adf0e610017fbef52d2796020cb16537653)
 2012-10-09 22:40:13 -04:00
Tim Abbott 4b032b8e42 Rename zephyr_label_clickable to message_label_clickable. 
(imported from commit 1f14b654ca3a9191b1484c59a7e4ab418bd544b2)
 2012-10-09 22:40:12 -04:00
Waseem Daher 6916d02f26 Put class/instance/huddle-recipient names in the title tag. 
That way you can at least see them by hovering on them if they're
too long. (I'd probably like a better solution long-term,
but this'll do for now.)

(imported from commit 8628be101475ea72865bcaeda7d7f5cfe6453931)
 2012-10-09 15:03:45 -04:00
Jessica McKellar e351439d0b Don't have clicking on a sender prepare a personal. 
It is confusing, and clicking on it should behave like clicking
elsewhere in the message.

(imported from commit e56434e8e143f6fa58b095e1c7d311b4aa24313f)
 2012-10-09 11:01:28 -04:00
Tim Abbott c02c6cc954 Display the date when either it or the recipient changes. 
This is somewhat experimental and we may need to work on the condition
when it shows up (or move it elsewhere).

Also, maybe it should say "Today/Yesterday" for times super close to
now -- the main issue with doing this is whether it needs to update
without your reloading the page to avoid being super confusing.

(imported from commit e29faf30c83b9574e5d233213f42a24175f9a616)
 2012-10-05 15:44:15 -04:00
Keegan McAllister 8bc01c85f1 Collapse new with old messages when prepending 
(imported from commit 0279183c9a2c70b1fe42f60f4423327aaf2dc7b8)
 2012-10-02 18:24:54 -04:00
Keegan McAllister 08dfe8d56b Remove unused conditional class on bookend 
(imported from commit b82be52ff48575fc34672cd5fb2984039622e7e2)
 2012-10-02 18:24:03 -04:00
Keegan McAllister 5fe3787ded Maintain one layout-setting row at the top of each table 
(imported from commit b375ea78d79ca39b486d124256d0d4e89558d83a)
 2012-10-02 17:21:20 -04:00
Waseem Daher 61c7558b65 Long class and instance names get auto-abbreviated. 
This required some serious retooling of the table,
and some thinking about the interactions between
table-layout: fixed and colspan.

And some of it is still a little magic-number-y.
(Like that 97% width on zephyr_compose_box -- without
 it, the stream compose box looks weird in Chrome,
 but not Firefox.)

(imported from commit 20c426ad2dae5efa3107890b28976a957bb3d1e3)
 2012-10-02 16:00:46 -04:00
Jessica McKellar 1adb10d1ae Allow copying and pasting from zephyrs without triggering a compose. 
(imported from commit f98a14155904dda11d85ed81acee783494377e4d)
 2012-09-28 15:27:39 -04:00
Waseem Daher d13dd0a953 Restyle personals, attempt #2. 
(imported from commit a8bdf6ad1d7e3dd24b8d42b0f46472ba2db15900)
 2012-09-28 14:34:09 -04:00
Waseem Daher 9acd5b57c9 Provide framework for styling personal message differently with CSS. 
Basically, we add personal-message on to every div, etc. if it's
a personal, and we'll use CSS to style them differently.

(imported from commit d9b7b8e3b422bcf921c8c61ce794cc055edcbdae)
 2012-09-28 13:32:59 -04:00
Waseem Daher 1cb8947e86 Clean up zephyr template slightly. 
(imported from commit 999e6261785a0714bf72a8fe8f2c05c20cf59db9)
 2012-09-28 13:32:59 -04:00
Jessica McKellar f2b808a976 Now that mouseover doesn't select, show_email needs to take an ID. 
(imported from commit dfa737e78da0772e99fda34318ed879896fb5655)
 2012-09-28 10:59:39 -04:00
Jessica McKellar 9cbdbc4893 Don't update the selected zephyr on mouseover. 
But do keep the pointer on the screen as you scroll, and smoothly
scroll all the way up to the top or all the way down to the bottom.

(imported from commit 6acad2a16339ee5eeeebd62a853000c21e4b7152)
 2012-09-28 10:59:38 -04:00
Waseem Daher cd296da113 CSS cleanup. 
(imported from commit a7a13e57cf43368d66e94d01ef25ec14d0c15657)
 2012-09-27 15:40:11 -04:00
Waseem Daher 0f8f60f30d Round corners on gravatars. 
(imported from commit 858bfa920f42e366daa2fa4422a20e41ff11238e)
 2012-09-27 14:56:53 -04:00
Waseem Daher deb5cc771a Restyle compose box to be more consistent with our experiment. 
(imported from commit a035c82e83a0bb1a2eea24de18044e3022ecdde5)
 2012-09-26 16:19:01 -04:00
Tim Abbott df01b016cb Display short_names rather than email addresses for huddles. 
(imported from commit 6509305f1b0ee90cfe5c93c74e03350a557a0cc5)
 2012-09-26 15:32:35 -04:00
Waseem Daher 97b20a8cb6 A new Waseem design candidate. 
(imported from commit 0acb3ef0e37752178d4809d77d0281568a75b98e)
 2012-09-26 14:29:17 -04:00
Keegan McAllister 877954aa55 Render all new zephyrs with a single template invocation 
(imported from commit 13803e0e96901d129d4aefcd5fde63548deb4dc0)
 2012-09-24 17:45:52 -04:00
Keegan McAllister 934e3461df Split add_to_table into preprocessing, templating, and postprocessing 
(imported from commit ef17ff33f4496fcf619170bda1a46f14734d3e43)
 2012-09-24 17:45:52 -04:00
Keegan McAllister 6fb5fc57ce Change bad CSS class names 
(imported from commit 962f91a593b4ca65bd7aae7d71117fc159c2627a)
 2012-09-24 17:45:52 -04:00
Waseem Daher a27edbce7d Restyle subscriptions page. 
(imported from commit 41339c5af38ae5ea4801fc1e23b7184c277145f3)
 2012-09-21 16:04:44 -04:00
Tim Abbott ee8f28a084 Use email addresses as unique identifiers rather than usernames. 
Note that this code still assumes one's email address (stripped of
domain) is unique.

(imported from commit e98f96601ad109811978fc00b1165e97d8f7b185)
 2012-09-21 09:43:22 -04:00
Luke Faraone 1050300ded Render Huddle titles the way Waseem detailed in his original mockup. 
This actually involved refactoring a good bit of existing code; we
in this commit introduce a new property of zephyr called .reply_to, which
is the fully rendered-to-string and pretty-printable version of the person
to which any reply should be addressed.

This is useful for grouping personals, where if you simply went by the
.display_recipient or .sender you would have to check them against
eachother.

We also introduce a new narrow_classish command, which is triggered on
clicking on the "Huddle with…" text. This method intelligently determines
which sort of narrowing to do; we essentially moved out code from the 'r'
key handling section and put it in its own function.

(imported from commit 2406ee0f6f83b990eec83190d2e8858865c06238)
 2012-09-20 16:36:49 -04:00
Keegan McAllister 1dabe1cf81 Give each zephyr row a unique DOM id 
(imported from commit 4530d0bbbfc94fb86ebba9c6d73074de38e4a78a)
 2012-09-20 15:23:41 -04:00
Keegan McAllister a00227c864 Implicitly choose the selected zephyr for showing email address 
I erroneously switched halfway in ce4f6289491722d4c1aa84fe8b88b3a5932a3f2a, so
let's just do it for real.

(imported from commit 4c09a7805f6e2322cbbab2f8534e9d362acdc826)
 2012-09-20 15:23:39 -04:00
Keegan McAllister 8d994bdb21 Make sure only one email address is displayed at a time 
(imported from commit 51b5b2268a154d1136b03185d6658fad7f2922aa)
 2012-09-20 15:22:08 -04:00
Keegan McAllister 7d894d8dd1 Merge update_pointer and select_zephyr 
Having both is confusing.

(imported from commit becd1ac7a8bab583c4fafdd77256c57f3dc98ea1)
 2012-09-19 17:55:58 -04:00
Keegan McAllister 72b98d1d01 Hotkeys: don't go from zephyr to zid and back 
(imported from commit e7e80bdc2e0af5dfe9ec4f885cae814543c038de)
 2012-09-19 16:25:23 -04:00
Jessica McKellar 28be3581a3 Get gravatars over HTTPS. 
(imported from commit 37d12b038e955144e3b7a990db1b72c1fe8a1200)
 2012-09-19 10:50:37 -04:00
Luke Faraone c5d1897ab3 Reimplement collapsing, for realsies this time. 
We no longer break random things! Its pretty grand, actually.

This reworks and reverts commit fbadd6e854722e41cccd2535748ee47f4efd657b.

Conflicts:
	zephyr/static/js/zephyr.js

(imported from commit 534a120290855d3bf2cf979ac174267c2d07bf68)
 2012-09-18 15:56:01 -04:00
Jessica McKellar 736f60cf7b Move subscription rows to a Mustache template. 
Now that subscriptions are in a tab, we'll need to dynamically
generate the rows.

(imported from commit e8ded6399d28fa52369ece154c5b55102ccbbd8c)
 2012-09-18 12:26:29 -04:00
Waseem Daher b6aeb8bca6 Move pointer when you mouseover any part of the message. 
Not just the content -- include the class and instance part too.

(imported from commit 055b7c18001590c9ba7bc685b7c013e2f7939bfb)
 2012-09-18 10:52:25 -04:00
Waseem Daher 5f49616753 Refactor: Put the zephyr <tr>s in the template. 
(imported from commit 8a822d7c8463c248d536f97f07bfb19ca242b83f)
 2012-09-18 10:46:11 -04:00
Keegan McAllister 7e929193a1 Ask for Gravatars in the size we use 
(imported from commit 8ac41f4e87489d59d2d8dffe9388f5032c1a6191)
 2012-09-17 21:57:09 -04:00
Keegan McAllister 02bee4b4d0 Apply margin to zephyr content more sanely 
(imported from commit 93fd1603c1b838cd0bc5f965c573333599ebfe84)
 2012-09-17 15:56:04 -04:00
Keegan McAllister 7152fe2f73 Format messages with Markdown 
(imported from commit 014a4dddd4d3db61d85c6f6bf1987aff6093fb52)
 2012-09-17 15:24:41 -04:00
Jessica McKellar 69cc5c02dc Make clicking anywhere in a zephyr start a reply. 
Previously you had to be inside the content span.

(imported from commit 0570ddeb9bc948d278b0b1859b4a041b81ff184d)
 2012-09-17 11:16:53 -04:00
Keegan McAllister 3694ecaf4c Only display email while hovering on fullname 
(imported from commit 0f366deb69ba49bfda998dd993e32de0d29affe4)
 2012-09-13 16:29:47 -04:00
Jessica McKellar 09bb68e52c Have the pointer follow the mouse. 
(imported from commit cfd6bcd7ba506c440f74bd7e40eaacadc06b10c8)
 2012-09-13 11:06:29 -04:00
Jessica McKellar 08904cae43 Clicking on a zephyr pops up the compose window and prepares a response. 
(imported from commit 00139f7b0c6d1ded198064689f1a1bd8038e72f9)
 2012-09-13 11:06:28 -04:00
Keegan McAllister 51e109d043 Show full date hovering over timestamp 
(imported from commit 486cd85b4ec21ad8468ced207c541372f341c200)
 2012-09-13 01:00:28 -04:00
Keegan McAllister ae5137b5c9 Show timestamps on zephyrs 
We use the browser's local timezone.

(imported from commit 6ed6444df6edf2093b9399adb1511dd3ee80def3)
 2012-09-12 17:00:02 -04:00
Jessica McKellar f5e8f025b7 Bring back preparing a personal when you click on a user. 
(imported from commit b9081cb77dafa590605ee3a0892b359cc7ac6d06)
 2012-09-11 16:35:01 -04:00
Jessica McKellar f52ec24926 For now, compose zephyrs to usernames. 
We'll eventually need to normalize emails, autocompleted names,
etc. to one entity we use when talking to the server about senders and
personals recipients, but for now since we've hardcoded usernames
everywhere, just use those.

(imported from commit 4a0e033b301b8dec55d97157eb4993982f6b2641)
 2012-09-11 16:35:01 -04:00
Jessica McKellar bfdf2bef57 [schema] Collect and display names and e-mail addresses. 
(imported from commit aa6bceb05fcd5b456c03288cbfed65b14050fe88)
 2012-09-11 16:34:53 -04:00
Luke Faraone 34a7ad5be0 Revert "Collapse duplicate instance names, add breaks." 
This reverts commit 8c47682cd80fec0d221a519abc593f4d83dc90b5.

I accidentally broke.. a lot of things in my last commit. Lets fix those
issues before pushing to master again.

(imported from commit fbadd6e854722e41cccd2535748ee47f4efd657b)
 2012-09-11 15:19:51 -04:00
Luke Faraone c5238e4af5 Collapse duplicate instance names, add breaks. 
(imported from commit 8c47682cd80fec0d221a519abc593f4d83dc90b5)
 2012-09-11 14:37:24 -04:00
Keegan McAllister c32081a366 Make the whole messagebox clickable 
(imported from commit 55b4970842e94b35cc138a4a5107ec32e08bac8c)
 2012-09-11 11:24:38 -04:00
Luke Faraone 4503aaae89 Implement gravatars. 
(imported from commit 1e07d295ee7c12a95091e0785a9a9c3c4e856ede)
 2012-09-10 18:18:09 -04:00
Keegan McAllister 7b8544a53f Get class/instance for narrowing more uniformly 
(imported from commit 1e9622cb93cf5954cf94f38c77c191524a6e72bc)
 2012-09-10 14:46:03 -04:00
Keegan McAllister f2fbb99368 Fix narrowing by click 
(imported from commit 776457bb430ed73912325d40a58d67ecb07f5e04)
 2012-09-10 14:45:19 -04:00
Luke Faraone cfc42b1d82 Implement portions of Waseem's new UI. 
This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)
 2012-09-10 14:32:42 -04:00
Tim Abbott a53d4e8177 Fix narrowing by huddles. 
(imported from commit 77eb727512e4d90f71943c192fd7a2e16c7041c3)
 2012-09-07 13:43:30 -04:00
Keegan McAllister 474f08198b Send zephyr template inline with index.html using django-jstemplate 
(imported from commit 58cc8a50d463548aa283658dbe0aae366ecab39f)
 2012-09-06 15:48:15 -04:00