Commit graph

177 commits

Author SHA1 Message Date
Samuel Clay
a3e974f329 Merge branch 'master' into recommended
Conflicts:
	media/css/reader.css
2011-03-11 19:53:45 -05:00
Samuel Clay
544a74cc60 Fixing github numbers, changing a bit of copy before launching new logos. 2011-03-11 19:28:16 -05:00
Samuel Clay
d961035513 Adding opml export links to Add Site dialog and Preferences dialog. 2011-03-11 11:22:28 -05:00
Samuel Clay
f5a6df9523 AAAAHHH NEW LOGO! IT'S LIVE! WOOHOO! Also tweaked the homepage to show both the blur and the logo. Separted the splash links into two separate lists. 2011-03-11 00:29:09 -05:00
Samuel Clay
c94822ef18 Visual feed reader. 2011-03-10 23:58:48 -05:00
Samuel Clay
35cd0e4574 Dear lord this is some crazy attention to detail. Only show the spinner on the New Features module if the request has taken longer than 50ms, otherwise it just looks instantaneous, not spinner needed. Whew. 2011-03-04 12:45:31 -05:00
Samuel Clay
24aa214346 Refactoring feed canonical representations. Split Feed from UserSubscription for use in the feed recommended module. Hooked up Statistics and Intelligence Trainer modals to the recommended feed. Still need Try/Add, and paging. 2011-03-04 12:27:31 -05:00
Samuel Clay
2e437fcee1 Adding a subscribed note in recommended feeds. 2011-03-02 12:05:58 -05:00
Samuel Clay
152cdcac56 Styling recommended feed. Still need to hook up try/add buttons, stats/train buttons, next/previous buttons. 2011-03-01 20:07:22 -05:00
Samuel Clay
918507be4b Fixing misc number errors in status page. 2011-03-01 10:26:28 -05:00
Samuel Clay
0c9065938a Truncating long titles in status page. 2011-03-01 10:22:54 -05:00
Samuel Clay
c172fd5f3e Adding new status page to show last feeds fetched and their stats. 2011-03-01 09:59:06 -05:00
Samuel Clay
8833dd793d Adding basic structure for recommended feeds. 2011-02-28 23:27:58 -05:00
Samuel Clay
299dbcf364 Changing default new_window to on. 2011-02-26 17:50:13 -05:00
Samuel Clay
373daacb9f Adding show/hide sidebar button. Also fixing resize window to correctly position the story views. 2011-02-22 19:11:29 -05:00
Samuel Clay
76e5a62c62 Adding Readability and adding preferences to show/hide any or all services. 2011-02-16 20:45:37 -05:00
Samuel Clay
969f7e0d4c Fixing the Return to Original button to be in the same place as the original Original button, and also to not accidentally think its on the wrong page on a # click. 2011-02-02 14:10:24 -05:00
Samuel Clay
35e59fa4b6 Turning River of News on for premium users only. 2011-02-01 00:52:09 -05:00
Samuel Clay
0ae3c18085 Staging gets river branch. 2011-01-30 23:57:42 -05:00
Samuel Clay
c5eace27c3 Using inverse colors for brightly-lit feed headers. (#C9C9C9 average color and brighter). Turning off River of News to prepare for launch on production. 2011-01-30 23:21:18 -05:00
Samuel Clay
6d1307856a Handling weird edge case of feed title floater not matching story when using arrow keys (or selecting a story manually). This only happened during the transition, but the feed title was guaranteed to be stale. 2011-01-26 19:36:28 -05:00
Samuel Clay
e3d2c1a20a Merge branch 'river_test_floater' into river 2011-01-24 23:50:48 -05:00
Samuel Clay
c35745736e Finally figured out how to make the feed title floater look good and match the iPhone's table group header. 2011-01-24 23:50:38 -05:00
Samuel Clay
ab9a6a2f21 Fixing bookmarklet just on the page. Now different between drag and use on another site. 2011-01-24 09:58:16 -05:00
Samuel Clay
7dbea5da91 Merge branch 'river' into river_test_floater 2011-01-23 13:44:04 -05:00
Samuel Clay
1c3ba0cdbe Fixing jQuery's noConflict. 2011-01-22 22:00:03 -05:00
Samuel Clay
58fa54c951 Fixing jQuery's noConflict. 2011-01-22 21:55:10 -05:00
Samuel Clay
24da103f03 Adding jQuery noconflict. Whoops. Sorry, everybody on the Internet. 2011-01-22 21:53:40 -05:00
Samuel Clay
a46329fcb6 Adding all error cases for the bookmarklet. Added styling to all elements. Ready to launch? 2011-01-22 21:42:58 -05:00
Samuel Clay
6e19d4d88b Using correct domain, not adding the same site twice, messaging, better styling. 2011-01-22 18:25:16 -05:00
Samuel Clay
5606a2cd8d Adding feeds through the bookmarklet now works over JSONP. 2011-01-22 11:22:14 -05:00
Samuel Clay
90bc120599 Adding folders to bookmarklet. 2011-01-21 22:00:36 -05:00
Samuel Clay
567840ffff Bookmarklet now shows a modal where you can select which folder to add the site. Includes JS and CSS, uncompressed, on host page. 2011-01-21 20:29:19 -05:00
Samuel Clay
dbf664ebb5 Bookmarklet now calls api.add_site using the secret token. 2011-01-20 19:14:54 -05:00
Samuel Clay
2ae1e1719a Initial stab at a ghetto feed title floater. 2011-01-19 08:54:59 -05:00
Samuel Clay
121e5a3529 Merge branch 'master' into river 2011-01-03 09:57:44 -05:00
Samuel Clay
9262c9d70b Showing/hiding trainer on wrong count. 2010-12-31 15:06:26 -05:00
Samuel Clay
126a6bfbb6 Showing intelligence trainer on approving feedchooser. 2010-12-31 15:03:34 -05:00
Samuel Clay
5bf869e1da Fixing up hover behavior on stories. Also hiding inactive feeds correctly. 2010-12-31 14:54:48 -05:00
Samuel Clay
2f570cf4ad Fixing drag-and-drop, correctly collapsing folders, scrolling on feedlist edge, and handling toplevel cases. 2010-12-25 23:04:43 -05:00
Samuel Clay
3aaae18228 Re-enabling river, and trying to ignore the mark_as_read date for now. Will bring it back in a map_reduce. 2010-12-16 16:17:03 -05:00
Samuel Clay
de22b2fc27 Hiding river of news on folders and on the everything header button so I can launch all the goodies that come with river of news but *are* ready to launch. 2010-12-15 17:38:11 -05:00
Samuel Clay
f6c841974f Initial stub of River of News (everything view). Breaks on collapsed folders with unreads. Also doesn't work at all. 2010-12-10 15:26:50 -05:00
Samuel Clay
d2c5f067eb Major story opening and view switching refactor. Now switches effortlessly between page<->feed<->story views, temporarily shifting to a working view on click or double-click. 2010-12-08 20:53:45 -05:00
Samuel Clay
e7b99d9f01 Switching to the story view on double-click, and correctly moving back and forth between views automatically. Also cleaned up copy in Add modal and Intelligence Classifier Intro modal. 2010-12-07 09:52:14 -05:00
Samuel Clay
d564c64400 New story view skeleton. Things are completely broken, but at least it's primed and ready to go for the new view. 2010-12-06 10:41:24 -05:00
Samuel Clay
1184223149 Tossing the hidereadfeeds button and just using the site count as the button. Beautiful! 2010-12-04 23:18:07 -05:00
Samuel Clay
3b2c36b23d Adding a hide read sites button to the dashbaord header. Used to be a preference. Still is. 2010-12-04 23:06:35 -05:00
Samuel Clay
1983990495 Disabling original view for starred stories view. Also cleaning up a bunch of text shadow styles for the story titles pane and story feed pane. 2010-12-04 21:53:39 -05:00
Samuel Clay
3d0b2857d5 Merge branch 'master' of github.com:samuelclay/NewsBlur into starring 2010-12-02 20:18:40 -05:00