Merge branch 'master' into organizer

* master:
  Bumping subscriber expire to 7 days.
  iOS v4.6.0b3.
  Fixing issues with search bar retaining focus b/w view controllers.
  Fixing landscape photo size for iphone 4s.
  Attempting to fix memory allocation leaks in offline story and image downloaders.
  Allowing push urls to not have a User Agent.
  Fixing major memory leak when fetching offline images.
  Expanding autocomplete menu in ios.
  Fixing ios rotation bugs with feed gradient and ipad-narrow sizing.
  Fixing redis raw log.
  Fixing rotation page reseting on iOS. Needs a bit of love, but it looks like it works.
  Suppressing stupid WYPopoverContainer warnings.
  Change mark previous/next as read order on Android (#623)
  Support search-bypass feed adding for https URLs. (#622)
  Add premium status to feedback auto-debug.
  Fix crash on db refresh during folder list draw.
  Synchro db opening as early as possible.
  Synchro legacy DB wrapper.
This commit is contained in:
Samuel Clay 2014-12-03 10:50:50 -08:00
commit 50b642e69a

View file

@ -216,7 +216,7 @@ DAYS_OF_UNREAD_FREE = 14
# you can then up the DAYS_OF_UNREAD value with no impact.
DAYS_OF_STORY_HASHES = 30
SUBSCRIBER_EXPIRE = 2
SUBSCRIBER_EXPIRE = 7
AUTH_PROFILE_MODULE = 'newsblur.UserProfile'
TEST_DATABASE_COLLATION = 'utf8_general_ci'