Commit Graph

995 Commits

Author SHA1 Message Date
Zev Benjamin 7a305c1882 Add more information to error message
(imported from commit 0917d5c2ed1b156603ce53aaec88ecbe26f5f39c)
2012-10-12 11:34:42 -04:00
Zev Benjamin c4d35280ea Make Message's display_recipient field be an object with consistent names for both personals and huddles.
(imported from commit 8b00f16b036ed3fb3f7d56e7393271ec1d458ea5)
2012-10-12 11:34:42 -04:00
Tim Abbott 2f1d68e09a do-schema-change: Recreate the auth_user email index.
This index is important since we are searching by email address.

(imported from commit 49c8dab68a0c7857d1c9620b856e4de5c4b8c669)
2012-10-12 11:09:53 -04:00
Tim Abbott 0a0283cba7 Revert "zephyr_mirror: Truncate stream names to 30 characters."
This reverts commit 9973168227896dc8f1dc061b7970a503565856bf.

In theory, we should never be subscribed to receive such messages
anyway.

(imported from commit ff52eaa3285283750b4d7dc3b3a12c2d766514ac)
2012-10-12 10:49:24 -04:00
Tim Abbott afee537a95 Don't allow users to subscribe to too-long stream names.
Also check for invalid characters when subscribing via the API.

(imported from commit c4730ecb360607c4da264cb1c4b2f9daa2cef293)
2012-10-12 10:48:41 -04:00
Tim Abbott 091bc48926 api_subscribe: Check for too-long stream names.
(imported from commit 20d94eafeb333a9bc09b6b20093e13fd1b241ea8)
2012-10-12 10:45:53 -04:00
Tim Abbott f9713d5541 Mark more API examples as executable.
(imported from commit 1d21e05af00e9ae37ef38d6e6d56c88e0d764f82)
2012-10-12 10:40:12 -04:00
Tim Abbott e12f006ad6 zephyr_mirror: Truncate stream names to 30 characters.
(imported from commit 9973168227896dc8f1dc061b7970a503565856bf)
2012-10-12 10:38:01 -04:00
Tim Abbott 486aa99234 zephyr_mirror: Fix case where we're not forwarding class messages.
(imported from commit c40ae12522dcf3a7c3b02d92dbc230c8b4c582ac)
2012-10-12 10:16:20 -04:00
Waseem Daher 22099dfe9f Fix scrolling bug related to resize.
When Bootstrap shrinks the divs down into 'tablet' mode, our selected
message might end up being even lower in the screen than it was before
(because more text wraps). But our scrollbar does not automatically
advance to keep it in view -- so we do it manually.

This implementation is a little hackish in that it does some
unnecessary recenter_view-ing in big views (which can be a touch
disorienting) to optimize recentering on resizing for small views.

If that behavior is annoying, we can deal with it by being
smarter about when we trigger the recenter code.

(imported from commit 6834e11f7a37833982c388f15174df661d7f55b3)
2012-10-12 00:17:24 -04:00
Waseem Daher 23cc654847 Condense name and email when we have a very narrow window.
When the window is narrow, vertical space (particularly in
our navigation menu) is at a premium, so let's be more
parsimonious.

