NewsBlur-viq/templates
Samuel Clay 3d12b24042 Merge branch 'master' into circular
* master: (589 commits)
  Adding delete user flow. About time, since I'm sick of doing this myself.
  Deractivating premiums.
  Adding a lock for the intelligence slider for focus stories. If the user selects focus and there are actually focus stories, lock it for the future when there are no unread focus stories.
  Uppiung the find next unread story titles page limit from 12 to 50.
  Hiding folders with no unread stories in Unread/Focus mode.
  Adding autocomplete to emailing a story dialog.
  Using queue for scheduling feed fetches on load.
  Renaming celerybeat supervisor task.
  Fixing insta-fetching.
  Attempting to correctly save duplicate feeds.
  Adding tons of logging (especially user-facing) to feed exception handling. Much much better feed address and link fetch history.
  New enterprise ios build includes full training.
  Changing intelligence training on social feeds to apply to original feed as well.
  Using a popover for training on the iPad. Also adding the train button to the bottom of every story.
  Finishing training on iPad. Works in river too. Just need to test social and it's shipping.
  Fixing title selectin bug when the title was too short to register the selection loupe.
  Training feeds and stories in feeds. Needs testing on ipad, in river, and on social.
  Finish look and feel of ios training for both story and feed. Just need to send requests, redraw intelligence, recount and reclassify stories, and update scores. All already written to support inline training.
  A few more log color tweaks.
  Adding clean stories task. Updating log colors.
  ...

Conflicts:
	.gitignore
	apps/reader/views.py
	apps/social/views.py
	templates/social/social_page.xhtml
	templates/social/social_story.xhtml
	templates/social/story_comments.xhtml
2013-01-03 12:00:09 -08:00
..
api Fixing Youtube embeds and correctly handling keyboard events when share is in transit. 2012-08-27 11:31:05 -07:00
import Fixing broken signup form for google reader import. 2011-09-28 16:44:39 -07:00
mail Major cleanup on comments in iOS app. 2012-12-11 17:53:17 -08:00
mobile Adding first JS to blurblogs: loading public comments. 2012-06-29 21:06:33 -07:00
profile Adding delete user flow. About time, since I'm sick of doing this myself. 2013-01-03 10:33:22 -08:00
reader Adding beta search (only titles and authors for now) for staff only. 2012-12-19 14:21:46 -08:00
recommendations Hiding moderation queue, since it was uglifying demos. Also cleaning up text version of both new reply and re-share emails. 2012-07-05 22:46:18 -07:00
rss_feeds Adding active premiums to status page. 2012-12-21 18:22:26 -08:00
social Merge branch 'master' into circular 2013-01-03 12:00:09 -08:00
static Pushing new build of iOS app with proper get-task-allow. 2012-10-29 16:54:35 -07:00
statistics Finishing login/signup forms and interactions. Added 4 features and images. Formatted activity. Needs some love and integration with the reader, but it's almost there. 2012-09-12 18:47:37 -07:00
404.html Slight cleanup of error templates. 2012-12-12 17:13:15 -08:00
500.html Slight cleanup of error templates. 2012-12-12 17:13:15 -08:00
502.html Slight cleanup of error templates. 2012-12-12 17:13:15 -08:00
base.html Adding delete user flow. About time, since I'm sick of doing this myself. 2013-01-03 10:33:22 -08:00
maintenance_off.html Migration to increase max length of feed address. 2012-12-25 14:58:59 -08:00