Commit graph

3301 commits

Author SHA1 Message Date
Samuel Clay
9e4cea939c Changing interactions and activities on comment reply edits. 2012-05-01 18:15:58 -07:00
Samuel Clay
aeb7accab4 Editing of replies. 2012-05-01 18:00:54 -07:00
Samuel Clay
1736c35b2f Cleanup on social beta signup. Feedback from @jwegener. 2012-04-30 17:15:43 -07:00
Samuel Clay
89fb7a37d9 Fixing unread counts when marking stories unread in social subs. 2012-04-30 13:45:09 -07:00
Samuel Clay
64159c363c Fixing mark_as_unread for social feeds which the user does not subscribe. 2012-04-30 13:26:20 -07:00
Samuel Clay
b417dc44a0 Preventing infinite loops on native re-shares. 2012-04-30 13:22:59 -07:00
Samuel Clay
7770e131f2 Showing re-shares. Ship it. 2012-04-30 13:05:14 -07:00
Samuel Clay
25fce20e07 Fixing bug to allow URLs to be passed around, evne if the user doesn't follow the blurblog. 2012-04-30 12:20:04 -07:00
Samuel Clay
18ffdb3920 Backend for storing reshares (sources) on shared stories. Needs front-end to supply original blog user id, as well as show the source in the comment feed. 2012-04-30 11:52:19 -07:00
Samuel Clay
71937f92d1 Adding shift+s and ctrl+enter to share and submit a story. 2012-04-27 17:44:00 -07:00
Samuel Clay
7c3b0d6991 Publishing updates to subscribers of popular shared stories. 2012-04-27 14:37:06 -07:00
Samuel Clay
78225cfe29 Finishing popular stories account. Just needs a cronjob. 2012-04-25 20:00:52 -07:00
Samuel Clay
ffaa20be66 Merge branch 'master' into social
* master:
  Adding send raw email link to Email Dialog. Thanks to @tylast for the idea.

Conflicts:
	media/js/newsblur/reader/reader_send_email.js
2012-04-25 18:19:26 -07:00
Samuel Clay
48d6633368 Adding send raw email link to Email Dialog. Thanks to @tylast for the idea. 2012-04-25 17:15:11 -07:00
Samuel Clay
1e44430698 Merge branch 'master' into social
* master:
  Adding French review to press page.
2012-04-25 12:20:21 -07:00
Samuel Clay
121adb1cb2 Adding French review to press page. 2012-04-25 12:20:12 -07:00
Samuel Clay
7f3ec48665 Cleanup. 2012-04-25 12:18:26 -07:00
Samuel Clay
b5c5cdeda3 Merge branch 'master' into social
* master:
  Fixing icon fetching error when the page is corrupted.
  Writing a glorious hack that forces a count of unread scores.

Conflicts:
	apps/reader/models.py
	apps/rss_feeds/management/commands/refresh_feeds.py
	fabfile.py
	utils/feed_fetcher.py
2012-04-24 17:55:20 -07:00
Samuel Clay
c1b5aef983 Fixing icon fetching error when the page is corrupted. 2012-04-24 17:40:34 -07:00
Samuel Clay
d209aa5e25 Writing a glorious hack that forces a count of unread scores. 2012-04-24 17:02:55 -07:00
Samuel Clay
60eceda244 Merge branch 'master' into social
* master:
  Trying to fix inaccurate unread counts by forcing the dirty flag and not allowing timeouts.
  Removing unused cache.

Conflicts:
	apps/reader/models.py
	utils/feed_fetcher.py
