NewsBlur/apps
Samuel Clay 1bc6941cd3 Merge branch 'master' into organizer
* master:
  Fixing scroll for search when loading feed detail.
  Fixing multi-word search queries on ios.
  Adding search bar to ios.
  Adding messaging for premium-only in saved story tags.
  Colorizing payment logging.
  Colorizing payment logging.
  Second typo. Stupid payment code can't be tested offline.
  Typo.
  Forcing re-sync of payment history on expiration.
  Cleaning up payment history logging.
  Fixing chooser dialog by forcing it to conform to modernized modal.

Conflicts:
	media/js/newsblur/reader/reader_feedchooser.js
2014-11-17 16:37:48 -08:00
..
analyzer Adding unread and focus API endpoints for IFTTT. Includes both feeds and folders. 2014-01-27 17:16:34 -08: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 Adding export user's opml functionality for staff. 2014-09-05 10:37:59 -07:00
mobile Moving to vendorized yaml. 2013-05-15 18:08:37 -07:00
oauth Per @IFTTT's request, changing ifttt key to meta. 2014-10-14 10:02:26 -07:00
profile Merge branch 'master' into organizer 2014-11-17 16:37:48 -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 organizer 2014-11-17 12:40:19 -08:00
recommendations Fixing stats sub count on unsub feeds. 2013-06-14 10:54:11 -07:00
rss_feeds Fixing issue when resizing window causing story progress bar to resurface. 2014-11-06 09:46:33 -08:00
search Don't barf if no search server available. 2014-05-15 12:24:28 -07:00
social https domain for profile photos. 2014-10-15 15:10:20 -07:00
static Adding haproxy check. 2013-07-30 18:13:09 -07:00
statistics Fixing URL from getsatisfaction. 2014-04-03 15:59:11 -07:00
__init__.py Initial 2009-06-16 03:08:55 +00:00