(imported from commit 72628827bc108f4d9f2d47a11c48e0e772b769d4)
2012-10-11 23:10:48 -04:00
Waseem Daher 04b0000d83 Embarrassing typo fixes.
(imported from commit 0ea86386e3d4269be63610f4729b1f1762cdc0b7)
2012-10-11 22:49:18 -04:00
Waseem Daher 9556f58953 Provide tooltips for navbar items.
(imported from commit 88d36eab304e87639a46451677783596e2b8ffba)
2012-10-11 22:44:28 -04:00
Waseem Daher 1c14c461c2 Small "New Message" button when we don't have lots of room.
(imported from commit 58f2bdf0aafec7714d0f3a9be99f953dd8b237b3)
2012-10-11 22:44:28 -04:00
Waseem Daher 6e57c4f3ae Change Settings icon.
(imported from commit a6e7a8a022f7b3d6e8dd61ea74bfe41703cba2eb)
2012-10-11 22:44:28 -04:00
Waseem Daher 3853bf6dd8 In case we start out very small, trigger resize handler on page ready.
(imported from commit b3492eee7299e89ded422527facf9c8e44421c73)
2012-10-11 22:44:28 -04:00
Waseem Daher 7d155850a9 Have the navbar,composewindow,narrowbar look OK in small windows.
(imported from commit 724ecfee79a263919e93c47513332ffdd3c6d286)
2012-10-11 22:44:28 -04:00
Waseem Daher 31840811cf Cleaner HTML for the sidebar.
(imported from commit 2b630a6a37b634e29f0eb90368e9d174c1af3bc2)
2012-10-11 22:44:04 -04:00
Keegan McAllister d19d3d2bd7 Hack around Markdown parser failures for now
(imported from commit dba079d444d40e36c91508b86b243bdc805c6222)
2012-10-11 21:45:22 -04:00
Tim Abbott b1cafb2761 zephyr_mirror: Automatically subscribe to streams in ~/.zephyr.subs.
(imported from commit b28b28a81416c52813975c2cdbf65d282deec3df)
2012-10-11 16:28:51 -04:00
Keegan McAllister eab84fa195 gitignore zephyr/tests/zephyrdb.test
(imported from commit 755213afd778829a6d3f77a4232b9947b5f01c4a)
2012-10-11 16:25:40 -04:00
Keegan McAllister 3ca3be297e Disable Markdown heading markers by padding with spaces
Because # will display literally now.

This still fails in some cases, such as

    > # foo

(imported from commit 40654a4f1dac940ba131f2a104440b6ecb7eafd1)
2012-10-11 16:23:18 -04:00
Tim Abbott 9f499fd364 Fix descriptions of some API examples.
(imported from commit 105211905b27d03906506af41522854cbb53479a)
2012-10-11 16:20:45 -04:00
Tim Abbott fc99d2983a Add an API call to subscribe to a list of streams.
(imported from commit 0a5d46d5f54fb4c8ebfad8c9adb777c0b4938dfa)
2012-10-11 16:20:45 -04:00
Waseem Daher 04c631fd24 Don't let timestamp float over other content.
Before this commit, the timestamps are higher than the narrowbar,
on the z-axis, so they slide over it as you scroll.

As a philosophical aside, I almost wonder if the timestamps should
live in their own table row, that way they can't possibly overlap
with the message bodies. (This would require reverting Tim-style
sometimes-show-date-and-time timestamps.)

(imported from commit 0c59f1feacebd59b88e76bf056d96e05159d2937)
2012-10-11 16:15:19 -04:00
Waseem Daher 8492aaee4b Firefox-specific fix: make narrowbar 'x' appear in the right place.
If its div comes after the currently_narrowed_to span, it appears
on its own, second line, for some reason.

(imported from commit d0b24f8e3aba3a6fdbe5624ba92ac81456e06634)
2012-10-11 16:15:19 -04:00
Waseem Daher 39e936242b Reindent.
(imported from commit 58b50e4e8cf39da6986fd0a03202b4b1c4655d51)
2012-10-11 16:15:19 -04:00
Waseem Daher 97daefee1c Responsive compose window.
(imported from commit 432223391cf158a6c8902370a911a08fd3179401)
2012-10-11 16:15:18 -04:00
Waseem Daher 601488e7df Make the narrowbar responsive as well.
This is one approach, anyway. Another is to keep it inside
message_list, which is what we (currently) do in the composebox.

(imported from commit 64c69b931012e3d21b7a10e3909f7a13f7dcfc4f)
2012-10-11 16:15:18 -04:00
Waseem Daher f13a257087 Make main message area respond better to resizes.
Paradoxically, life is better if we specify a max-width rather
than a min-width!

