Commit graph

43 commits

Author SHA1 Message Date
Samuel Clay
73721f2fb7 Formatting article. 2012-08-11 14:54:44 -07:00
Samuel Clay
c9645cdd95 New API endpoint: /social/remove_comment_reply. Does what it says. Also integrated into the web. 2012-07-28 22:36:50 -07:00
Samuel Clay
e453ec5c17 Changing colors all over the place. Adding esc keyboard shortcut to return to dashboard. 2012-07-28 20:12:12 -07:00
Samuel Clay
049cc78433 Adding login view to blurblogs. Fixing a ton of bugs around sharing stories that don't exist anymore. 2012-07-02 10:15:17 -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
a98e8fadde Forcing heights for friends and profiles. Resizing as necessary. 2012-04-17 15:20:21 -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
44d455c2aa Disabled buttons should be grey. 2012-03-22 14:40:36 -07:00
Samuel Clay
b4903244e4 Handling social connect in intro. Also styling the third page of the intro. 2012-03-06 11:41:57 -08:00
Samuel Clay
2349458418 Adding intro dialog. Page 1 + Page 2. Page 2 still needs opml and reader background importing, updating on import, and handling case of user already having feeds. 2012-03-02 17:51:28 -08:00
Samuel Clay
310352915b Merge branch 'master' into social
* master:
  Style tweaks for Windows.
2012-02-10 17:27:42 -08:00
Samuel Clay
d83adabbc7 Style tweaks for Windows. 2012-02-10 17:14:20 -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
9ea6ee9086 Rearranging javascript. Also backbonizing user models for follower and following collections. 2012-01-04 09:42:35 -08:00
Samuel Clay
3567922ae2 Merge branch 'jammit' into social
* jammit:
  Adding node's 8888 to app ufw. Also adding redis's 6379 to express server.
  Adding socket.io-client
  Adding node modules.
  Retooling fabfile's deploy code to support serial asset packaging with parallel code deploys.
  Upgrading nginx version.
  Fixing public_root in assets.yml to be readbale by old yml.
  Adding static/ to gitignore.
  Moving images and theme assets around.
  Relative to absolute urls for all embedded images.
  Fixing up jammit branch for launch by adding socket.io, bookmarklet, and compressed static assets. Still needs icons.
  Fixing css conflicts in jammit. Adding code rendering to jammit for bookmarklet.
  Adding /static to nginx conf.
  Adding jQuery 1.7 and new static directory.
  JS is now complete. Need to fix css embeds.
  Initial stub of Jammit assets.

Conflicts:
	media/css/reader.css
2012-01-03 09:30:28 -08:00
Samuel Clay
36ded0085a Complete user profile -- photo select, bio, location, website, editing and defaulting during OAuth social service connect. 2011-12-25 20:50:59 -08:00
Samuel Clay
638963f31a Adding profile photos, hiding of completed Getting Started items, following and auto-following of new friends, creating connections. 2011-12-24 00:30:37 -08:00
Samuel Clay
d9efea8f1a Completing Twitter/FB OAuth end to end. Now need to surface and find friends. 2011-12-23 18:28:31 -08:00
Samuel Clay
de49d81f5e Adding twitter/facebook connect/disconnect buttons to find friend dialog. 2011-12-22 13:36:03 -08:00
Samuel Clay
5f723b28cf Adding Find Friends dialog, complete with tabs (Find friends, i'm following, following me). Doesn't do squat yet. 2011-12-21 18:23:53 -08:00
Samuel Clay
56a5cc9cc8 Relative to absolute urls for all embedded images. 2011-12-12 09:51:58 -08:00
Samuel Clay
7a2fd622a4 Stubbing out entire feed settings modal. Needs duplicate feed list. Also needs backend splitting of subscriptions. 2011-11-12 18:19:57 -08:00
Samuel Clay
ae367bf8ba Fixing a range of server issues -- sendign story emails, failing silently on SES outages, and giving a 404 instead of a 500 on bad params. 2011-10-28 10:29:11 -07:00
Samuel Clay
811512d8da Finishing up account dialog. Also re-styling subscriber counts. 2011-07-27 22:17:34 -07:00
Samuel Clay
247a0b824d Finishing page 2, adding page 5 which has links to twitter, get satisfaction, the blog (even loads the blog), and is a good last page. 2011-05-18 22:33:42 -04:00
Samuel Clay
390f8489dc jQuery 1.5.1 -> jQuery 1.6.1pre. 2011-05-07 21:33:42 -04:00
Samuel Clay
03d74d5313 Cleaning up the send email dialog (as well as the add site dialog). Everything looks great, save for an email icon and a bit more validation. 2011-05-07 21:12:13 -04:00
Samuel Clay
9cb9fa6073 Collecting stats on sites loaded and avg response time. Displaying stats in graphs. 2011-04-16 16:21:00 -04:00
Samuel Clay
a645916497 Merge branch 'master' into dashboard_tweaks
Conflicts:
	apps/rss_feeds/models.py
2011-04-11 09:34:44 -04:00
Samuel Clay
019283cf11 Adding subscriber count to recommended feeds. 2011-04-07 10:36:25 -04:00
Samuel Clay
583e45fcf8 Adding API pages and Press pages. THe static template is now finished. Just need to write the API/Press/Publishers pages. Whew. 2011-04-02 21:34:40 -04:00
Samuel Clay
1921e65e8e Fixing checkbox icon in bookmarklet on successful add feed. 2011-03-23 22:10:46 -04:00
Samuel Clay
45cf8f5cf8 Fixing issues around adding a folder in the add site bookmarklet. Cleaning up the modal by taking out the folder icon. 2011-03-21 20:37:58 -04:00
Samuel Clay
eaadabeb78 Adding in functionality to add new folder during add site bookmarklet. Needs testing (and maybe some UI love), but it should be feature complete. 2011-03-21 10:15:18 -04:00
Samuel Clay
01ab924719 Stubbing in new folder input on bookmarklet. Doesn't do anything yet, and it doesn't display correctly yet, either. 2011-03-19 11:07:36 -04:00
Samuel Clay
8833dd793d Adding basic structure for recommended feeds. 2011-02-28 23:27:58 -05:00
Samuel Clay
ba7c1bdb71 Tweaks to styles and upating jquery Layout. 2011-02-22 10:18:54 -05:00
Samuel Clay
a46329fcb6 Adding all error cases for the bookmarklet. Added styling to all elements. Ready to launch? 2011-01-22 21:42:58 -05:00
Samuel Clay
6e19d4d88b Using correct domain, not adding the same site twice, messaging, better styling. 2011-01-22 18:25:16 -05:00
Samuel Clay
90bc120599 Adding folders to bookmarklet. 2011-01-21 22:00:36 -05:00
Samuel Clay
567840ffff Bookmarklet now shows a modal where you can select which folder to add the site. Includes JS and CSS, uncompressed, on host page. 2011-01-21 20:29:19 -05:00