Commit graph

281 commits

Author SHA1 Message Date
Samuel Clay
6c30e071d1 Handling of intelligence resorting and temporary showing of hidden stories. 2012-06-12 16:13:34 -07:00
Samuel Clay
213262be8d Completing migration of shares and comments. 2012-06-06 20:37:20 -07:00
Samuel Clay
fcefb6f111 Fixing story comments and replies. Required comment models and reply models (and their respective collections). 2012-06-05 16:18:30 -07:00
Samuel Clay
977109f9aa Loading social feeds is now backbonified. 2012-05-29 11:48:40 -07:00
Samuel Clay
27608f9d6b Fixing classifier training issue. 2012-05-26 22:14:34 -07:00
Samuel Clay
15943bb2b9 Updating read counts and story intelligence status on training. 2012-05-25 22:13:50 -07:00
Samuel Clay
06db627217 Sweep through moving all story.attribute to story.get('attribute'). Also adding current_model to story and feed collections. 2012-05-25 18:54:04 -07:00
Samuel Clay
f1f56df8f2 Paging in stories by scrolling titles. 2012-05-25 16:42:41 -07:00
Samuel Clay
0019410c8e Backboneifying story titles and stories in the Feed view. Feed view needs completion, then both need to get fully hooked up. 2012-05-24 17:32:01 -07:00
Samuel Clay
d10b1d48c8 Trimming logging. 2012-05-24 13:31:23 -07:00
Samuel Clay
b4a6791d77 Deselecting sites properly. Also adding context option to folders to add a site directly to that folder. 2012-05-24 11:54:10 -07:00
Samuel Clay
19eaa0e7c7 Move folder now backboneified. 2012-05-23 20:10:28 -07:00
Samuel Clay
532f258927 Rename feed. 2012-05-23 12:27:59 -07:00
Samuel Clay
3f817f2937 Deleting feeds. 2012-05-23 12:10:35 -07:00
Samuel Clay
220a00c682 Fixing scroll to feed action. 2012-05-23 10:02:30 -07:00
Samuel Clay
fc817e7048 Cleaning up unfetched feeds and finishing rewrite of refreshing feeds. 2012-05-22 17:39:21 -07:00
Samuel Clay
d80b21e6ef Showing changes to feeds correctly. 2012-05-22 13:25:21 -07:00
Samuel Clay
162f979a0a Running through the code searching for every instance of a feed grabbing its attributes in the old-style. 2012-05-21 20:08:27 -07:00
Samuel Clay
ac0ade9112 Converting every feed.attribute to feed.get('attribute') and feed.set('attribute', value). 2012-05-21 14:43:12 -07:00
Samuel Clay
04d198d5ce Opening feeds now works. 2012-05-19 10:29:27 -07:00
Samuel Clay
9b18d8b58b Showing feed icons. Cleaning up actions on feed load, including refresh. 2012-05-18 18:13:45 -07:00
Samuel Clay
a380bfcd0c Rendering feeds and folders, including toplevel. Making feed count a separate view. Also making feed list header view, hooking up both buttons. 2012-05-18 16:59:39 -07:00
Samuel Clay
fe5c286de7 Moving towards folders as collections and an intermediary model that chooses between feeds or more folders. Still needs rendering. 2012-05-17 20:50:08 -07:00
Samuel Clay
bfe7ee1634 Initial stab at Backbone-ifying the front-end. Added feed, folder, story, and story_title views with feed, folder, story, and feed_list models. Converted AssetModel to a Router. 2012-05-17 18:40:46 -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
8c612aa0e7 Fixing opening tryfeeds when they have been opened before. 2012-05-04 15:49:39 -07:00
Samuel Clay
aeb7accab4 Editing of replies. 2012-05-01 18:00:54 -07:00
Samuel Clay
7770e131f2 Showing re-shares. Ship it. 2012-04-30 13:05:14 -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
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
deff56dc76 Fixing username changes. 2012-04-20 08:45:29 -07:00
Samuel Clay
0b71211090 Fixing broken River. 2012-04-20 08:15:16 -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
aa42f098cf Adding a ton of activities. Fixing numerous bug saround interactions. 2012-04-16 11:21:52 -07:00
Samuel Clay
4612bedb49 Adding paging to interactions and activities on dashboard. 2012-04-12 11:18:56 -07:00
Samuel Clay
b9d8b91f6d Showing interactions in module. Adding interactivity. 2012-04-10 18:24:57 -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
Samuel Clay
3e4bdf9a66 Fixing major bug around missing user profiles on replies. Also adding 'nothing' option to profile photo. 2012-04-04 20:54:54 -07:00
Samuel Clay
f185da78c5 Refactoring the living crap out of the friends dialog. Pulling out all profile editing into new dialog. Adding stub for blurblog settings (yay!). 2012-04-04 16:09:01 -07:00
Samuel Clay
2fc7923a67 Replacing social feeds in feed list when there is a new story. Works only on polling, needs real-time socket hookup. 2012-04-03 17:48:24 -07:00
Samuel Clay
c4731c8211 Merge branch 'master' into social
* master:
  Wordpress PuSH errors aren't really errors, so don't log them.
  Dealing with broken Wordpress PuSH plugin by subscribing to its requested topic url.
  Dealing with broken Wordpress PuSH plugin by subscribing to its requested topic url.
  Fixing Tumblr PuSH by sending the address instead of the link when subscribing.
  Subscribing to a topic or hub sets the urls.
  Launching real-time for premiums. Also fixing a few dupe feed refresh bugs.

Conflicts:
	apps/reader/views.py
	media/js/newsblur/common/assetmodel.js
2012-03-30 17:15:31 -07:00
Samuel Clay
a728317682 Comment replies! Practically threaded comments. Reply as many times as you like. 2012-03-22 19:37:19 -07:00
Samuel Clay
67ea2452a7 Uniqifying profiles. Small cleanup. 2012-03-20 16:46:38 -07:00
Samuel Clay
637f4201b8 Replacing tutorial_finished boolean bakc in db so I can run development and production against the same db. 2012-03-20 11:15:40 -07:00
Samuel Clay
2200aa282a Subscribe to blog during intro. 2012-03-19 15:46:59 -07:00
Samuel Clay
0d9a8be334 Refactoring OAuth out of social app. Following twitter user (faked for now) from intro dialog. 2012-03-19 11:15:26 -07:00
Samuel Clay
d13e606ee1 Completing tryfeed for social subscriptions. Can now follow social feeds you don't already follow from the feed itself. 2012-03-15 14:00:44 -07:00
Samuel Clay
b4acea734b Showing follow button, restyling taskbar buttons, fixing issues around previewing. 2012-03-15 11:33:00 -07:00
Samuel Clay
e7f32ad3c3 Fixing tryfeed for social subs. 2012-03-14 17:48:28 -07:00
Samuel Clay
efad53bec6 Adding Preview Social Sub, but it still needs to have the difference between user model and socialsub model fleshed out. 2012-03-14 12:38:59 -07:00