Commit graph

3452 commits

Author SHA1 Message Date
Samuel Clay
2c69fc7edc Merge branch 'social' into redis
* social:
  Fixing interactions and activities to only pull what's necessary. Otherwise doubles show up in android + ios.
  Updating the shortcut text for sidebar collapsing.
2012-07-18 23:08:43 -07:00
Samuel Clay
d1b523df99 Merge branch 'master' into social
* master:
  Updating the shortcut text for sidebar collapsing.
2012-07-18 23:08:36 -07:00
Samuel Clay
669b1d1e3d Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Updating the shortcut text for sidebar collapsing.
2012-07-18 23:08:25 -07:00
Samuel Clay
4383b1148d Fixing interactions and activities to only pull what's necessary. Otherwise doubles show up in android + ios. 2012-07-18 23:06:43 -07:00
Samuel Clay
700a53c9b8 Hiding order/filter controls on blurblogs for now. 2012-07-18 22:45:29 -07:00
Samuel Clay
0d5a16dc15 Finishing sort by oldest/newest and show only unread/all stories. 2012-07-18 20:19:54 -07:00
Samuel Clay
a4414eebde Adding oldest/newer order to feeds and river. Also adding unread/all read filter to both as well. Including stubbed segmented control for switching between modes on a per-feed basis. Still needs global preference and glue to hook them up. 2012-07-18 18:34:19 -07:00
Samuel Clay
3b348ff5f1 Merge pull request #61 from heliostatic/patch-2
Updating the shortcut text for sidebar collapsing.
2012-07-18 10:43:52 -07:00
Samuel Clay
be3c34aa87 Merge branch 'social' into redis
* social:
  No longer deleting old read stories if they are more recent than days_unread.
2012-07-17 17:44:39 -07:00
Samuel Clay
dd67f457d8 No longer deleting old read stories if they are more recent than days_unread. 2012-07-17 17:44:27 -07:00
Samuel Clay
c122adec4d Merge branch 'social' into redis
* social:
  fixing bug with feed exception when there is a duplicate feed id
  Fixing shift+a for social subs. Also fixing bug where site would stay selected after adding a new site.
  Fixing tutorial by forcing dialog resize. Thanks to @afita for finding this bug.
  Adding necessary cookie domain settings to local_settings template.
  Whoops, forgot to remove 1 second sleep from autocomplete.
  Fixing the living snot out of the add site dialog. Adding an autocomplete spinner, showing results on focus, and no longer auto-adding on click (allowing user to select a folder). Big thanks to @afita for the push.
  Fixing broken offset for locked mouse indicator on site reload. Thanks to @afita for bug report.
  Removing cjson. Fixing collect_stats requirement on bootstrap.
  Adding logging to celerybeat. Adding site unread count calculation to homepage freshening.
  Moving cronjob tasks over to celerybeat. Starting with task_feeds, collect_feedback, collect_stats, and mark_read for homepage freshening.
2012-07-17 17:09:58 -07:00
Ben Cohen
4998d74e62 Updating the shortcut text for sidebar collapsing. 2012-07-17 17:42:23 -05:00
Samuel Clay
54c68578db Merge branch 'social' of github.com:samuelclay/NewsBlur into social
* 'social' of github.com:samuelclay/NewsBlur:
  fixing bug with feed exception when there is a duplicate feed id
2012-07-17 14:19:16 -07:00
Roy Yang
28b81ec74a fixing bug with feed exception when there is a duplicate feed id 2012-07-17 14:18:26 -07:00
Samuel Clay
f5c9a72c05 Fixing shift+a for social subs. Also fixing bug where site would stay selected after adding a new site. 2012-07-17 14:14:45 -07:00
Samuel Clay
1d398118d4 Fixing tutorial by forcing dialog resize. Thanks to @afita for finding this bug. 2012-07-17 13:59:39 -07:00
Samuel Clay
4140458617 Adding necessary cookie domain settings to local_settings template. 2012-07-17 13:55:11 -07:00
Samuel Clay
7fab23d8ef Whoops, forgot to remove 1 second sleep from autocomplete. 2012-07-17 13:02:36 -07:00
Samuel Clay
d1126ae64d Fixing the living snot out of the add site dialog. Adding an autocomplete spinner, showing results on focus, and no longer auto-adding on click (allowing user to select a folder). Big thanks to @afita for the push. 2012-07-17 13:00:30 -07:00
Samuel Clay
9c96210850 Fixing broken offset for locked mouse indicator on site reload. Thanks to @afita for bug report. 2012-07-17 12:28:24 -07:00
Samuel Clay
86292822c0 Removing cjson. Fixing collect_stats requirement on bootstrap. 2012-07-17 12:07:26 -07:00
Samuel Clay
52a935e211 Adding logging to celerybeat. Adding site unread count calculation to homepage freshening. 2012-07-17 00:06:41 -07:00
Samuel Clay
d722e9c4eb Moving cronjob tasks over to celerybeat. Starting with task_feeds, collect_feedback, collect_stats, and mark_read for homepage freshening. 2012-07-16 23:40:17 -07:00
Samuel Clay
272575d917 Handling expiration of redis unread keys. 2012-07-16 20:49:43 -07:00
Samuel Clay
1c16662be3 Finished loading redis unreads into mongo. That's it for the risky part. Now for the cleanup. 2012-07-16 19:13:32 -07:00
Samuel Clay
b5327c0ce6 Merge branch 'social' into redis
* social:
  Fixing typo in social interactions api endpoint.
