public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into circular

Browse source 
* master:
  Fixing issue where user agent doesn't exist.
  Change crossover to narrow view from 700 to 720px.

Conflicts:
	media/js/newsblur/reader/reader.js
This commit is contained in:
Samuel Clay 2013-05-02 17:52:59 -07:00
commit 191738b621
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/social/views.py
View file

@ -1246,7 +1246,7 @@ def shared_stories_rss_feed(request, user_id, username):
logging.user(request, "~FBGenerating ~SB%s~SN's RSS feed: ~FM%s" % (
user.username,
request.META['HTTP_USER_AGENT'][:24]
request.META.get('HTTP_USER_AGENT', "")[:24]
))
return HttpResponse(rss.writeString('utf-8'), content_type='application/rss+xml')

2
media/js/newsblur/reader/reader.js
View file

@ -204,7 +204,7 @@
}
if ((north && north.width() < 600) ||
(center && center.width() < 700)) {
(center && center.width() < 720)) {
this.$s.$feed_view.addClass('NB-feed-story-view-narrow');
this.$s.$story_titles.addClass('NB-feed-story-view-narrow');
this.$s.$text_view.addClass('NB-feed-story-view-narrow');