Commit graph

1526 commits

Author SHA1 Message Date
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
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
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
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
Samuel Clay
74bb4780ea Adding dashboard date and auto-highlighting new interactions, to be cleared on dashboard view. 2012-04-21 18:20:49 -07:00
Samuel Clay
1f18f0e8dc Merge branch 'master' into social
* master:
  Updating bookmarklet. Showing when the bookmarklet is broken, and fixes bugs with enumerable prototype chain fucking.
2012-04-21 17:31:01 -07:00
Samuel Clay
4ef7bf9827 Updating bookmarklet. Showing when the bookmarklet is broken, and fixes bugs with enumerable prototype chain fucking. 2012-04-21 17:15:45 -07:00
Samuel Clay
cb1f2a75d3 Adding resize to profile modal during follow/unfollow. 2012-04-21 16:42:59 -07:00
Samuel Clay
df8a67434f Updating followers in profile when following/unfollowing. 2012-04-21 16:14:53 -07:00
Samuel Clay
3426924842 Adding highlighting to interactions. Still needs logic. 2012-04-20 23:55:10 -07:00
Samuel Clay
cd30f02fdc New asset for iPad bookmarks. 2012-04-20 08:45:42 -07:00
Samuel Clay
deff56dc76 Fixing username changes. 2012-04-20 08:45:29 -07:00
Samuel Clay
bef8fbd6ee Fixing broken cancel button on send email dialog. 2012-04-20 08:39:40 -07:00
Samuel Clay
0b71211090 Fixing broken River. 2012-04-20 08:15:16 -07:00
Samuel Clay
28d6226e72 Fixing recommended feeds. 2012-04-19 22:43:07 -07:00
Samuel Clay
d96ed5db54 Big change to tryfeed. Handling sites that the user isn't subscribed to now downloads them successfully. Useful for sharing stories on feeds you do not subscribe to. 2012-04-19 22:38:00 -07:00
Samuel Clay
2205814f2a Adding public user activity to social profile. 2012-04-19 19:09:31 -07:00
Samuel Clay
2aea457455 Marking socialsubs with same shared stories as dirty to recount. Also scrolling down to comments from activities. 2012-04-19 15:01:01 -07:00
Samuel Clay
4d2e8fa9bc Adding View Profile menu item to social subs. 2012-04-17 15:37:01 -07:00
Samuel Clay
a98e8fadde Forcing heights for friends and profiles. Resizing as necessary. 2012-04-17 15:20:21 -07:00
Samuel Clay
31d18752f2 Merge branch 'master' into social
* master:
  Changing the color of sql duration times in debug logging. Yeah, nobody but me will see this, but boy is it pretty. Ask me sometime and I'd love to show you my insanely colorful logs.
  Correctly handling story that lack titles but have content. Using a parsed and shucked truncation of content in place of missing titles.
  Sanity check on deleted feeds.
  Read it Later -> Pocket
  Read it Later -> Pocket

Conflicts:
	media/js/newsblur/reader/reader.js
2012-04-17 12:12:41 -07:00
Samuel Clay
4baa6b68db Sanity check on deleted feeds. 2012-04-17 11:18:34 -07:00
Samuel Clay
ab6e57b227 Read it Later -> Pocket 2012-04-17 11:01:52 -07:00
Samuel Clay
ca5b7cffd8 Read it Later -> Pocket 2012-04-17 10:58:32 -07:00
Samuel Clay
aa42f098cf Adding a ton of activities. Fixing numerous bug saround interactions. 2012-04-16 11:21:52 -07:00
Samuel Clay
3f991ca2a0 Automatically showing interactions/activities modules when new info is made, even if they are empty to begin with. 2012-04-12 17:41:33 -07:00
Samuel Clay
1f0ff36ba6 Auto-refreshing activities and interactions. 2012-04-12 15:19:26 -07:00
Samuel Clay
8ffec294ef Showing newlines in comments, converting them into paragraphs. 2012-04-12 11:54:39 -07:00
Samuel Clay
38b64999be Moving activities and features module. Fixing bug around interactions when following self. 2012-04-12 11:43:36 -07:00
Samuel Clay
4612bedb49 Adding paging to interactions and activities on dashboard. 2012-04-12 11:18:56 -07:00
Samuel Clay
ed88b94712 Hiding site settings button on river view. 2012-04-11 18:29:38 -07:00
Samuel Clay
d27da6cfb0 Fixing broken email dialog. 2012-04-11 18:09:35 -07:00
Samuel Clay
15e08e653a Hooking up starred stories and new subscription activities. 2012-04-11 15:53:53 -07:00
Samuel Clay
1c245f1e0a Clicking on a comment/reply in interactions takes you to it. Also upgrading backbone.js. 2012-04-11 15:21:03 -07:00
Samuel Clay
451485d32e Splitting interactions into public/private interactions and activities. 2012-04-11 12:14:18 -07:00
Samuel Clay
b9d8b91f6d Showing interactions in module. Adding interactivity. 2012-04-10 18:24:57 -07:00
Samuel Clay
ef6c92bf92 Merge branch 'master' into social
* master:
  Showing feed pushes in statistics.
  Instrumentation to count feed pushes.
  Migration to fix starred stories with incorrectly double-encoded url strings.
  Fixing bug around missing feed links being checked for length.

Conflicts:
	apps/rss_feeds/views.py
2012-04-09 15:19:25 -07:00
Samuel Clay
4b10003ac5 Showing feed pushes in statistics. 2012-04-09 15:09:29 -07:00
Samuel Clay
ee76081cda Instrumentation to count feed pushes. 2012-04-09 14:58:53 -07:00
Samuel Clay
3c31c0c6a6 Merge branch 'master' into social
* master:
  Adding MongoDB logging for debug.
  Being far kinder during feed exception handling and showing users error text. Cannot believe this wasn't there.

Conflicts:
	media/css/reader.css
	templates/base.html
	utils/json_functions.py
2012-04-06 18:35:40 -07:00