2012-07-16 18:13:29 -07:00
Samuel Clay
7be638a735 Fixing typo in social interactions api endpoint. 2012-07-16 18:11:46 -07:00
Samuel Clay
b2065ad587 Adding backend support for redis unread stories. 2012-07-16 18:11:18 -07:00
Samuel Clay
93cd048e7c Adding story guids to redis sorted set, sorted by date, separated by feed, on story save. 2012-07-15 22:51:59 -07:00
Samuel Clay
a47abcb007 Small bugs. 2012-07-15 22:51:27 -07:00
Samuel Clay
5adc74cd5d Activities and Interactions for favoriting shared story comments. 2012-07-15 19:29:05 -07:00
Samuel Clay
497f610056 Adding likes/favorites to comments. Still needs interaction history and perhaps an email. 2012-07-15 17:59:19 -07:00
Samuel Clay
8bb6b41883 Cleaning up logging. 2012-07-14 07:50:53 -07:00
Samuel Clay
db49bb35b5 Adding user profile/preferences to flat feeds (for android and ios). 2012-07-13 18:42:44 -07:00
Samuel Clay
86f8e4848e Coloring slow request times. 2012-07-13 17:51:25 -07:00
Samuel Clay
8d8514080f Fixing bugs around follow information. 2012-07-13 15:32:27 -07:00
Samuel Clay
cdf42f323e Adding elapsed time to all requests logging. 2012-07-13 14:56:12 -07:00
Samuel Clay
803278bb08 Updating celery calls in prep for upgrade to celery 3.0. 2012-07-12 23:58:29 -07:00
Samuel Clay
3d8f206d60 Getting IE9 working with OPML ajax upload. 2012-07-12 23:44:30 -07:00
Samuel Clay
ded3b9d554 Typo on never_cache after json view. Doh. 2012-07-12 22:48:58 -07:00
Samuel Clay
c9425860d8 Fixing the living crap out of IE9. Everything works excellently now. 2012-07-12 22:26:49 -07:00
Samuel Clay
e2da3881d4 Upgrading jQuery 1.7.1 to 1.7.2 and upgrading bootstrap's carousel to 2.0.5. 2012-07-12 22:25:50 -07:00
Samuel Clay
8d0278f162 Adding _gaq for debug, when analytics aren't present. 2012-07-12 20:14:38 -07:00
Samuel Clay
5632980430 Taking @mgeraci's suggestion and moving the Starred! message to the opposite gravity of the story titles pane. 2012-07-12 15:20:29 -07:00
Samuel Clay
109a82b680 Double clicking sites and stories now works. Thanks to @ojiikun for figuring this one out. 2012-07-12 15:13:51 -07:00
Samuel Clay
b1bedb42d4 Fixing scroll/paging bug where the wrong story would be selected. Technically it's not fixed, but the indicator is now always present, so you know why it's happening. Thanks to @afita for the thorough investigation. 2012-07-12 13:43:39 -07:00
Samuel Clay
febd0ae0a3 Lots of little bugs: avatar images, icon importer, page importer, adding analytics tracking to intro. 2012-07-12 12:57:35 -07:00
Samuel Clay
75337a65fb Fixing following bug due to array truncation of following list. 2012-07-12 01:21:09 -07:00
Samuel Clay
bfa00d8bd4 Small tweaks to blurblogs. iPadifying blurblogs. 2012-07-11 21:20:38 -07:00
Samuel Clay
5225395b40 Adding /social/activities endpoint for Android and iOS. 2012-07-11 17:51:01 -07:00