Commit graph

2708 commits

Author SHA1 Message Date
Samuel Clay
8519d68c36 Including feeds that a user isn't subscribed to in social feeds. Also adding a new url for feed icons. 2012-01-26 18:59:40 -08:00
Samuel Clay
87f6c541b5 Showing unread stories. I don't think this works at all yet, but it should. 2012-01-26 09:54:48 -08:00
Samuel Clay
2b9ad97b51 Switching a ton of feed and user fetches to simple ID matches. ".user.pk -> .user_id" 2012-01-26 09:32:24 -08:00
Samuel Clay
fb659b3d6f Social stories feed view nearly finished. Loads, pages, shows stories and shares and comments and stars. Still needs intelligence, better date sorting, and unread counts. 2012-01-26 08:43:46 -08:00
Samuel Clay
f82380c183 Showing social stories feed in reader. Needs unread counts, original view, routing, starred status, among others. 2012-01-25 09:52:34 -08:00
Samuel Clay
f1e3382a1e Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Cosing #44: Adding chosen.js library to add search to dropdowns. Used in Add Dialog.
2012-01-24 21:46:19 -08:00
Samuel Clay
66867a812f Merge branch 'master' into social
* master:
  Cosing #44: Adding chosen.js library to add search to dropdowns. Used in Add Dialog.

Conflicts:
	assets.yml
2012-01-24 18:51:59 -08:00
Samuel Clay
67d18d2e31 Cosing #44: Adding chosen.js library to add search to dropdowns. Used in Add Dialog. 2012-01-24 18:37:22 -08:00
Samuel Clay
750c3050c7 Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Fixing the awful bug of jumping feed page loads.
2012-01-24 18:15:11 -08:00
Samuel Clay
20122b05d6 Fetching correct comments and shares on share feeds. 2012-01-24 18:14:52 -08:00
Samuel Clay
e4feac4f06 Merge branch 'master' of github.com:samuelclay/NewsBlur into social
* 'master' of github.com:samuelclay/NewsBlur:
  Fixing the awful bug of jumping feed page loads.

Conflicts:
	media/js/newsblur/reader/reader.js
2012-01-24 09:06:11 -08:00
Samuel Clay
94c34d646a Showing friends feedlist. Publishing story feed, but it needs social shares built in. 2012-01-24 09:02:23 -08:00
Samuel Clay
de795ea377 Fixing the awful bug of jumping feed page loads. 2012-01-23 21:56:42 -08:00
Samuel Clay
9fa63ab8a2 Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Renaming static.tar to static.tgz to reflect its gzippedness.
  Fixing ghost unread counts on folder when last story in a feed is read.
  Fixing link to scipy-superpack. (Thanks @boursier)
  Handling negative feature page bug. Also showing server errors on bad emails.
  Fixing missing username in dupe USF.
  Handling errors on river in client. Also fixing starred stories.
  Suppressing error on starring an already starred story.
  Re-enabling mobile site. /m/
  Fixing typo in aggressive feed fetching.
  No longer being aggressive about finding a feed's correct address if it returns a 400 or 500 error code, unless it is still the first run or an exception refresh.
  Adding SSL to nginx conf.
2012-01-23 20:15:07 -08:00
Samuel Clay
b9cf65c834 Merge branch 'master' into social
* master:
  Renaming static.tar to static.tgz to reflect its gzippedness.
  Fixing ghost unread counts on folder when last story in a feed is read.
  Fixing link to scipy-superpack. (Thanks @boursier)
  Handling negative feature page bug. Also showing server errors on bad emails.
  Fixing missing username in dupe USF.
  Handling errors on river in client. Also fixing starred stories.
  Suppressing error on starring an already starred story.
  Re-enabling mobile site. /m/
  Fixing typo in aggressive feed fetching.
  No longer being aggressive about finding a feed's correct address if it returns a 400 or 500 error code, unless it is still the first run or an exception refresh.
  Adding SSL to nginx conf.

Conflicts:
	apps/reader/views.py
	assets.yml
	media/js/newsblur/reader/reader.js
