Commit Graph

682 Commits

Author SHA1 Message Date
Luke Faraone fed4cd3891 Limit № of autocomplete results so the list doesn't fall off the screen
(imported from commit 311376c1dec35a16ddfb66fc01161501c2eafff0)
2012-09-19 13:11:13 -04:00
Keegan McAllister d8c243dbe2 Remove unused SQLAlchemy code
(imported from commit 0738c771e76bd659efeb2d20d14ba95b7c7666cf)
2012-09-19 13:06:31 -04:00
Keegan McAllister db7a8277ff Replace create_{user_profile,zephyr_class} with {UserProfile,ZephyrClass}.create
Looks nicer and cuts down on imports.

(imported from commit 4fdbbb45cf6d8ad016481c663cf52fd555b41d91)
2012-09-19 13:01:58 -04:00
Keegan McAllister 5486e148e3 Cache Zephyr.to_dict
(imported from commit 7968244a813111e328fc91c34d64af727a98bb36)
2012-09-19 13:01:58 -04:00
Keegan McAllister 669bb789f8 Add caching decorators
(imported from commit 7a4d9257ea8c6a86a5ffb498f726c4c2eb42bc9f)
2012-09-19 13:01:58 -04:00
Keegan McAllister 3b9fcb6404 Configure Django for in-memory caching
(imported from commit ad9e5b1712eef77631ea4d8de5a018cdb04742d8)
2012-09-19 12:58:38 -04:00
Luke Faraone 72eb05dfc5 Switch to Boostrap Typeahead instead of JQuery-UI Autocomplete.
This reduces the number of CSS/JS files we need to load, which is awesome.

(imported from commit 3d34276a185e61f698163402cff2fd2c75ce0bd7)
2012-09-19 11:51:53 -04:00
Luke Faraone b634d26017 Post the newly selected zephyr ID, rather than the old zephyr ID.
Previously update_pointer POSTed the selected_zephyr_id, which in reality
was the ID of the zephyr we just moved off of, rather than the current
zephyr we just higlighted.

(imported from commit 2b143b34d3042a789b3f6a999117115dd6243782)
2012-09-19 11:13:43 -04:00
Jessica McKellar 28be3581a3 Get gravatars over HTTPS.
(imported from commit 37d12b038e955144e3b7a990db1b72c1fe8a1200)
2012-09-19 10:50:37 -04:00
Jessica McKellar 3ec50a921d Fix loading subscriptions on the live site.
For some reason on both my and Waseem's local instances the lack of a
trailing slash was not an issue, but this does fix the issue on the
live site.

This could be because we are running Django 1.4.1 and the deployment
server is running 1.4.0.

(imported from commit 613732d75f204fd654247382088d92879780560b)
2012-09-19 10:21:34 -04:00
Luke Faraone 7d4693a063 Unbreak adding messages in get_updates_longpoll.
(imported from commit 4dbf0b151c7ac243f23b74feeb85dac2b410c7b9)
2012-09-18 18:02:53 -04:00
Luke Faraone 5b32048ade Implement borders using CSS rather than brs, style the way Waseem wants.
(imported from commit f4e23721a6eb0ffdd2d6e859b28417f0fdfbfe87)
2012-09-18 17:19:29 -04:00
Keegan McAllister 57ede6bd29 Configure Django for INFO logging even with DEBUG = False
(imported from commit e7d61d10ebb548c0d902c7e2ae947129884e8145)
2012-09-18 17:00:04 -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
Keegan McAllister 8aded489b8 Remove a duplicated query
(imported from commit 50ee95e0ec887d5a9d1629051aa816c706bd04d8)
2012-09-18 14:24:52 -04:00
Keegan McAllister 996c7fb4eb Add 404 template
Django wants this when DEBUG = False.

(imported from commit 9c30b59aa0976be40ac64d16774c97f0e80f06aa)
2012-09-18 13:45:59 -04:00
Keegan McAllister cf8cc277ff Restore DEBUG = False on deployed app
This reverts commit c3f0a8f7a388596113613c9ab18bdbccbf415226.

(imported from commit 24147588b3c31831116c364adeaea50caa8af198)
2012-09-18 13:45:52 -04:00
Keegan McAllister c887a5f977 Debug Tornado when Django DEBUG = True
(imported from commit ebd81e5d9344f5fb09c59a2afcaf83e9b1fc2a1d)
2012-09-18 13:45:52 -04:00
Keegan McAllister af941e7779 settings.py: Disable error email to admins
Sending email was hanging Tornado's event loop.

(imported from commit ab0ec21fa886e68a6acb21b6ee8e036265ce6f08)
2012-09-18 13:44:25 -04:00
Jessica McKellar a8484cb967 Remove subscriptions with an AJAX request.
(imported from commit d34154b31a38ac66cc8f97785c312c98dd53286c)
2012-09-18 12:33:07 -04:00
Jessica McKellar 2126e38ae2 Get and display new subscriptions with an AJAX request.
(imported from commit c9efa7596898ac4b74ec9184ae773566eda65ec3)
2012-09-18 12:32:52 -04:00
Jessica McKellar 1996efa0c7 Give json_success/error the ability to add more data to the results json.
(imported from commit 8fafb983f30e193905616eafa3be2f8aec1143c3)
2012-09-18 12:26:29 -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 a70e8dee4d Refactor our different pages into separate templates.
They are all included by index.html in different divs.

