Commit graph

214 commits

Author SHA1 Message Date
Samuel Clay
fdaa25c2fc Merge branch 'master' of github.com:samuelclay/NewsBlur into requests
* 'master' of github.com:samuelclay/NewsBlur:
  jQuery 1.6.1 -> 1.7.1. Fixes massive Chrome issues.
  Adding shift+u as a shortcut for marking a story unread.
  Boosting fillout pages.
  Small cleanup in ajax manager.
2012-01-04 21:50:06 -08:00
Samuel Clay
63d7cc1fa5 jQuery 1.6.1 -> 1.7.1. Fixes massive Chrome issues. 2012-01-04 16:40:22 -08:00
Samuel Clay
b5efad9142 Merge branch 'master' into requests
* master: (66 commits)
  Too many stories? Don't animate transitions when switching intelligence levels.
  Fixing typo in iphone app that preventing mark folder as read when the visible stories option was showing.
  Updating the mongo db copy util to also look for updated stories.
  Globals.is_staff on user, not profile. Make the stats referesh every minute instead of every 10 minutes for staff.
  Fixing offsets in river of news.
  Adding ciphering to usernames in log, so I can finally take screenshots of the most colorful logs of all time.
  Adding my very special mongo serialization backup utility to get around the damn unrepairable mongo database. This is taking 14 hours to run.
  Auto-refreshing feedback (1 min for staff, 10 min for everybody).
  Fixing exception around multiple feeds during Google Reader import process. Also switching rate limit to status code 429.
  Adding Nokia MeeGo client to user agents.
  Only show raw feeds in feed autocomplete.
  Handling iphone version for new users on ios app.
  FIXING THE WORST BUG OF MY LIFE -- finally figured out what was causing the story-shows-as-unread bug. Also fixed enclosures on certain types of feeds.
  Fixing menu manage open position to compensate for additional menu items.
  Reducing the amount of work done by feed fetching when there are no new stories.
  Fixing emergency bug around trimming feeds where the cursor is changing. Dammit mongo.
  Simplifying ufw ports in fabfile. Adding env.user.
  Launching the iPhone app on the front-page. Big deal.
  Minor cleanup of river stories view.
  Cleaning up mongoengine imports and settings for default MongoDB.
  ...

Conflicts:
	local_settings.py.template
2011-12-20 21:47:55 -08:00
Samuel Clay
befa6eb26f Adding ciphering to usernames in log, so I can finally take screenshots of the most colorful logs of all time. 2011-12-18 23:49:10 -08:00
Samuel Clay
6d0b8baa83 Cleaning up mongoengine imports and settings for default MongoDB. 2011-12-11 11:41:12 -08:00
Samuel Clay
f3d2f8e5b5 Moving from slave_db to ReplicaSetConnection in pymongo 2.1. 2011-12-11 10:54:07 -08:00
Samuel Clay
b112717d95 Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
This reverts commit a827b2c864.
2011-11-27 02:41:12 -05:00
Samuel Clay
a827b2c864 Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
This reverts commit 617dc3bb56.

Conflicts:

	local_settings.py.template
2011-11-27 02:40:44 -05:00
Samuel Clay
d07b03a7a4 Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
This reverts commit 7972d0bb5c.
2011-11-26 11:15:01 -05:00
Samuel Clay
7972d0bb5c Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
This reverts commit 617dc3bb56.
2011-11-26 02:16:14 -05:00
Samuel Clay
617dc3bb56 Switching to requests from urllib2/httplib. Bring on the page errors. 2011-11-26 02:07:31 -05:00
Samuel Clay
596c00a281 Deprecating db02, moving redis and rabbitmq over to db01. 2011-11-18 10:13:39 -08:00
Samuel Clay
2d53d148c9 Bumping up the subscriber expire, now that I've got my wits back. 2011-11-14 09:18:15 -08:00
Samuel Clay
936774b654 Adding update_counts to /feeds API endpoint, to force a recalculation of feed unread counts (WARNING: slower than calling /feeds then /refresh_feeds). 2011-11-07 08:27:59 -08:00
Samuel Clay
ac3609bf7d Merge branch 'master' into realtime
* master:
  Adding 'E' as a keyboard shortcut for the Everything view.
  Doubling the amount Space pages in a story.
  Auto-linkify urls in stories.
  Reading stories from slave db during feed update.

Conflicts:
	settings.py