2012-01-23 17:53:59 -08:00
Samuel Clay
1ad335a929 Renaming static.tar to static.tgz to reflect its gzippedness. 2012-01-23 17:51:19 -08:00
Samuel Clay
24953df95d Fixing ghost unread counts on folder when last story in a feed is read. 2012-01-23 17:16:29 -08:00
Samuel Clay
19e091102c Fixing link to scipy-superpack. (Thanks @boursier) 2012-01-23 13:07:59 -08:00
Samuel Clay
b6826cc790 Handling negative feature page bug. Also showing server errors on bad emails. 2012-01-23 10:16:50 -08:00
Samuel Clay
2e88b3d676 Fixing missing username in dupe USF. 2012-01-23 09:43:57 -08:00
Samuel Clay
f53251164a Handling errors on river in client. Also fixing starred stories. 2012-01-23 09:42:05 -08:00
Samuel Clay
ab8b106057 Suppressing error on starring an already starred story. 2012-01-23 09:31:00 -08:00
Samuel Clay
1f92ba5d59 Re-enabling mobile site. /m/ 2012-01-23 09:25:37 -08:00
Samuel Clay
619f03f610 Fixing typo in aggressive feed fetching. 2012-01-23 09:12:38 -08:00
Samuel Clay
c37bcdad63 No longer being aggressive about finding a feed's correct address if it returns a 400 or 500 error code, unless it is still the first run or an exception refresh. 2012-01-23 09:08:55 -08:00
Samuel Clay
5eb1f88f63 Adding SSL to nginx conf. 2012-01-21 16:50:57 -08:00
Samuel Clay
bed2475a6c Showing blurblogs on the feed list. 2012-01-21 16:12:54 -08:00
Samuel Clay
a297f0957a Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Checking scroll of Feed view in order to preload more pages.
2012-01-21 00:59:32 -08:00
Samuel Clay
d1f5213d33 Adding social subscription relationship. Loading social feeds in with all feeds. Needs to be drawn in feed list. Also needs both original and feed view for social subs. 2012-01-20 09:38:41 -08:00
Samuel Clay
4864c0e081 Merge branch 'master' into social
* master:
  Checking scroll of Feed view in order to preload more pages.
2012-01-19 09:18:20 -08:00
Samuel Clay
cb6cc06c8b Checking scroll of Feed view in order to preload more pages. 2012-01-18 18:07:43 -08:00
Samuel Clay
5ca577e378 Adding index to router. 2012-01-18 17:39:00 -08:00
Samuel Clay
cb9896b4b7 Fixing lost view setting for river/starred. 2012-01-17 09:03:10 -08:00
Samuel Clay
5be8b3c50e Adding a router. Now opening a feed shows up in the browser's address bar. Huge change. Reloading the page also attempts to load the feed. Needs an ajaxy way to load the feed if it isn't in the user's set of feeds. Will be used for social browsing. 2012-01-16 17:55:13 -08:00
Samuel Clay
fab36df5af Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  This deserves its own commit. Errant print statment. DELETED.
2012-01-16 10:39:39 -08:00
Samuel Clay
dde66ad6de Merge branch 'master' of github.com:samuelclay/NewsBlur into social
* 'master' of github.com:samuelclay/NewsBlur:
  This deserves its own commit. Errant print statment. DELETED.
2012-01-16 10:39:34 -08:00
Samuel Clay
3fce5007dd Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Saving last used recipient email address as a cookie.
  Don't bother showing 'Download Image' enclosure links. Just embed them.
2012-01-16 10:39:19 -08:00
Samuel Clay
594ce3c469 Merge branch 'master' into social
* master:
  Saving last used recipient email address as a cookie.

Conflicts:
	assets.yml
2012-01-16 10:38:29 -08:00
Samuel Clay
e9084592cb Saving last used recipient email address as a cookie. 2012-01-16 09:47:54 -08:00
Samuel Clay
72ad8113b6 Small cleanup. 2012-01-16 09:36:19 -08:00
Samuel Clay
93fb5038a7 Dynamically updating comments under stories when adding comments or sharing. 2012-01-15 21:09:49 -08:00
Samuel Clay
0468fe12dc Finished styling comments. Showing all sharers now. 2012-01-15 20:51:48 -08:00
Samuel Clay
6cbe61f603 Merge branch 'master' into social
* master:
  Don't bother showing 'Download Image' enclosure links. Just embed them.
2012-01-15 19:17:41 -08:00
Samuel Clay
b2977b73c5 Don't bother showing 'Download Image' enclosure links. Just embed them. 2012-01-15 19:17:17 -08:00
Samuel Clay
d679b5ad4f Merge branch 'master' into social
* master:
  Fixing #42: a long-time bug of drag-and-drop not respecting order.
  Removing application media types from enclosures. Nobody needs that.
  Forcing Jammit asset path to be absolute, relative to configured directory.

Conflicts:
	media/js/newsblur/reader/reader.js
	utils/story_functions.py
2012-01-15 19:16:41 -08:00
Samuel Clay
f0b363d184 This deserves its own commit. Errant print statment. DELETED. 2012-01-14 20:55:29 -08:00
Samuel Clay
072008cbe4 Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Fixing #42: a long-time bug of drag-and-drop not respecting order.
  Removing application media types from enclosures. Nobody needs that.
  Minor changes to fabfile. Needs to only run the pre_deploy step once.
2012-01-14 20:51:06 -08:00
Samuel Clay
89002d9bc6 Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Forcing Jammit asset path to be absolute, relative to configured directory.
2012-01-14 18:55:07 -08:00
Samuel Clay
5e3ce30c0b Fixing #42: a long-time bug of drag-and-drop not respecting order. 2012-01-14 18:54:59 -08:00
Samuel Clay
6c1c5eab3d Removing application media types from enclosures. Nobody needs that. 2012-01-14 17:13:05 -08:00