* highlights: (27 commits)
Trim highlights for consistency and to fix a bug where paragraph ends look different.
The story margins now allow for highlighting.
Renaming highlights to is_highlights for starred story counts.
Fixing highlights RSS.
Fixing highlights counts.
New highlights saved story feed. Adding API docs, url handling, and counts. Counts need work, as does active selection of new highlights feed.
Filtering out highlights from other nodes, at least minimizing the one remaining highlight bug.
Got highlighting works end-to-end! This is nearly ready to launch, just need to re-select selected text.
Keep bookmarklet open on share/save.
Saving stories from websites. Now just need to go back and finish highlighting to unhighlight and this entire branch can be shipped.
Style adjustments.
Cleaning up save story dialog. Now just need to save the story.
Grammar
Adding saved story tags to bookmarklet. Just need to hook up the back end.
Unhighlighting comment
Creating unhighlight tooltip, just need to find the highlight and remove it.
Fixing text view highlighting.
Cleaning it up. Needs Text view.
Hiding tooltip when no longer needed.
Nothing like sitting on a feature branch for a year to fix the bug that stumped you last. Now highlights. Needs unhighlight and a bit of plish around hiding the popover.
...
* master:
Adding in model for upcoming highlights (so non-highlights branches dont crash on new data
No future dating mark read dates due to stories being future dated.
* master: (161 commits)
Refactoring welcome screen to fix input alignment issue.
Fixing login rotation.
Adding cookies to path inspector.
Upgrading httplib2.
Removing dupe db log.
Not every story is from a feed.
Styling background colors for newsletters.
Styling more newsletter elements.
Using the correct attribute.
Typo in template
Attempting to style newsletters in dark mode.
Loading dark theme if selected on load.
Adding scrollbar colors.
Using request body for ios subscription.
Specifying SESSION_SERIALIZER, which changes from PickleSerializer to JsonSerializer in django 1.5 to 1.6.
Fixing broken auto-dark theme.
Increasing contrast for unread counts.
Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
Cleaning up Twitter lists.
Updating next/previous buttons and search icon.
...