2011-11-06 15:28:37 -08:00
Samuel Clay
4e382e5caf Adding fabfile config for redis. 2011-11-06 15:19:58 -08:00
Samuel Clay
dcedbe1e40 Adding socket.io communication and feed updating on client-side. Ready to ship? 2011-11-06 12:21:27 -08:00
Samuel Clay
07fa01ed9a Adding server half of redis real-time unread count updates. That was the easy part. 2011-11-05 17:08:31 -07:00
Samuel Clay
040b755694 Reading stories from slave db during feed update. 2011-11-04 09:45:10 -07:00
Samuel Clay
40cf11f5e3 Adding new db03 to mongodb mix. 2011-11-01 22:51:10 -07:00
Samuel Clay
bd1c4347c9 Using mongodb nifty db resolution. 2011-11-01 21:55:23 -07:00
Samuel Clay
a7d542396f Testing out a slave read for getting stories. 2011-11-01 21:20:07 -07:00
Samuel Clay
7e0bef73de Ratcheting down subscriber expire to a single day to alleviate strain. 2011-11-01 13:26:31 -07:00
Samuel Clay
b16c052dc9 Adding undersocre.string.js. Fixing bug in River with using _.contains instead of new _.includes. 2011-10-30 20:24:12 -07:00
Samuel Clay
3b38be1676 Seacucumber -> Django-ses. Celery isn't playing well. 2011-09-21 22:08:53 -07:00
Samuel Clay
8a258f91c7 Adding seacucumber as a dependency. 2011-09-21 22:01:02 -07:00
Samuel Clay
afae94cf7d Templating emails -- new account and new premium. 2011-09-19 08:56:16 -07:00
Samuel Clay
66eaaf6114 Stubbing in email templates using django-ses. 2011-09-09 17:42:35 -07:00
Samuel Clay
8f5a4c612d Updating rss_feeds tests for completeness. Updating README to include how to run test suite. 2011-09-01 09:11:29 -07:00
Samuel Clay
5389350368 Adding starred stories import to Google Reader import. Also moving to db backed session engine (from memcache). 2011-08-29 18:43:17 -07:00
Samuel Clay
8c60347532 Typo in mongodb host settings. 2011-08-27 16:25:17 -07:00
Samuel Clay
6a8981f1bf Using defaults for mongo settings to simplify settings. 2011-08-27 16:22:52 -07:00
Samuel Clay
bd0ba19c97 Adding slaveOK to mongo connection. 2011-08-26 23:40:56 -07:00
Samuel Clay
551eebe66a Final iphone tweaks -- favicon in titlebar. Also updating broker url. 2011-08-25 12:09:41 -07:00
Samuel Clay
ffe3653c37 Cleaning up reader import, subscriber expire down to 2, and adding favicon to title in iphone app feed detail. 2011-08-24 10:24:02 -07:00
Samuel Clay
de98a4e49b Adding account dialog. Also remvoing colorama as a third-party. 2011-07-27 09:33:34 -07:00
Samuel Clay
229bd75281 Went nuts and restyled a bunch of table cells. Also hooked up accounts. Need to clean up the login view, as well as finish the reading flow. 2011-07-20 21:08:57 -07:00
Samuel Clay
66cd29fee1 Cleaning up readme and commenting out the wacky devserver. 2011-07-17 21:50:37 -07:00
Samuel Clay
ff50d85d7d Updating a bunch of defaults to make NewsBlur installable on anybody's machine. Fleshing out README installation instructions. 2011-07-17 20:53:30 -07:00
Samuel Clay
ae7f79b3a0 Adding moderation queue to recommended feeds (finally!) 2011-07-11 18:22:28 -07:00
Samuel Clay
a95d78dacd Moving CSS mobile directory to a more logical place. 2011-06-09 22:27:11 -04:00
Samuel Clay
d0f0ac9507 Moving CSS mobile directory to a more logical place. 2011-06-09 22:25:37 -04:00
Samuel Clay
9c85c16761 Moving mobile compressed css asset to match folder structure. 2011-06-09 22:22:42 -04:00
Samuel Clay
76c0ffaa0f Changing order of mobile dependencies. 2011-06-09 22:15:34 -04:00
Samuel Clay
54aad37d87 Completed the UI for both the feed page and the stories page. Needs paging, detail view, and web view. Whew. 2011-06-09 22:08:59 -04:00
Samuel Clay
ab3e707a8a Adding stories page. 2011-06-07 12:57:14 -04:00
Samuel Clay
3d933723d9 Showing feeds, icons, and unread counts. Needs separated unread counts and an intelligence slider. 2011-06-07 10:17:56 -04:00
Samuel Clay
6d0c0c3cdc Adding in new mobile site. Doesn't sohwing anything but a stubbed in list view. 2011-06-05 17:52:11 -04:00
Samuel Clay
53d9724e0e Adding in tutorial module on dashboard, hooking up tutorial launcher button and tutorail launcher menu item to open the new tutorial dialog. 2011-05-10 18:30:35 -04:00
Samuel Clay
56e0292197 Using new django1.3 logging. Adding SQL middleware for use in development. Pretty SQL. 2011-05-08 19:25:58 -04:00