public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-11-01 09:09:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
NewsBlur-viq/media/img/reader
History
Samuel Clay 23ad62c6d2 Merge branch 'master' into circular 
* master:
  Fixing credit card images. Doh\!
  Upping feed fetching.
  Removing random interval in feed fetches.
  No longer random intervals for dead feeds.
  Fixing mark as unread in redis hash migration.
  Fix group type caching in FolderList, and much refactoring for readability therein.
  Remove special All Stories group and make the now-visible root folder perform it's function.
  Formalize top-level folder name workaround.
  Nonfunctional refactoring in list adapter (unused vars, method visibilities, annotations).
  Fix an initialization edge case in creating column/resource ID mappings.
  Fix regression in API to get /reader/feeds and set update_counts to true.
  Factor out duplicate code in APIClient to ensure parameterized GETs behave like bare GETs.
  Refactor FolderListFragment and associated Adapter.
  Fix bad merge.
  Remove accidentally added swapfile.
  Removed missing root feed workaround. Refactoring FolderListFragment for readability.
  Clean up parsing of /reader/feeds response and work around problems with empty-named root folder.
  Fix NPE crash when adding new feed.

Conflicts:
	apps/rss_feeds/views.py
2013-04-19 09:52:34 -07:00
..
32-Arrow-Down.png New welcome page. Needs all sections, login, and more interactivity. But a great start to a redesign. 2012-09-12 12:12:58 -07:00
32-Arrow-Left.png New welcome page. Needs all sections, login, and more interactivity. But a great start to a redesign. 2012-09-12 12:12:58 -07:00
32-Arrow-Right.png New welcome page. Needs all sections, login, and more interactivity. But a great start to a redesign. 2012-09-12 12:12:58 -07:00
32-Arrow-Up.png New welcome page. Needs all sections, login, and more interactivity. But a great start to a redesign. 2012-09-12 12:12:58 -07:00
32-Power.png New welcome page. Needs all sections, login, and more interactivity. But a great start to a redesign. 2012-09-12 12:12:58 -07:00
account_friends.jpg Adding Facebook OAuth and friend list saving. 2011-12-20 11:49:49 -08:00
account_premium_1.jpg Adding trainer and account type to home page. 2010-10-17 17:25:10 -04:00
account_premium_2.jpg Adding trainer and account type to home page. 2010-10-17 17:25:10 -04:00
account_premium_3.jpg Adding trainer and account type to home page. 2010-10-17 17:25:10 -04:00
account_standard_1.jpg Adding trainer and account type to home page. 2010-10-17 17:25:10 -04:00
account_standard_2.jpg Adding trainer and account type to home page. 2010-10-17 17:25:10 -04:00
account_standard_3.jpg Adding trainer and account type to home page. 2010-10-17 17:25:10 -04:00
account_trainer.jpg Adding trainer and account type to home page. 2010-10-17 17:25:10 -04:00
android_icon.png Adding android app to email. Also finalizing cleanup. 2011-09-21 21:51:25 -07:00
android_icon_round.png Updating footer to include ios/android links. 2013-04-16 12:59:59 -07:00
appdotnet_service.png Adding App.net (ADN) support and oauth. Needs posting. 2013-03-02 12:48:38 -08:00
appdotnet_service_off.png Adding App.net (ADN) support and oauth. Needs posting. 2013-03-02 12:48:38 -08:00
apple_icon.png Updating footer to include ios/android links. 2013-04-16 12:59:59 -07:00
background-control-light.png Restyling blurblogs. 2012-06-28 20:35:42 -07:00
background-control.png Lightening up the intelligence control. 2012-03-01 10:15:26 -08:00
big_spinner.gif Infinite scrolling for interactions popover. 2013-01-30 12:09:58 -08:00
big_world.png Showing new empty unreads message for both unread and focus. 2013-03-26 13:49:44 -07:00
callout_arrow.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
callout_arrow_original.png Restoring original PNGs for those with Fireworks PNG information. 2011-02-22 22:06:48 -05:00
callout_arrow_side.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
callout_arrow_side_original.png Restoring original PNGs for those with Fireworks PNG information. 2011-02-22 22:06:48 -05:00
callout_background.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
callout_background_original.png Restoring original PNGs for those with Fireworks PNG information. 2011-02-22 22:06:48 -05:00
cc_amex.png Fixing credit card images. Doh\! 2013-04-19 09:51:30 -07:00
cc_discover.png Fixing credit card images. Doh\! 2013-04-19 09:51:30 -07:00
cc_mastercard.png Fixing credit card images. Doh\! 2013-04-19 09:51:30 -07:00
cc_visa.png Fixing credit card images. Doh\! 2013-04-19 09:51:30 -07:00
chosen-sprite.png Cosing #44: Adding chosen.js library to add search to dropdowns. Used in Add Dialog. 2012-01-24 18:37:22 -08:00
chrome.png Adding Google Chrome to Goodies. New Chrome logo, too! 2011-03-18 00:09:33 -04:00
close.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
code_icon.png Only show story mod change button when story mods are to be had. 2011-04-11 23:25:44 -04:00
default_profile_photo.png Default profile photo. 2012-02-24 14:36:30 -08:00
delicious.png Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion. 2012-05-06 16:26:54 -07:00
diigo.png Adding 'Send to' support for Evernote, Diigo, and Kippt. 2012-06-27 12:49:40 -07:00
download.png The @jashkenas treatment -- cleaning up the iphone app page. 2011-12-08 14:51:52 -08:00
download_computer.png New welcome page. Needs all sections, login, and more interactivity. But a great start to a redesign. 2012-09-12 12:12:58 -07:00
email_icon.png New icons for sharing facebook and twitter. Also adding eventual email and code icons. 2011-03-15 23:42:46 -04:00
evernote.png Adding 'Send to' support for Evernote, Diigo, and Kippt. 2012-06-27 12:49:40 -07:00
facebook.gif Twitter and Facebook link icons. 2011-02-04 00:24:24 -05:00
facebook_big.png Finishing onboarding redesign. 2013-02-25 17:30:53 -08:00
facebook_button.png Probably a bit too much in one commit: allowing categories to be specified in interactions and activities calls so the iPad won't get category types it doesn't know how to handle. Also added twitter/facebook buttons to comment share on blurblogs. 2012-08-14 00:26:42 -07:00
facebook_button@2x.png Probably a bit too much in one commit: allowing categories to be specified in interactions and activities calls so the iPad won't get category types it doesn't know how to handle. Also added twitter/facebook buttons to comment share on blurblogs. 2012-08-14 00:26:42 -07:00
facebook_button_on.png Probably a bit too much in one commit: allowing categories to be specified in interactions and activities calls so the iPad won't get category types it doesn't know how to handle. Also added twitter/facebook buttons to comment share on blurblogs. 2012-08-14 00:26:42 -07:00
facebook_button_on@2x.png Probably a bit too much in one commit: allowing categories to be specified in interactions and activities calls so the iPad won't get category types it doesn't know how to handle. Also added twitter/facebook buttons to comment share on blurblogs. 2012-08-14 00:26:42 -07:00
facebook_icon.png New icons for sharing facebook and twitter. Also adding eventual email and code icons. 2011-03-15 23:42:46 -04:00
facebook_icon_gray.png Adding gray icons for twitter/facebook crossposting shares. 2012-08-14 14:39:16 -07:00
facebook_service.png Adding App.net (ADN) support and oauth. Needs posting. 2013-03-02 12:48:38 -08:00
facebook_service_off.png Adding App.net (ADN) support and oauth. Needs posting. 2013-03-02 12:48:38 -08:00
favicon-512.png Adding Safari RSS helper app. 2011-02-25 14:04:03 -05:00
feed_manage_menu_icon.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
feed_view_feed_background.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
feeds_header_background.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
firefox-256.png Adding firefox icons. 2011-02-25 13:07:23 -05:00
firefox.png Adding firefox icons. 2011-02-25 13:07:23 -05:00
fleuron.png New end bar. Showing better loader in interactions. 2013-01-30 15:28:22 -08:00
getsatisfaction.png Updating footer to include ios/android links. 2013-04-16 12:59:59 -07:00
github.png Updating footer to include ios/android links. 2013-04-16 12:59:59 -07:00
github_icon.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
google-reader-logo.gif Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
google-reader-logo.png Finishing onboarding redesign. 2013-02-25 17:30:53 -08:00
googleplus.png Adding Google+ and Pinboard to sharing tools. 2011-11-07 18:25:18 -08:00
graph_arrow_up.png Adding graphs to stats on dashboard. Still need to collect stats. 2011-04-15 09:48:07 -04:00
hamburger_l.png Rewriting new user email. Animating hamburgers. 2012-07-25 00:20:36 -07:00
hamburger_m.png Rewriting new user email. Animating hamburgers. 2012-07-25 00:20:36 -07:00
hamburger_s.png Rewriting new user email. Animating hamburgers. 2012-07-25 00:20:36 -07:00
hamburgers.png Hamburgers are getting a workover so they load instantly. 2011-10-26 20:31:16 -07:00
howitworks_github.png Fixing github numbers, changing a bit of copy before launching new logos. 2011-03-11 19:28:16 -05:00
howitworks_import.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
howitworks_intelligence_dislike.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
howitworks_intelligence_like.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
howitworks_iphone.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
howitworks_original.png Restoring original PNGs for those with Fireworks PNG information. 2011-02-22 22:06:48 -05:00
instapaper.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
intelligence_slider_all.png Paging from 1 and not 0. Moving the JS assetmodel to use new paging and API endpoints. 2011-04-21 10:44:55 -04:00
intelligence_slider_negative.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
intelligence_slider_positive.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
iphone-stripe-bkg.png Pushing new build of iOS app with proper get-task-allow. 2012-10-29 16:54:35 -07:00
iphone_icon.png Templating emails -- new account and new premium. 2011-09-19 08:56:16 -07:00
iphone_skeleton.png Finishign up interaction of iphone app trailer page. Need auto switching. 2011-12-08 10:52:36 -08:00
keyboard_down.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
keyboard_enter.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
keyboard_leftright.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
keyboard_shiftspace.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
keyboard_space.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
keyboard_up.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
keyboard_updown.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
kippt.png Adding 'Send to' support for Evernote, Diigo, and Kippt. 2012-06-27 12:49:40 -07:00
layout_bottom.png Adding layout preference, with images. 2011-09-29 09:53:55 -07:00
layout_left.png Adding layout preference, with images. 2011-09-29 09:53:55 -07:00
layout_top.png Adding layout preference, with images. 2011-09-29 09:53:55 -07:00
logo-paypal.png Adding paypal logo. 2012-02-10 09:22:16 -08:00
module_tutorial.jpg Adding paging to tutorial. Also adding the tutorial dashboard image. Colorful. 2011-05-11 12:27:28 -04:00
mouse_indicator.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
mouse_indicator_original.png Restoring original PNGs for those with Fireworks PNG information. 2011-02-22 22:06:48 -05:00
new-window-icon.png Substituting in new window links for following twitter accounts when twitter is no authed. 2012-03-19 17:51:54 -07:00
newsblur_logo.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
newsblur_logo_old.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
newsblur_splash_logo.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
octocat.png Restyling the demo account dashboard. Thanks to @mgeraci for the inspiration. 2012-07-22 23:27:39 -07:00
ofbrooklyn_icon.png 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
penpattern_logo.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
penpattern_logo_original.png Restoring original PNGs for those with Fireworks PNG information. 2011-02-22 22:06:48 -05:00
pinboard.png Adding Google+ and Pinboard to sharing tools. 2011-11-07 18:25:18 -08:00
player-graphics.gif New audio control, with Flash fallback for browsers like Firefox/IE. 2012-03-05 12:57:47 -08:00
pocket_ril.png Read it Later -> Pocket 2012-04-17 10:58:32 -07:00
popular.jpg Rewriting new user email. Animating hamburgers. 2012-07-25 00:20:36 -07:00
popular_thumb.jpg Rewriting new user email. Animating hamburgers. 2012-07-25 00:20:36 -07:00
preferences_view_feed.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
preferences_view_original.png Restoring original PNGs for those with Fireworks PNG information. 2011-02-22 22:06:48 -05:00
preferences_view_story.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
protopub_logo.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
protopub_logo_original.png Restoring original PNGs for those with Fireworks PNG information. 2011-02-22 22:06:48 -05:00
protoread_logo.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
protoread_logo_original.png Restoring original PNGs for those with Fireworks PNG information. 2011-02-22 22:06:48 -05:00
readability.png Uncommenting Readability sharing. This was written a loooong time ago, but their API is finally ready. 2012-03-19 20:12:57 -07:00
readitlater.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
realtime_spinner.gif Fixing color on realtime spinner. 2013-04-18 16:20:00 -07:00
realtime_spinner_error.gif Showing real-time pubsub status on user dashboards. Opening up real-time for everybody. 2012-04-02 18:48:41 -07:00
realtime_spinner_loading.gif Fixing color on realtime spinner. 2013-04-18 16:20:00 -07:00
recycle_spinner.gif Adding exception handling UI. Also disabled feeds that are just chock full of exceptions. No need to continually fetch buggy feeds. Still need to figure out a way to let users fix problematic feeds, but letting them know is an improvement. 2010-08-18 20:35:45 -04:00
resize_north.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
resize_west.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
resize_west_small.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
safari.png Adding Safari RSS helper app. 2011-02-25 14:04:03 -05:00
sample_classifier_tag.png Fixing socialsubs loading bug. 2013-04-09 13:35:07 -07:00
sample_menu.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
search_icon.png New welcome page. Needs all sections, login, and more interactivity. But a great start to a redesign. 2012-09-12 12:12:58 -07:00
search_icon2.png New welcome page. Needs all sections, login, and more interactivity. But a great start to a redesign. 2012-09-12 12:12:58 -07:00
separator.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
separator_small.png Adding small separator and jquery 1.5. 2011-02-23 22:04:29 -05:00
shiloh.jpg Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
spacer.png Adding images to all footer links. 2012-07-24 22:18:02 -07:00
spacer_16.png Adding images to all footer links. 2012-07-24 22:18:02 -07:00
spinner_ball.gif Adding resources to upload progress indicator. 2010-04-13 16:33:43 -04:00
spinner_bar.gif Adding loading bar to paypal return. 2010-10-23 10:46:35 -04:00
star_blue.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
star_green.png Adding likes/favorites to comments. Still needs interaction history and perhaps an email. 2012-07-15 17:59:19 -07:00
star_grey.png Adding likes/favorites to comments. Still needs interaction history and perhaps an email. 2012-07-15 17:59:19 -07:00
static_bullet_purple.png Updating API and Publishers. 2011-04-13 09:42:07 -04:00
static_bullet_white.png Just the right bullet. 2011-04-18 09:25:30 -04:00
stripe_background.png Adding title and subtitle. (Big thanks to @ericflo for the inspiration.) 2011-12-08 16:17:30 -08:00
taskbar_background.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
text_list_bullets_single.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
thumbs_down.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
thumbs_up.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
tipsy.gif Adding the dashboard counts in the feed header. Also gives a new Back To Dashboard button. Refactored the progress bar, but it still shows the wrong heights in certain instances, doesn't animate, and breaks on google reader import. 2010-11-22 10:44:52 -05:00
toggle_minus.png Adding folder collapse for blurblogs. 2012-10-01 13:07:45 -07:00
toggle_plus.png Adding folder collapse for blurblogs. 2012-10-01 13:07:45 -07:00
tumblr.png Adding Tumblr to share menu. 2012-01-13 10:46:56 -08:00
tutorial_tips_folders.png Finishing up copy changes for step 2 - views. Laying out step 4 - tips. 2011-05-18 10:19:02 -04:00
tutorial_tips_instafetch.png Tips and tricks is fully tricked out. Now need to pare it down by a lot. 2011-05-17 11:05:38 -04:00
tutorial_tips_sites.png Tips and tricks is fully tricked out. Now need to pare it down by a lot. 2011-05-17 11:05:38 -04:00
tutorial_tips_stories.png Finishing all pages of the tutorial. The intelligence trainer could use some love, but this should go out sooner rather than later. 2011-05-20 00:18:23 -04:00
tutorial_tips_train.png Finishing up copy changes for step 2 - views. Laying out step 4 - tips. 2011-05-18 10:19:02 -04:00
tutorial_train_feed.png Cleaning up the third page of the tutorial by showing the two intelligence trainers. 2011-05-20 09:51:56 -04:00
tutorial_train_story.png Cleaning up the third page of the tutorial by showing the two intelligence trainers. 2011-05-20 09:51:56 -04:00
tutorial_view_feed.png Finishing page 2, adding page 5 which has links to twitter, get satisfaction, the blog (even loads the blog), and is a good last page. 2011-05-18 22:33:42 -04:00
tutorial_view_original.png Finishing page 2, adding page 5 which has links to twitter, get satisfaction, the blog (even loads the blog), and is a good last page. 2011-05-18 22:33:42 -04:00
tutorial_view_story.png Finishing page 2, adding page 5 which has links to twitter, get satisfaction, the blog (even loads the blog), and is a good last page. 2011-05-18 22:33:42 -04:00
twitter.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
twitter_big.png Finishing onboarding redesign. 2013-02-25 17:30:53 -08:00
twitter_bird.png Updating footer to include ios/android links. 2013-04-16 12:59:59 -07:00
twitter_button.png Probably a bit too much in one commit: allowing categories to be specified in interactions and activities calls so the iPad won't get category types it doesn't know how to handle. Also added twitter/facebook buttons to comment share on blurblogs. 2012-08-14 00:26:42 -07:00
twitter_button@2x.png Probably a bit too much in one commit: allowing categories to be specified in interactions and activities calls so the iPad won't get category types it doesn't know how to handle. Also added twitter/facebook buttons to comment share on blurblogs. 2012-08-14 00:26:42 -07:00
twitter_button_on.png Probably a bit too much in one commit: allowing categories to be specified in interactions and activities calls so the iPad won't get category types it doesn't know how to handle. Also added twitter/facebook buttons to comment share on blurblogs. 2012-08-14 00:26:42 -07:00
twitter_button_on@2x.png Probably a bit too much in one commit: allowing categories to be specified in interactions and activities calls so the iPad won't get category types it doesn't know how to handle. Also added twitter/facebook buttons to comment share on blurblogs. 2012-08-14 00:26:42 -07:00
twitter_icon.png Completing Twitter/FB OAuth end to end. Now need to surface and find friends. 2011-12-23 18:28:31 -08:00
twitter_icon_2.png Completing Twitter/FB OAuth end to end. Now need to surface and find friends. 2011-12-23 18:28:31 -08:00
twitter_icon_gray.png Adding gray icons for twitter/facebook crossposting shares. 2012-08-14 14:39:16 -07:00
twitter_service.png Adding App.net (ADN) support and oauth. Needs posting. 2013-03-02 12:48:38 -08:00
twitter_service_off.png Adding App.net (ADN) support and oauth. Needs posting. 2013-03-02 12:48:38 -08:00
user.png Compressing the shit of out all images using PNGCRUSH. 2011-02-22 21:53:11 -05:00
warning.png File under "fucking finally": Adding client-side error handling and callbacks for feeds and river. 2011-11-15 18:19:09 -08:00
white_fade.png Adding a white fade to text view for non-premium. 2013-01-09 15:16:25 -08:00