Commit graph

1331 commits

Author SHA1 Message Date
Samuel Clay
fa69eaa09d Linkifying Site header in Feed view. 2012-05-04 15:27:53 -07:00
Samuel Clay
1d580554a5 Adding logo to Original blurblogs. 2012-05-02 19:00:17 -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
71937f92d1 Adding shift+s and ctrl+enter to share and submit a story. 2012-04-27 17:44:00 -07:00
Samuel Clay
7f3ec48665 Cleanup. 2012-04-25 12:18:26 -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
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
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
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
3426924842 Adding highlighting to interactions. Still needs logic. 2012-04-20 23:55:10 -07:00
Samuel Clay
2205814f2a Adding public user activity to social profile. 2012-04-19 19:09:31 -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
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
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
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
Samuel Clay
21bd9a0c3d Being far kinder during feed exception handling and showing users error text. Cannot believe this wasn't there. 2012-04-06 16:21:16 -07:00
Samuel Clay
dca3198118 Showing loaders on any synchronous ajax calls in the front-end. 2012-04-06 13:00:50 -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
4ee3a6c8c4 Merge branch 'master' into social
* master:
  Showing real-time pubsub status on user dashboards. Opening up real-time for everybody.
  Adding real-time connection counts to logs.
2012-04-02 18:49:34 -07:00
Samuel Clay
61f2ced74b Showing real-time pubsub status on user dashboards. Opening up real-time for everybody. 2012-04-02 18:48:41 -07:00
Samuel Clay
5f34c24c2b Styling and finishing the social page original view's header. 2012-03-29 19:01:04 -07:00
Samuel Clay
1779f07ee8 Stubbing out manage menu for social feeds. 2012-03-29 14:20:55 -07:00
Samuel Clay
66932f6ab3 Styling. 2012-03-25 13:25:57 -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
2a1da3d886 Combining both social and personal intelligence filters on social feeds. 2012-03-22 15:27:28 -07:00
Samuel Clay
44d455c2aa Disabled buttons should be grey. 2012-03-22 14:40:36 -07:00
Samuel Clay
112cb9e754 Embedding new social assets. 2012-03-22 14:22:11 -07:00
Samuel Clay
bd784e85e4 Taskbar style fix. 2012-03-20 20:56:39 -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
fc233a7f70 Substituting in new window links for following twitter accounts when twitter is no authed. 2012-03-19 17:51:54 -07:00
Samuel Clay
d2cb186d56 Following and unfollowing from intro. 2012-03-19 16:35:56 -07:00
Samuel Clay
2200aa282a Subscribe to blog during intro. 2012-03-19 15:46:59 -07:00
Samuel Clay
8f0afbb7c2 All setup module items now disappear/appear or show a Done title appropriately. 2012-03-19 14:15:38 -07:00