Samuel Clay 8958033726 Merge branch 'master' into organizer ... * master: (115 commits) Adding webhooks url for paypal. Better payment reports. Adding changelog to enterprise deployment. Fixing share dialog on ipad. iOS app v4.6b1. Android app v4 beta 7. Coloring cursor when adding tag. Adding story tags to add tag popover. Adding a tag. Ship it! Fixing issue with off-by-1 numbers when changing tags. Also hiding tags with no stories. Custom headers for saved story tags. Better zgrep. Fixing issues with saving starred story tags on ios. Nearly ready. Don't recalculate virtual intel column; use it. Remove unnecessary loader resets in story list. Don't show inappropriate context menu items for saved stories. Lower sync priority and fewer unnecessary syncs. Start story list loader as soon as possible. Generalise out all story list view creation logic. Move saved item list to in-time adapter creation. Move folder item list to in-time adapter creation. ... Conflicts: clients/android/NewsBlur/AndroidManifest.xml clients/android/NewsBlur/src/com/newsblur/activity/ItemsList.java clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java clients/android/NewsBlur/src/com/newsblur/database/DatabaseConstants.java clients/android/NewsBlur/src/com/newsblur/database/FolderListAdapter.java clients/android/NewsBlur/src/com/newsblur/fragment/AllSharedStoriesItemListFragment.java clients/android/NewsBlur/src/com/newsblur/fragment/AllStoriesItemListFragment.java clients/android/NewsBlur/src/com/newsblur/fragment/FeedItemListFragment.java clients/android/NewsBlur/src/com/newsblur/fragment/FolderListFragment.java clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java clients/android/NewsBlur/src/com/newsblur/fragment/SocialFeedItemListFragment.java clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java clients/ios/Classes/NewsBlurAppDelegate.h clients/ios/Classes/StoriesCollection.m clients/ios/Classes/StoryDetailViewController.m clients/ios/NewsBlur.xcodeproj/project.pbxproj clients/ios/static/storyDetailView.css		2014-11-17 12:40:19 -08:00
..
fixtures	Fixing reader tests and fixing broken delete where multiple feeds would be deleted.	2013-11-22 11:07:14 -08:00
migrations	Initial oauth provider commit.	2014-01-15 14:29:35 -08:00
__init__.py	Initial	2009-06-16 03:08:55 +00:00
admin.py	Further Mongo work. Stories are now saved correctly, with tags + authors. Still need to do UserStories.	2010-08-21 20:42:38 -04:00
forms.py	Fixing case insensitivity for logging in with an email address.	2014-09-03 17:12:25 -07:00
http.py	All classifier facets and data is now saved, end to end. Now, to apply facets to incoming stories and assign scores.	2010-01-05 16:07:11 +00:00
managers.py	Fixing shared_date for @secretsquirrel. Was inappropriately being converted to plain text date only for stories the user shared themselves.	2012-08-14 12:28:52 -07:00
models.py	Extracting out failing call when verifying scheduled feeds.	2014-11-06 09:46:33 -08:00
tasks.py	Removing MUserStory entirely.	2013-05-10 16:11:30 -07:00
tests.py	Fixing reader tests and fixing broken delete where multiple feeds would be deleted.	2013-11-22 11:07:14 -08:00
urls.py	Fixing OPML backup email messages and sending timing. Also fixing deleting feeds by folder. Fixing reloading of sites in organizer.	2014-10-14 15:59:46 -07:00
views.py	Merge branch 'master' into organizer	2014-11-17 12:40:19 -08:00