Commit graph

2339 commits

Author SHA1 Message Date
Samuel Clay
dbc1b6740f Insta-fetching a feed should show its manage menu. using the wrong call to make the new feed. 2010-10-27 23:07:16 -04:00
Samuel Clay
2523f499ca Enabling feed manage menu hover on feeds insta-fetched or exceptioned. 2010-10-27 22:52:49 -04:00
Samuel Clay
df403ceb7f Only queueing new feeds on activation. 2010-10-26 14:04:26 -04:00
Samuel Clay
40e4af7a8d Trying to add feed statistics back. Only calculating them when requested. 2010-10-25 20:44:52 -04:00
Samuel Clay
7b4060a384 Fixing errors around a user trying to open a feed that has been de-duped and lost. The server now finds the de-duped feed and sends it back. 2010-10-25 20:20:59 -04:00
Samuel Clay
b8df7ef045 Fixing feed chooser for top-level feeds. 2010-10-23 12:14:57 -04:00
Samuel Clay
143adc6d77 Working on sandbox until i know this is right. 2010-10-23 11:22:57 -04:00
Samuel Clay
6b0d2f457c Refactoring activation of premium accounts. Trying out production paypal. 2010-10-23 11:20:54 -04:00
Samuel Clay
c9e88798b3 Fixing small issues with starting and ending training. 2010-10-23 11:05:43 -04:00
Samuel Clay
169c9327d2 Error conditions for failing Paypal IPN. 2010-10-23 10:40:25 -04:00
Samuel Clay
d106dcabdc Fixing delete button in exception modal. 2010-10-23 10:29:35 -04:00
Samuel Clay
870af936ca Adding paypal ipn checks for premium status. Still needs a count fo the number of tries for failure status. 2010-10-22 10:22:19 -04:00
Samuel Clay
20195f4345 Merge branch 'master' into chooser
Conflicts:
	media/js/newsblur/reader_classifier.js
	media/js/newsblur/reader_manage_feed.js
	media/js/underscore.js
