* 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: (335 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)
...
* 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