(imported from commit bd8b485516007075d33c2614b1de9f08999e927c)
2012-09-18 12:26:29 -04:00
Waseem Daher 5ebac29508 Switch back to 'Home' view when composing new message.
For now the idea is that if you're in the search view (or the
subscriptions view) and you click 'New Message', we should
snap you back to the main view.

This may or may not be the right behavior in the long term.

(imported from commit 43c24e1af9e80225ff9be8a62f4c8c925960436a)
2012-09-18 12:15:24 -04:00
Waseem Daher 6a7c2b3ef7 Add a new pane for 'Search'.
(imported from commit d7d96ad7abffbca794474e289da6ff05aa706265)
2012-09-18 12:15:24 -04:00
Waseem Daher 95fbe976dc Add tilde files to gitignore.
(imported from commit bfd66436fb6d53458e2558e093216e29d7b267e2)
2012-09-18 11:53:07 -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 0a88386523 Specify size on compose box Gravatar, too
(imported from commit 3a2911d5aadb3057222969d6e38d8dfccf7c15a7)
2012-09-17 22:12:38 -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 f003dddebb populate_db: Remove unused variables
(imported from commit 3f8f40134858721b372f3971c3b7ced31f9ed49e)
2012-09-17 21:55:38 -04:00
Keegan McAllister bdb1c1b97e populate_db: Break up a long line
(imported from commit cb9d1a785751af6115cbbffc4f21bc09d38cc0fa)
2012-09-17 21:39:21 -04:00
Keegan McAllister 03150b6ab0 zephyr_mirror: Get the CSRF token from the login form
It's simpler, and avoids BeautifulSoup choking on the huge JSON lines.

(imported from commit 3a0aa0ae063f79b3a4c73a2a9915d325fc19c6e1)
2012-09-17 19:52:04 -04:00
Keegan McAllister 2e3e44b5bb App hangs with DEBUG = False (??)
Will debug this problem tomorrow.

(imported from commit c3f0a8f7a388596113613c9ab18bdbccbf415226)
2012-09-17 19:17:53 -04:00
Keegan McAllister a8a8be2d8d Distinguish deploy server by hostname
(imported from commit 685001e49f8add7540ae807acb8d3a604a969d4f)
2012-09-17 18:15:42 -04:00
Keegan McAllister de298d732b Override Bootstrap's big blockquotes
(imported from commit ea69c25ba5c02ec13d19e8632927b49476813cba)
2012-09-17 18:11:56 -04:00
Keegan McAllister e6b80c890d setup.bash: More packages
(imported from commit a8a68fdb7a4d0e796ce9ab65318d5d3f297c1e72)
2012-09-17 18:11:56 -04:00
Waseem Daher c31c27f626 Cause gravatar to appear to left of textbox, rather than top.
(imported from commit 4c04dab329802bf6c4090658bc3ab114c1356c48)
2012-09-17 17:53:04 -04:00
Waseem Daher d5bdd84ab7 Colorize the view differently when in narrowed mode.
(imported from commit c7b2d23386ff0895caaea8e9f6e3c116e6744c53)
2012-09-17 17:04:39 -04:00
Waseem Daher 41d99dc716 Make narrowbox appropriate width.
(imported from commit b617d68de412ebdc815f6c090af6466a19a3404c)
2012-09-17 17:03:39 -04:00
Waseem Daher c909e2a78d Resize narrowbox and composebox to account for missing scrollbar.
(imported from commit 1a9c40d4e33c950ccbdfc9d406867dcbe89ae19b)
2012-09-17 16:42:45 -04:00
Keegan McAllister 0e7c99b32e Add missing Pygments style
Whoops.

(imported from commit 51e18e90a3549aa5572fe849572b7996b2c6b8be)
2012-09-17 16:16:25 -04:00
Keegan McAllister bbb7fd0966 Lower margin on blockquotes
(imported from commit 20e06c7424c51ae3e0974472539f2e401cff5d70)
2012-09-17 15:57:58 -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 f63759679a zephyr_mirror: Change error handling and output
(imported from commit 62a296833b19b810e9d2be58dd7f8b7bb5e69b6b)
2012-09-17 15:40:47 -04:00
Keegan McAllister a1cd13aea5 zephyr_mirror: Let the server handle escaping and line unwrapping (via Markdown)
(imported from commit 65d00bf911231cb15d3a6713e64ed8dff28a613a)
2012-09-17 15:39:01 -04:00
Keegan McAllister c53470c908 Sanitize username, class name, etc
(imported from commit 95730f1f725036649ff60d698b461fdcf33594bb)
2012-09-17 15:24:41 -04:00
Keegan McAllister 7152fe2f73 Format messages with Markdown
(imported from commit 014a4dddd4d3db61d85c6f6bf1987aff6093fb52)
2012-09-17 15:24:41 -04:00
Keegan McAllister 409d671445 Use absolute path for zephyr.css
(imported from commit 4bedaaebd160c6f0a4b9861a76376e44dadfeca0)
2012-09-17 15:24:40 -04:00