(This has the side effect, though, of sometimes having our message
boxes, etc. be ~548px rather than 640px, but philosophically
it's kind of nice if that all scales nicely).

(imported from commit 7f41c147b727348a148197c74b299cb31636f83b)
2012-10-11 16:15:18 -04:00
Keegan McAllister 58e8560ca9 zephyr_mirror: Don't un-HTML-escape messages forwarded to MIT
The messages coming in from the API should no longer contain these entities,
unless the user typed them.

(imported from commit d6b6aa300557d4603c68ffc3b5966115a5787aae)
2012-10-11 15:01:54 -04:00
Keegan McAllister 0a0bd31407 Remove unused strip_html
(imported from commit 21747b9b5cbbe7b1935905fc9254f4de64db20aa)
2012-10-11 15:01:54 -04:00
Keegan McAllister 2c3d7d6116 HTML-escape messages on output
(imported from commit f199fddf887ffbd22ebac76448accb4c48b64a24)
2012-10-11 15:01:54 -04:00
Keegan McAllister 3fadaae574 Don't escape message metadata as it enters the system
(imported from commit b98deb3dcdc389b079055a06ffafaf138bc79c70)
2012-10-11 15:01:54 -04:00
Keegan McAllister c06aa1a3da Don't escape user metadata as it enters the system
We believe that our output escaping is sufficient.

(imported from commit 4c9d4d79682ef5689bc1eec12a3bbcc34de013a4)
2012-10-11 15:01:54 -04:00
Keegan McAllister 99209b4c0a register.html: Remove 'escape' filter
Now that we have enabled Django autoescaping, this happens automatically.

(imported from commit 43ac39e34354297b195facfde5a49dd071bf995e)
2012-10-11 15:01:54 -04:00
Keegan McAllister 7137787984 Escape variables interpolated into <script> within index.html
Django's escapejs prevents breaking out with an embedded </script> tag.

It only works on bare string contents, not JSON-ish lists and such.  So we
generate stream_list and people_list with template loops now.

(imported from commit 07fe4bebaa3fa11bc479b4378b8989560ce77f6f)
2012-10-11 15:01:54 -04:00
Tim Abbott 4715d2144c zephyr_mirror: Get new classes to subscribe to from the humbug server.
(imported from commit 7cf321cdc97cf10719ca89b4ee1e7c2e8d979e40)
2012-10-11 14:49:04 -04:00
Tim Abbott 83f494b1a4 Add API queries to show public streams and the user's subscriptions.
(imported from commit 5f24e35a9bdd1e40406e2acb0c3713a6517d139b)
2012-10-11 14:43:23 -04:00
Zev Benjamin adf75d48e1 Make pressing escape also un-narrow
(imported from commit 17d2cc3e8074af332f98588ad201ec342476d51f)
2012-10-11 14:30:51 -04:00
Keegan McAllister 9811bd5f8a Get UserProfile by email with a join, not two queries
(imported from commit 0698ebb88615cea54196181aeabe869ec466dbc1)
2012-10-11 14:05:53 -04:00
Tim Abbott 676e650a08 Fix mit_sync_bot bug causing constant API requests.
(imported from commit dfa845b98a7e22ee69a9589b8b98ac5a49077793)
2012-10-11 13:00:50 -04:00
Tim Abbott 2de4d1d448 Add social and test to default subs added after DB dumps.
(imported from commit 828c733c9f5d1bdd5fc0aa2e162b800f8db7b22f)
2012-10-11 11:53:57 -04:00
Tim Abbott beb5dc4a70 zephyr_mirror: Forward instances longer than 30 characters.
(imported from commit af0b2fbbcc8dee13dd70084d4f81a841193bd812)
2012-10-11 11:53:57 -04:00
Keegan McAllister b3c029472a post-receive: Include an abbrev sha1 in the message
(imported from commit 97eea18bb4426270d085e398680f1db8028235db)
2012-10-11 11:49:24 -04:00
Keegan McAllister 5a7ff70c11 Remove obsolete views
This functionality is part of the home view now.

(imported from commit 5f0327eb62840bf98af49566e6f3c0b86ca43b8d)
2012-10-11 11:23:22 -04:00
Keegan McAllister 648ed8bb0d Remove stupid copy
(imported from commit 428648daf82928ef34380923c0b2de47a18f9d67)
2012-10-11 11:17:50 -04:00
Keegan McAllister 48ec15c46d Don't duplicate realm query when registering
(imported from commit b1e3b7144f564c5b2fc23fbf548bf0672deb2932)
2012-10-11 11:08:52 -04:00
Waseem Daher 97e3c36d4b Experiment: Color huddles a little in an attempt to make them stand out.
(imported from commit be19446631831a4fc13cb8bf758902ea9f8304ae)
2012-10-11 10:40:28 -04:00
Tim Abbott eb63177a56 Fix timestamps in logging
(imported from commit c23570fa00ea682681a0065ffddd86670e5c59af)
2012-10-10 21:34:57 -04:00