Commit graph

2909 commits

Author SHA1 Message Date
Samuel Clay
ac0ade9112 Converting every feed.attribute to feed.get('attribute') and feed.set('attribute', value). 2012-05-21 14:43:12 -07:00
Samuel Clay
55734e8b4a Renames to all backbone views so they use the _view.js suffix. 2012-05-21 14:36:24 -07:00
Samuel Clay
9e83d222ec Merge branch 'social' into backbone
* social:
  Web in fabfile only refers to app servers.
  Allowing multiple recipients in emailed stories.
2012-05-21 11:36:23 -07:00
Samuel Clay
2346f43d25 Merge branch 'master' into social
* master:
  Web in fabfile only refers to app servers.
  Allowing multiple recipients in emailed stories.
2012-05-21 11:36:18 -07:00
Samuel Clay
7cdee3b085 Allowing multiple recipients in emailed stories. 2012-05-21 11:29:57 -07:00
Samuel Clay
04d198d5ce Opening feeds now works. 2012-05-19 10:29:27 -07:00
Samuel Clay
9b18d8b58b Showing feed icons. Cleaning up actions on feed load, including refresh. 2012-05-18 18:13:45 -07:00
Samuel Clay
a380bfcd0c Rendering feeds and folders, including toplevel. Making feed count a separate view. Also making feed list header view, hooking up both buttons. 2012-05-18 16:59:39 -07:00
Samuel Clay
fe5c286de7 Moving towards folders as collections and an intermediary model that chooses between feeds or more folders. Still needs rendering. 2012-05-17 20:50:08 -07:00
Samuel Clay
bfe7ee1634 Initial stab at Backbone-ifying the front-end. Added feed, folder, story, and story_title views with feed, folder, story, and feed_list models. Converted AssetModel to a Router. 2012-05-17 18:40:46 -07:00
Samuel Clay
abe6ff2bf6 Feed header shadows now match the favicon color, but 10% darker. This makes the feed title floater look much better. 2012-05-17 14:42:34 -07:00
Samuel Clay
69bf581cd2 Merge branch 'master' into social
* master:
  Adding story permalink to story context-menu. Thanks to @grammargirl for the idea.
  Adding task servers and updating automated deploy.
  Removing dupe unique index in prep for social.
  Adding 3 new task servers.

Conflicts:
	apps/analyzer/models.py
	fabfile.py
	media/js/newsblur/reader/reader.js
	utils/feed_fetcher.py
2012-05-17 13:27:29 -07:00
Samuel Clay
1a0d1dd624 Adding story permalink to story context-menu. Thanks to @grammargirl for the idea. 2012-05-17 13:22:00 -07:00
Samuel Clay
765443bb9a Adding edit button to story share comments. 2012-05-15 17:56:15 -07:00
Samuel Clay
5414b4056a Adding recommend users to Friends dialog. 2012-05-15 16:35:09 -07:00
Samuel Clay
952fb0213a When clicking on a duplicate feed, scroll to the feed clicked on, not the first dupe found. 2012-05-14 17:41:21 -07:00
Samuel Clay
8c25769762 Adding Public bar when loading public comments. 2012-05-14 17:29:00 -07:00
Samuel Clay
61e70d80ec Fixing size of profile photos to reduce jumpiness when switching between profiles. 2012-05-14 16:50:38 -07:00
Samuel Clay
9d169f0b97 Fixing sharing and commenting for anonymous users. Also setting all stories to read if a user is not subscribed to it. Useful during a tryfeed view. 2012-05-14 16:43:27 -07:00
Samuel Clay
dcab6656ae Merge branch 'master' into social
* master:
  Adding tooltip on disabled original page. Thanks to @roycyang for the idea.
  Adding stackexchange to Original blacklist.
2012-05-14 15:27:03 -07:00
Samuel Clay
3eed5f8eaa Adding tooltip on disabled original page. Thanks to @roycyang for the idea. 2012-05-14 15:26:56 -07:00
Samuel Clay
3b6b503718 Adding stackexchange to Original blacklist. 2012-05-14 15:01:30 -07:00
Samuel Clay
7c6a94ee72 Inverting manage menu to place highly used items at bottom, closer to the mouse. Also fixing closing of manage menu when clicking on the button twice. 2012-05-11 10:06:05 -07:00
Samuel Clay
0af7bf2c99 Further refining and fixing links in interactions and activities modules. 2012-05-10 22:29:23 -07:00
Samuel Clay
142bfa724c Fixing broken interaction. 2012-05-10 22:11:06 -07:00
Samuel Clay
b2d34d5dd3 Merge branch 'social' of github.com:samuelclay/NewsBlur into social
* 'social' of github.com:samuelclay/NewsBlur:
  Fixing blurblog preview, using fetched blurblog title when not available, styling on Friends.
  Removing dependency on original story when replying.
