* master:
Preventing brentozar.com from being subscribed to because their lawyer sent me a Cease and Desist nastygram.
Adding lisp syntax highlighting. Also upgrading syntax highlighter.
Per @IFTTT's request, changing ifttt key to meta.
Make full mark-read action lifecycle recount stories, not just first mark.
Improve chaining of updated cursor data from Reading activity down through to adapter and fragments.
* master: (65 commits)
Oh my god what a terrible typo. Broke new users.
Adding mark as read button to All Site Stories on web.
Disconnecting facebook when session expires.
Showing facebook posting error.
Change text from mark previous to mark older as read in story context menu (#592)
Fix pager margin drawable for dark theme (#590)
Fixing URL munging when the url includes a non key=value pair in the query string. Ex: https://cns.utoronto.ca/~cks/space/blog/?atom. Thanks to @firesock for finding this.
Adding screenshots for iphone 6 and 6+.
Allowing guids to change if the permalink doesn't.
Don't re-fetch already cached images.
Synchronise DB upgrades with other DB actions. (#591)
Explicity synchro DB writes. (#591)
Cleaner service shutdown. (#591)
Show story list loading indicator only if stories are being fetched, not just if they are queued. (read: don't spin if offline) (#590)
iOS v4.5.0 submitted to the App Store.
Fix loading of stories in focus view.
Disable debug.
Disable debug.
Missed file from new loading indicator in reading frag.
Sync service triggers fewer redraws for loading indicators.
...
* master: (28 commits)
Limiting new user queue.
Adding user agent. Still needs version name from Manifest. @dosiecki or @manderson23, either of you know how to get that version name (like 3.5.5) into the user agent?
Android v3.5.5. Bumping minimum SDK to v11 (3.0+).
Fixing broken BBC links which have oddball hashes.
Fixing links with target hashes.
Refactor story loading to persist during list/reading activities.
Make new async calls not race UI threads.
Essentially stripping photos of size.
Android v2.5.3.
Fixing colors and transparency on android story traversal buttons.
Fixing image scaling.
Fix story loading not to keep paging on error.
Android v3.5.2
Remove comment cruft.
Replace requery with cursorloader in Reading.
Handling different scroll views.
Fixing footnotes.
Bumping android version.
Fix crash async crash.
Clean up sync cruft. Add sanity break in pagination loop.
...
Conflicts:
assets.yml
media/js/newsblur/views/story_detail_view.js
media/js/newsblur/views/story_list_view.js
media/js/newsblur/views/story_title_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 Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug.
* master:
Fixing homepage copy.
Using redisstore for socketio.
Forcing reconnection for socket.io.
Upgrading node modules.
Reconnecting to socket.io when disconnected or failing reconnection.
Updating website copy to show /year instead of .
Upgrading socket.io, widening reconnection delay.
Conflicts:
media/js/newsblur/reader/reader.js