2012-04-24 16:36:38 -07:00
Samuel Clay
2474c987c5 Trying to fix inaccurate unread counts by forcing the dirty flag and not allowing timeouts. 2012-04-24 16:34:28 -07:00
Samuel Clay
20eeef3dc9 Removing unused cache. 2012-04-24 16:00:14 -07:00
Samuel Clay
34083085cf Sorting social feeds according to preferences. 2012-04-24 13:18:08 -07:00
Samuel Clay
0af2704627 Counting social sub feed opens (used for sorting). 2012-04-24 12:54:37 -07:00
Samuel Clay
7f280920ee Adding tip to /reader/add_url in api. Closes #49. 2012-04-24 12:17:30 -07:00
Samuel Clay
80d638543c Invite request blast. 2012-04-24 12:07:58 -07:00
Samuel Clay
409bea653d Use Feed view as default for shared stories. Original view just isn't done yet. 2012-04-24 11:45:32 -07:00
Samuel Clay
dad923d26c Big change: the selected site now shows up in the feed list, even if there are no unread stories. Disappears when you select a different site. It's time for this to be the case. 2012-04-24 11:14:17 -07:00
Samuel Clay
139761a148 Adding share story menu option to story context menu. Took all day. 2012-04-24 10:38:23 -07:00
Samuel Clay
eb77b1e34d Merge branch 'master' into social
* master:
  Upping refresh interval a bit since every 6 seconds is a bit too much when importing new feeds.

Conflicts:
	media/js/newsblur/reader/reader.js
2012-04-23 17:03:17 -07:00
Samuel Clay
599a9ffc82 Upping refresh interval a bit since every 6 seconds is a bit too much when importing new feeds. 2012-04-23 17:02:50 -07:00
Samuel Clay
109decc5d0 Merge branch 'master' into social
* master:
  Starred story titles, even if it kills us.
  Chucking ntpd in favor of bluntly recalibrating time on VPSs.
  Adding Robin Good press.
2012-04-23 15:38:54 -07:00
Samuel Clay
668d913013 Starred story titles, even if it kills us. 2012-04-23 15:31:46 -07:00
Samuel Clay
dbe82883b4 Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Adding Robin Good press.
2012-04-23 13:19:00 -07:00
Samuel Clay
ae41ffc7aa Chucking ntpd in favor of bluntly recalibrating time on VPSs. 2012-04-23 13:18:50 -07:00
Samuel Clay
8ab5843a66 Adding error handling and messaging to both shared stories button and to comment replies. 2012-04-23 11:26:36 -07:00
Samuel Clay
34ed4d3efe Adding Robin Good press. 2012-04-23 10:32:05 -07:00
Samuel Clay
9448215439 Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Adding dashboard date to master to apply to both social and new accounts on master.
  Firefox manifest errors continue.
  Fixing broken Firefox manifest.
  Adding firefox manifest for Mozilla App Marketplace.
  Updating bookmarklet. Showing when the bookmarklet is broken, and fixes bugs with enumerable prototype chain fucking.
2012-04-23 10:26:38 -07:00
Samuel Clay
bfc43b7d48 Firefox App Marketplace banner + original. 2012-04-22 13:24:39 -07:00
Samuel Clay
ebef3437a6 Styling tags and stars. 2012-04-22 13:24:14 -07:00
Samuel Clay
a23bb0c17a Allowing clicks on an already selected site. Updating feed counts inline when sent from server. Fixing bug around refreshing feeds. 2012-04-21 23:00:51 -07:00
Samuel Clay
45b2b06c10 Adding share rainbow to story titles. Thanks Talha Mansoor (@talha131) 2012-04-21 21:50:27 -07:00
Samuel Clay
8be6f106ed Only one dashboard date migration needed. 2012-04-21 18:50:34 -07:00
Samuel Clay
2bb48300f7 Merge branch 'master' into social
* master:
  Adding dashboard date to master to apply to both social and new accounts on master.
2012-04-21 18:44:52 -07:00
Samuel Clay
690849df82 Adding dashboard date to master to apply to both social and new accounts on master. 2012-04-21 18:44:47 -07:00
Samuel Clay
ffcee68f4c Merge branch 'master' into social
* master:
  Firefox manifest errors continue.
  Fixing broken Firefox manifest.
  Adding firefox manifest for Mozilla App Marketplace.
2012-04-21 18:40:30 -07:00
Samuel Clay
299c416267 Firefox manifest errors continue. 2012-04-21 18:35:22 -07:00
Samuel Clay
5769efbca8 Fixing broken Firefox manifest. 2012-04-21 18:33:54 -07:00
Samuel Clay
1db5f67304 Adding firefox manifest for Mozilla App Marketplace. 2012-04-21 18:31:22 -07:00