Commit graph

3202 commits

Author SHA1 Message Date
Glendon Solsberry
7ac8f03cfb Gives a default title to the social RSS feed
If the blog_title value comes back as empty, this makes sure to
provide a default value of <user.username> Shared Stories Blog"
2012-06-20 17:12:46 -04: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
db8c918da2 Web in fabfile only refers to app servers. 2012-05-21 11:36:15 -07:00
Samuel Clay
7cdee3b085 Allowing multiple recipients in emailed stories. 2012-05-21 11:29:57 -07:00
Samuel Clay
613fcd91b4 Merge branch 'master' into social
* master:
  Adding app04, updating new app server bootstrap script.

Conflicts:
	fabfile.py
2012-05-21 09:44:17 -07:00
Samuel Clay
731d9a3b76 Adding app04, updating new app server bootstrap script. 2012-05-21 09:40:44 -07:00
Samuel Clay
ee2a75cc49 Merge branch 'master' into social
* master:
  Disabling gatekeeper (robots.txt) check in feedfinder. This may have negative consequences.
2012-05-19 10:45:02 -07:00
Samuel Clay
8feebca215 Disabling gatekeeper (robots.txt) check in feedfinder. This may have negative consequences. 2012-05-19 10:32:55 -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
d5565c430b Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Removing dupe unique index in prep for social.
2012-05-17 12:43:18 -07:00
Samuel Clay
96cf1e2dec Adding task servers and updating automated deploy. 2012-05-17 12:43:13 -07:00
Samuel Clay
541121eb83 Removing dupe unique index in prep for social. 2012-05-17 10:52:33 -07:00
Samuel Clay
5354f56d01 Adding 3 new task servers. 2012-05-16 12:27:57 -07:00
Samuel Clay
765443bb9a Adding edit button to story share comments. 2012-05-15 17:56:15 -07:00
Samuel Clay
3a1de9edb8 Fixing recommended friends list. 2012-05-15 17:00:42 -07:00
Samuel Clay
744d186965 Typo 2012-05-15 16:45:16 -07:00
Samuel Clay
874438e893 Handling case of no social friends to follow in recommend friends. 2012-05-15 16:43:53 -07:00
Samuel Clay
5414b4056a Adding recommend users to Friends dialog. 2012-05-15 16:35:09 -07:00
Samuel Clay
18ed1dbf50 Adding postgresql standby fabfiles. 2012-05-15 15:25:01 -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
8907dcb67c Merge branch 'master' into social
* master:
  Fixing OPML import for FastLadder users.
2012-05-14 15:45:29 -07:00
Samuel Clay
05c0d95b81 Fixing OPML import for FastLadder users. 2012-05-14 15:45:25 -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
6d55cc7dc0 Fixing FF bug: selection in story trainer wasn't showing up on title. 2012-05-14 14:14:59 -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
0cdba2ccdf Experimental change: statistics on dashboard now show total for the day. 2012-05-11 09:17:58 -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
aca88936e6 Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
2012-05-10 17:39:05 -07:00
Samuel Clay
1a31ac4b81 Merge branch 'master' into social
* master:
  Initial stab at spec for Android app. Feel free to comment on expected features.
2012-05-10 17:38:04 -07:00
Samuel Clay
c433dba535 Initial stab at spec for Android app. Feel free to comment on expected features. 2012-05-10 17:37:24 -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
96fcc65afe Removing dependency on original story when replying. 2012-05-10 08:30:34 -07:00
Samuel Clay
941dcf486d Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Immediately marking story as read when sending it to a service or opening in a new tab. Thanks to Jonas for the suggestion.
  Handling story-level original/story view bans, preventing iframe busts on nytimes/twitter. Thanks to @j4ded for the persistance.
2012-05-10 08:27:32 -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