NewsBlur/apps
Samuel Clay b4963945f8 Merge branch 'master' into oauth
* master:
  Updating tweepy to v2.2.
  Switching starring story unique index parameter.
  Android v3.6.1 has new font sizes.
  Fixing race condition on starring stories.
  Typo on exception.
  Typo on exception.
  Fixing the unstarring bugs.
  Discrete text sizes rather than linear, new XXL size. (#474, #392)
  Fixing log.
  Cutting trim log in half.
  Turning off chance for cleanup. Everybody gets a cleanup.
  No need for progress on trim.
  Handling users who only read feeds to which they are subscribed.
  Fixing inaccurate counts.
  Sending a max of 1,000 read stories at a time.
  Adding logging and correcting logic error in auto trim.
  Cleaning up user read stories.

Conflicts:
	apps/reader/views.py
2014-01-21 16:38:57 -08:00
..
analyzer Moving all pubsub to a dedicated redis box (called REDIS2). 2013-06-18 12:21:27 -07:00
api Marking shared stories as read even if they dont have an associated feed. 2013-07-05 17:25:58 -07:00
categories Fixing missing share dialog on original page on ipad. 2013-05-24 15:48:41 -07:00
feed_import Showing OPML errors and fixing unicode decode error by sanitizing OPML uploads. 2013-08-07 19:46:47 -07:00
mobile Moving to vendorized yaml. 2013-05-15 18:08:37 -07:00
oauth Removing dev references. 2013-05-21 06:05:17 -07:00
profile Turning off chance for cleanup. Everybody gets a cleanup. 2014-01-21 14:56:59 -08:00
push Fixing the default PuSH lease by setting it to 10 minutes (matching the reference hub). Huge thanks to @mihaip. 2014-01-02 15:03:19 -08:00
reader Merge branch 'master' into oauth 2014-01-21 16:38:57 -08:00
recommendations Fixing stats sub count on unsub feeds. 2013-06-14 10:54:11 -07:00
rss_feeds Cleaning up user read stories. 2014-01-21 13:34:53 -08:00
search Adding broken search for feeds. 2013-01-04 16:34:27 -08:00
social Preventing multiple saved stories from being deleted. Also removing activities when removing saved stories. 2014-01-15 11:53:38 -08:00
static Adding haproxy check. 2013-07-30 18:13:09 -07:00
statistics Major refactoring of social blurblog. Also adding a new trimmer, but keeping it turned off. 2013-11-22 11:06:20 -08:00
__init__.py Initial 2009-06-16 03:08:55 +00:00