* android: (22 commits)
Fixed incorrect user image in activities adapter.
Added headers for public and friend comments.
Modified story intelligence formula.
Fixed formatting issue with strings. Added flag to ensure text was sentence-capitalised for comments/replies.
Bumped version number.
Removed further debug logging. Modified count requirements for itemlist requests.
Removed debug logging.
Optimised layouts for readability. Removed minor rounding issues with comment-liked images.
Fixed issue whereby when reading in feedReading, older pages would deleted due to passed parameter
Fixed bug whereby the first story in a social feed wasn't marked as read internally.
Bumped version number.
Modified login process to redirect to logging in if using the registration form and login exists. Fixed login form layout.
Bumped text-size
Fixed bug whereby Shared Stories count would feature a zero-value in cases where pos or neutral counts were not
Fixed crash due to misplaced network call on main thread
Fixed crash on first load when new feeds have just been added.
Added 'Delete feed' to feed item list menu
Fixed feed refresh issues, FTUX UI issues.
Fixed various issues as per feedback
Fixed count issue where read counts updates were not unique for feed values
...
* master:
Attaching feed title gradient to scrollview, so you can pull it down and the gradient now follows the scrollview (like a proper folder title). Requires many shadow hacks to get right.
Fixing the small things on blurblogs. Just margins, colors, and removing times from dates.
Extracting unread counts into reusable uiview, so folders can soon have unread counts in ios app.
Fixing goto feed shortcut to work on collapsed blurblogs.
Fixing a few issues around the new style of handling rivers.
Finished collapsing/expanding folders in iOS app. Saved as a preference (although not synced with the server). Collapsed folders still need unread count.
Adding disclosure button for collapsed folders on iOS.
* 'android' of github.com:samuelclay/NewsBlur: (22 commits)
Fixed incorrect user image in activities adapter.
Added headers for public and friend comments.
Modified story intelligence formula.
Fixed formatting issue with strings. Added flag to ensure text was sentence-capitalised for comments/replies.
Bumped version number.
Removed further debug logging. Modified count requirements for itemlist requests.
Removed debug logging.
Optimised layouts for readability. Removed minor rounding issues with comment-liked images.
Fixed issue whereby when reading in feedReading, older pages would deleted due to passed parameter
Fixed bug whereby the first story in a social feed wasn't marked as read internally.
Bumped version number.
Modified login process to redirect to logging in if using the registration form and login exists. Fixed login form layout.
Bumped text-size
Fixed bug whereby Shared Stories count would feature a zero-value in cases where pos or neutral counts were not
Fixed crash due to misplaced network call on main thread
Fixed crash on first load when new feeds have just been added.
Added 'Delete feed' to feed item list menu
Fixed feed refresh issues, FTUX UI issues.
Fixed various issues as per feedback
Fixed count issue where read counts updates were not unique for feed values
...
* 'master' of github.com:samuelclay/NewsBlur: (174 commits)
Extracting unread counts into reusable uiview, so folders can soon have unread counts in ios app.
Fixing goto feed shortcut to work on collapsed blurblogs.
Fixing a few issues around the new style of handling rivers.
Finished collapsing/expanding folders in iOS app. Saved as a preference (although not synced with the server). Collapsed folders still need unread count.
Adding disclosure button for collapsed folders on iOS.
Updating iOS for iOS 6 and the new iPhone 5.
Fixing typos in iOS app.
Fixing a bunch of feed fetch errors.
Fixing these damn Link: text urls in story modifications.
Unloading the story iframe when changing feeds.
Fixing sent emails for new premiums.
Adding folder collapse for blurblogs.
Added borders for comments / replies. Modified indenting for share / comment images
Added favourite icon fix. Fixed share images not always displaying.
Forcing all munin graphs to start at 0.
Ordering and smoothing munin graphs.
Showing total fetches in task munin graph.
Deprecating FeedLoadtime and moving to MongoDB-backed aggregate data for feed load time graphs.
Cleaning analytics as a beat task. Fixing server status codes in munin, and removing app feed fetches from analytics.
Fixing paths munin.
...
* android: (129 commits)
Added borders for comments / replies. Modified indenting for share / comment images
Added favourite icon fix. Fixed share images not always displaying.
Visual fixes for feedback from 0.27
Re-instated callbacks for sharing to handle new image/user profile storage.
Enabled basic HTML parsing in comments
Fixed comment loading to ensure friends' comments were being identified correctly
Modified to handle requirements for requesting more stories (endless barring completion of feeds)
Fixed closed/open indicator for all shared stories row.
Fixed bug whereby not all stories would be marked as read when reading from a single feed. Wowser. What a dumb one.
Removed reliance on Gridlayout. Fixed cursor management issues.
Fixed flowlayout for tags and images in the share bar.
Removed feed title from single-feed reading view
Added deleltion of older stories when viewing a socialfeed's stories and when viewing All Stories.
Removed location, bio when not needed
Modified comment-view creation. Modified activities link colour.
Adding close functionality for share dialog.
Fixed graphical issue with favourited icons size.
Added simple animation to new share comment creation.
Modified button text when story has already been shared.
Added retroactive share editing, minor animation.
...
* master: (73 commits)
Updating iOS for iOS 6 and the new iPhone 5.
Fixing typos in iOS app.
Fixing a bunch of feed fetch errors.
Fixing these damn Link: text urls in story modifications.
Unloading the story iframe when changing feeds.
Fixing sent emails for new premiums.
Adding folder collapse for blurblogs.
Forcing all munin graphs to start at 0.
Ordering and smoothing munin graphs.
Showing total fetches in task munin graph.
Deprecating FeedLoadtime and moving to MongoDB-backed aggregate data for feed load time graphs.
Cleaning analytics as a beat task. Fixing server status codes in munin, and removing app feed fetches from analytics.
Fixing paths munin.
Normalizing paths and adding graphs for browser breakdowns, paths, and task feed status codes.
Permissions on munin.
Fixing typo in munin task config.
Changing munin names for better graphs.
New Munin views: task server breakdowns by feeds fetched, total time taken per server, and aggregate stats in the pipeline.
Fixing JS issues around stories with no feeds clobbering the river view.
Finishing off new feed selector. Now scrolls to matched feed, correctly loads top feed, handles errors, and handles esc.
...
Conflicts:
.gitignore