2010-10-22 09:56:06 -04:00
Samuel Clay
0127a923c3 Updating thumbs in trainer to use new renamed thumbs. 2010-10-22 00:25:02 -04:00
Samuel Clay
516f08d6be Final touches to the new classifiers. Title highlighting now controls the new-style title classifier in story view. 2010-10-22 00:16:34 -04:00
Samuel Clay
90b57f31ce Adding titles to trainer. Removing feed manager. It's functionality is now compeltely rolled into the intelligence trainer. Big YAY for deleting old code. 2010-10-21 23:32:07 -04:00
Samuel Clay
8062a67628 Finishing up look and feel of classifiers. Also added shift+j and shift+k to keyboard shortcuts modal. 2010-10-21 19:36:03 -04:00
Samuel Clay
7d5f160b93 Adding shift+j and shift+k to move between feeds. Thanks to Jim Moran for the suggestion. 2010-10-21 18:52:25 -04:00
Samuel Clay
0cf370cd21 Updating Underscore.js 2010-10-21 13:50:43 -04:00
Samuel Clay
02964a5775 Internet Explorer fix for Array.indexOf(). Now using _.contains() instead. 2010-10-21 13:48:08 -04:00
Samuel Clay
5bcd5eb730 Serializing and deserializing new classifiers. 2010-10-21 13:37:36 -04:00
Samuel Clay
08c31b3645 Finished up interaction for new dual-mode classifiers. Still need to serialize classifiers, then perhaps reprocess on the backend to handle both modes at once. 2010-10-19 22:41:30 -04:00
Samuel Clay
9d51e999ba First draft of brand new dual-mode classifiers. Both tumbs up and thumbs down in the same classifier. Hover behavior works, not much else, so far. 2010-10-19 20:57:25 -04:00
Samuel Clay
6c4f3e5871 Adding paypal return screen, which holds the user until paypal ipn kicks in and their feeds are converted. 2010-10-19 19:09:08 -04:00
Samuel Clay
b22075e5cb Trainer and Chooser now update homepage feed counts dynamically. 2010-10-18 19:21:02 -04:00
Samuel Clay
637a1aafc6 Fixed issues with feed classifier trainer, but still cna't go back to intro without messing up the order. 2010-10-18 18:14:47 -04:00
Samuel Clay
8c6cd75409 Fixing up the feed trainer to show counts on the home page. Still needs a tweaking though to handle phantom feeds. 2010-10-17 23:34:14 -04:00
Samuel Clay
554beb5293 Adding trainer and account type to home page. 2010-10-17 17:25:10 -04:00
Samuel Clay
0a963fb614 Boosting feed chooser to 64. 2010-10-16 22:42:59 -04:00
Samuel Clay
4f2b773da9 Significantly speeding up feed chooser loading. 2010-10-16 21:32:06 -04:00
Samuel Clay
e284598e0f Removing invalid feeds from feed chooser. 2010-10-16 20:07:47 -04:00
Samuel Clay
23fef7b8cd Removing invalid feeds from feed chooser. Also fixing paypal form. 2010-10-16 19:43:18 -04:00
Samuel Clay
00d42abb47 Adding Paypal IPN integration. 2010-10-16 18:52:52 -04:00
Samuel Clay
6d211f7e96 Only refresh feed if it is showing on the page. 2010-10-15 19:02:19 -04:00
Samuel Clay
5b162d0707 Fixing race condition for showing the feed chooser modal on OPML import. 2010-10-15 18:38:49 -04:00
Samuel Clay
8a64403370 Fixing up feed modal, showing at start for all users without selected feeds. 2010-10-15 09:21:46 -04:00
Samuel Clay
24e2550c82 Showing feed chooser modal on start for users who haven't chosen any feeds. Also fixed race conditions associated with showing/hiding the chooser progress bar. 2010-10-14 09:51:56 -04:00
Samuel Clay
2b60da403c Small changes. 2010-10-13 18:07:59 -04:00
Samuel Clay
9b5ec6eaa2 Merge branch 'master' into chooser
Conflicts:
	apps/reader/models.py
	apps/rss_feeds/models.py
	media/css/reader.css
	media/js/newsblur/reader.js
	utils/feed_fetcher.py
2010-10-13 09:08:42 -04:00
Samuel Clay
6e3a1c1d10 Adding ? key to open keyboard shortcuts modal. 2010-10-12 20:23:03 -04:00
Samuel Clay
fbb163fc75 Adding ? key to open keyboard shortcuts modal. 2010-10-12 20:22:18 -04:00
Samuel Clay
101730cef7 Keyboard shortcuts! With lots of pretty images. 2010-10-12 20:13:33 -04:00
Samuel Clay
cbb04ba6ef Adding a few keybaord shortcuts, and adding duplicate feed counts to munin. 2010-10-12 13:17:43 -04:00
Samuel Clay
3f5b805ea8 Fixing which feed is selected in the feed list during refreshing. 2010-10-11 12:07:32 -04:00
Samuel Clay
3809c65206 Fixing feed exceptions modal to actually allow feeds to update. Also adding stub for keyboard shortcuts and new preferences. 2010-10-10 23:36:09 -04:00
Samuel Clay
50ca857c3e Forcing feed refresh on many common activities. Maybe this should happen more transparently for classifiers? 2010-10-10 23:33:56 -04:00
Samuel Clay
5d9660f5d8 New feature: Insta-fetch stories. Refreshes a feed by fetching and parsing latest stories. Can be accessed from the right-click per-site-menu. 2010-10-10 20:14:31 -04:00
Samuel Clay
092b560abe Merge branch 'master' into chooser 2010-10-07 19:33:39 -04:00
Samuel Clay
c2e1e82464 Small changes that are trying to root out the un-updateable feed problem. 2010-10-07 19:07:43 -04:00
Samuel Clay
2413af6492 Fixing issues with updating feeds causing the context menu to no longer show up on right-click or hover. 2010-10-06 22:22:32 -04:00