Commit graph

441 commits

Author SHA1 Message Date
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
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
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
5414b4056a Adding recommend users to Friends dialog. 2012-05-15 16:35:09 -07:00
Samuel Clay
0cdba2ccdf Experimental change: statistics on dashboard now show total for the day. 2012-05-11 09:17:58 -07:00
Samuel Clay
0af7bf2c99 Further refining and fixing links in interactions and activities modules. 2012-05-10 22:29:23 -07:00
Samuel Clay
ae3c9faf1e Updating dashboard social counts. 2012-05-10 15:34:32 -07:00
Samuel Clay
a200a9db2d Fixing 'n' key to work with social feeds. Also scrolling feed list to follow selected site. 2012-05-09 17:06:02 -07:00
Samuel Clay
77795aa6b7 Adding re-share interaction history. 2012-05-09 14:48:10 -07:00
Samuel Clay
783133fa02 Changing real-time text. Fixing weird css layout issue. 2012-05-09 12:26:34 -07:00
Samuel Clay
0856c423e4 Changing real-time labels on dashboard. 2012-05-09 11:45:52 -07:00
Samuel Clay
c6dda3744d Merge branch 'master' into social
* master:
  New preference: delay to mark a story as read.
  Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion.

Conflicts:
	media/css/reader.css
	media/js/newsblur/reader/reader.js
	media/js/newsblur/reader/reader_keyboard.js
2012-05-07 15:23:56 -07:00
Samuel Clay
d17dc14a05 New preference: delay to mark a story as read. 2012-05-07 15:13:02 -07:00
Samuel Clay
1d580554a5 Adding logo to Original blurblogs. 2012-05-02 19:00:17 -07:00
Samuel Clay
c19e068262 Merge branch 'master' of github.com:samuelclay/NewsBlur into social
* 'master' of github.com:samuelclay/NewsBlur:
  Truncating feed title in trainer dialog.
  Adding French review to press page.

Conflicts:
	media/js/newsblur/reader/reader_classifier.js
2012-05-02 12:08:08 -07:00
Samuel Clay
a9bdc7e3ad Adding French review to press page. 2012-05-02 09:22:38 -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
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
7f280920ee Adding tip to /reader/add_url in api. Closes #49. 2012-04-24 12:17:30 -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
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
34ed4d3efe Adding Robin Good press. 2012-04-23 10:32:05 -07:00
Samuel Clay
ebef3437a6 Styling tags and stars. 2012-04-22 13:24:14 -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
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
bef8fbd6ee Fixing broken cancel button on send email dialog. 2012-04-20 08:39:40 -07:00
Samuel Clay
2205814f2a Adding public user activity to social profile. 2012-04-19 19:09:31 -07:00
Samuel Clay
01e4827d80 Stubbing in broken recommended users. 2012-04-19 12:46:58 -07:00
Samuel Clay
dbcfaf4be5 Fixing template next/previous buttons. 2012-04-18 22:17:29 -07:00
Samuel Clay
1955dca844 Shortening activities/interactions to 4, to make room for coming user recomendations table. Also speeding up favicons. 2012-04-18 22:04:13 -07:00
Samuel Clay
f48e6d6999 Preventing dupe starred story activities. 2012-04-17 10:45:21 -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
3f0c9b3cfb Calculating stories shared for dashboard statistics graph. 2012-04-12 13:37:19 -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
4cf027d135 Typos 2012-04-11 17:21:33 -07:00
Samuel Clay
ce18a4eab7 Adding beta email. Sending out a slow trickle of invites... 2012-04-11 17:13:54 -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
3f7810287b Refactoring features module and adding interactions module + model. Stubbed in interactions module. 2012-04-09 17:20:47 -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