Commit graph

2909 commits

Author SHA1 Message Date
Samuel Clay
aa9197feb5 Splitting profiles and stories. 2012-02-22 09:48:45 -08:00
Samuel Clay
e6d1cd832c Working social profile. Needs a refactor to get all user profiles in a centralized dictionary in all requests to allow for pulling of specific info in later dialogs. Also updated underscore and fixed related issues. 2012-02-22 09:11:35 -08:00
Samuel Clay
7b6f1ee4d7 Stubbing in social profile modal. 2012-02-21 10:06:12 -08:00
Samuel Clay
2c0e6d3741 Merge branch 'master' into social
* master:
  New preference: action to perform when opening a feed -- jump to either newest or oldest story automatically.

Conflicts:
	media/js/newsblur/reader/reader.js
2012-02-21 09:00:30 -08:00
Samuel Clay
94bac0365a New preference: action to perform when opening a feed -- jump to either newest or oldest story automatically. 2012-02-17 18:36:33 -08:00
Samuel Clay
1ead218353 Geometric story finder in Feed view, doubling every iteration to find moved stories. 2012-02-17 17:41:20 -08:00
Samuel Clay
31cf374964 Social feed statistics (story counting and classifier counting), as well as social feed urls in Feed Settings. 2012-02-16 18:36:52 -08:00
Samuel Clay
d703c64c47 Correct unread counts on social feeds. Needs auto-updating, refreshing, and smarter counting only when necessary. 2012-02-15 18:00:10 -08:00
Samuel Clay
af4a92a266 Saving and fetching social feed classifiers. 2012-02-14 10:34:10 -08:00
Samuel Clay
581c52ff9a Front-end of intelligence training for social feeds. Still needs backend changes to accomodate string feed ids. 2012-02-13 11:07:32 -08:00
Samuel Clay
41a9fff747 Switching into story iframe should trigger fetch of stories on social feeds. 2012-02-10 19:45:49 -08:00
Samuel Clay
e5856aa6ae Social sites now have URLs. 2012-02-10 19:33:31 -08:00
Samuel Clay
8151d3acde Fixing read stories bug in social feeds. 2012-02-10 13:53:33 -08:00
Samuel Clay
3c2447cfe1 The Backbone-ification of NewsBlur continues: moving social feeds to backbone.js. 2012-02-10 12:48:14 -08:00
Samuel Clay
f6b88bf499 Fixing small bugs: following/unfollowing self lead to wrong counts due to modifying row in multiple places with stale data. 2012-02-10 11:57:37 -08:00
Samuel Clay
8ef2bf31b1 Merge branch 'master' into social
* master:
  Re-styling the crap out of all taskbar buttons. Much more streamlined now.
  Tweaking the living crap out of the intelligence control's colors. Lightened.
  User feedback: hiding positive and negative unread counts in title if there are no unread stories outside of neutral.
  Correcting typo in dupe feed resolution.
  Local settings in fabfile.
  Fixing up a minor detail in the new intelligence control.
  Rewriting intelligence slider to be an intelligence control (segmented control). Should make a ton more intuitive sense.
  Trying to fix IE troubles by forcing single requests per read story.
  Fixing nginx conf to support ssl.
  Adding PID files to gitignore.
  Ignoring files.
  Adding certificates to ignore.
  Adding https to nginx.

Conflicts:
	media/css/reader.css
	media/js/newsblur/common/assetmodel.js
2012-02-10 09:24:48 -08:00
Samuel Clay
84a7f76334 User feedback: hiding positive and negative unread counts in title if there are no unread stories outside of neutral. 2012-02-09 10:49:49 -08:00
Samuel Clay
9165795f26 Rewriting intelligence slider to be an intelligence control (segmented control). Should make a ton more intuitive sense. 2012-02-08 18:11:08 -08:00
Samuel Clay
afda20c3f9 Trying to fix IE troubles by forcing single requests per read story. 2012-02-08 16:22:21 -08:00
Samuel Clay
28e3871b6c Stubbing in social feed count calculations. 2012-02-08 12:20:05 -08:00
Samuel Clay
50e80c7241 Handling duplicate feed saving much more gracefully by finding the correct dupe. 2012-02-03 13:02:26 -08:00
Samuel Clay
193201061e A whopper: marking stories as read in a social feed. 2012-02-03 11:41:01 -08:00
Samuel Clay
3904a5f763 Adding a story header and filling out more design on blurblogs. 2012-02-01 09:14:19 -08:00
Samuel Clay
14d7849878 Adding Original page for social shared feeds. 2012-01-31 10:15:11 -08:00
Samuel Clay
ba48bfb6f5 Including feeds that a user isn't subscribed to in starred stories. 2012-01-27 10:26:52 -08:00
Samuel Clay
ff4e715ed6 Correctly handling expansion of share comment side option in a short story. 2012-01-27 10:09:49 -08:00
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
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
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
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
de795ea377 Fixing the awful bug of jumping feed page loads. 2012-01-23 21:56:42 -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
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
b6826cc790 Handling negative feature page bug. Also showing server errors on bad emails. 2012-01-23 10:16:50 -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
bed2475a6c Showing blurblogs on the feed list. 2012-01-21 16:12:54 -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
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
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