* master: (78 commits)
Adding 401 status code for invalid token on user/info.
Adding new preference for 24 hour clock. Moving to client-side generated dates.
Adding IFTTT logging.
All dates in iso 8601 format.
Use strings for feed_id.
Fixing unread trigger for IFTTT.
Updating shared story ifttt entries.
Fixing ReadKit flat folders by leaving out removed feeds.
Adding handlers for all stories.
Fixing ifttt timestamp.
Adding share story action for IFTTT.
Adding site title, website, and address to each IFTTT trigger.
Adding share username to ifttt share trigger.
Upping access token expiration to 10 years.
Using TitleCase instead of snake_case.
Fixing exception dialogs to correctly update on fixed addresses and links.
New saved story as per IFTTT action.
Updating IFTTT urls.
IFTTT action for new subscriptions.
Adding folder list for dynamic action fields.
...
* 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
* master: (292 commits)
Fixing an infinite loop (!!) and focusing in on the comment textbox when sharing a story.
Fixing bug on empty river.
Use the selected feed view when viewing a story
Preventing multiple saved stories from being deleted. Also removing activities when removing saved stories.
Fixing accidental truncation on story when saved.
Fixing story detail height in Text view when saved with tags.
Fixing text tab view.
Updating readability.
Using https for twitter images. Adding a twitter photo sync to fix broken twitter photos. Thanks to @ggrappone for finding this one.
Counting dupe feeds only once in unread counts.
Fixing bookmarklet for NYTimes. Thanks to @rafeco for catching the bug.
Fixing bounce on resize.
disable debug
Mark-read idempotency for social feeds. (#460)
Idempotent mark-as-read DB ops. (#460)
Cleaning up unread counting. (#460)
Fixing height issues with new saved stories sideoptions box.
Limiting new user queue.
Limiting new user queue.
Max overlay fully fade slightly sooner when scrolling down. (#459)
...
Conflicts:
media/css/reader.css
media/js/newsblur/reader/reader.js
media/js/newsblur/views/story_titles_header_view.js
* master: (40 commits)
Version 3.6 of the iOS app.
Fixing tolerance on drag bar.
Fixing switch between story titles on left and on bottom.
Cleaning up after failed backup.
Fixing disappearing righttoolbarmenu icons. Adding preferences for urls to use in-app browser, safari, or chrome.
Fixing transition cancelation on interactive swipe on ipad.
Fixing rotation issues, as well as premature hiding of dashboard on animation on ipad.
Fixing interactive transitions.
Fixing many issues with transitions on the ipad. Still need to fix the interactive transition completion.
Fix#441 - changing text size needs to call evaluateJavascript instead of loadUrl when targeting SDK >= 19
Fixing swipe-back on ipad for transitioning b/w feed list and feed detail.
Fixing paddings on story titles.
Resizing user avatar.
Adding option for side swipe in story detail.
Android v3.0.1.
Fixing cutoff date when retrieving stories.
Mark older/newer stories as read.
Fixing issue with autocomplete.
Fixing infinite loop.
Trying out better autocomplete search with parts.
...
* master:
Fixing a couple small bugs.
Fixing subs for socialsubs.
Fixing unread hashes on single feeds.
Fixing redis issue with existing keys beyond a RESTORE.
Fixing socialsub issue.
Adding options popover (and read_filter) to all shared stories and global shared stories.
Only trimming active users.
Fixing issue with wrong subs.
Fixing trim user stories on malformed story hash.
Fixing missig unread ranked stories cache.
Major refactoring of social blurblog. Also adding a new trimmer, but keeping it turned off.
Fixing rstats.
* master:
Fixing massive river bug where stories would abruptly end while paging.
Adding black logo.
Implement part of #207 - add Send To option to context menu in story list view
removed unnecessary and redundant imports.
Putting Google Alerts/News back into rotation.
Port pull request #219 to new repository layout. Adds https on Android to fix#165.