2012-05-10 15:34:53 -07:00
Samuel Clay
ae3c9faf1e Updating dashboard social counts. 2012-05-10 15:34:32 -07:00
Samuel Clay
be479b46b6 Fixing blurblog preview, using fetched blurblog title when not available, styling on Friends. 2012-05-10 09:45:07 -07:00
Samuel Clay
bb3c4e9575 Fixing bug on interactions module linking to wrong blurblog. It should link to the original commenter's blurblogs, not the replier's. 2012-05-09 21:11:48 -07:00
Samuel Clay
a200a9db2d Fixing 'n' key to work with social feeds. Also scrolling feed list to follow selected site. 2012-05-09 17:06:02 -07:00
Samuel Clay
b9fdf5e885 Merge branch 'master' into social
* master:
  Immediately marking story as read when sending it to a service or opening in a new tab. Thanks to Jonas for the suggestion.
2012-05-09 16:14:11 -07:00
Samuel Clay
f6e0933f78 Immediately marking story as read when sending it to a service or opening in a new tab. Thanks to Jonas for the suggestion. 2012-05-09 16:14:05 -07:00
Samuel Clay
77795aa6b7 Adding re-share interaction history. 2012-05-09 14:48:10 -07:00
Samuel Clay
e44ccc355e Embiggening twitter profile photos in profile dialog. 2012-05-09 13:51:48 -07:00
Samuel Clay
783133fa02 Changing real-time text. Fixing weird css layout issue. 2012-05-09 12:26:34 -07:00
Samuel Clay
1d91cb1a6c Merge branch 'master' into social
* master:
  Handling story-level original/story view bans, preventing iframe busts on nytimes/twitter. Thanks to @j4ded for the persistance.

Conflicts:
	media/js/newsblur/reader/reader_utils.js
2012-05-09 12:11:58 -07:00
Samuel Clay
a823b1bdae Handling story-level original/story view bans, preventing iframe busts on nytimes/twitter. Thanks to @j4ded for the persistance. 2012-05-09 12:11:23 -07:00
Samuel Clay
35730d49e4 _.includes to _.string.contains. 2012-05-09 12:11:04 -07:00
Samuel Clay
48d6ce665f Merge branch 'master' into social
* master:
  Handling story-level original/story view bans, preventing iframe busts on nytimes/twitter. Thanks to @j4ded for the persistance.
2012-05-09 12:09:27 -07:00
Samuel Clay
0ed996dcf3 Handling story-level original/story view bans, preventing iframe busts on nytimes/twitter. Thanks to @j4ded for the persistance. 2012-05-09 12:09:23 -07:00
Samuel Clay
0856c423e4 Changing real-time labels on dashboard. 2012-05-09 11:45:52 -07:00
Samuel Clay
8814df61be Fixing long-standing social bug: when following users who have not shared stories yet, update their social feed for followers when they eventually do share a story. No page refresh necessary. 2012-05-08 18:34:48 -07:00
Samuel Clay
e4089db393 Refactoring parameters of update_read_count. Was going to use this as an opportunity to fix the bug around reading a story shared in multiple blurblogs, but it can't be done client-side. Moving to server-side solution. 2012-05-07 18:24:05 -07:00
Samuel Clay
58591e5022 Merge branch 'master' into social
* master:
  Being much more aggressive about certain sites trying to take over the iframe. Blocking nytimes.com, twitter.com, and stackoverflow.com from even allowing an Original view.

Conflicts:
	media/css/reader.css
2012-05-07 16:27:55 -07:00
Samuel Clay
1bb442a9d0 Being much more aggressive about certain sites trying to take over the iframe. Blocking nytimes.com, twitter.com, and stackoverflow.com from even allowing an Original view. 2012-05-07 16:26:31 -07:00
Samuel Clay
f683d9bd26 Fixing keyboard dialog. 2012-05-07 15:26:33 -07:00
Samuel Clay
b04884fc31 Fixing keyboard dialog. 2012-05-07 15:25:20 -07:00
Samuel Clay
c6dda3744d Merge branch 'master' into social
* master:
  New preference: delay to mark a story as read.
  Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion.

Conflicts:
	media/css/reader.css
	media/js/newsblur/reader/reader.js
	media/js/newsblur/reader/reader_keyboard.js
2012-05-07 15:23:56 -07:00
Samuel Clay
d17dc14a05 New preference: delay to mark a story as read. 2012-05-07 15:13:02 -07:00
Samuel Clay
8791291774 Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion. 2012-05-06 16:26:54 -07:00