Commit graph

5440 commits

Author SHA1 Message Date
Samuel Clay
71aa961262 Adding real-time update on marking feed as read. 2013-05-09 16:42:58 -07:00
Samuel Clay
0483273840 Remvoing unused everything_unread param from river stories. 2013-05-09 16:40:06 -07:00
Samuel Clay
cc5d87f795 Using story_hashes instead of fetch_stories parameter. 2013-05-09 16:16:14 -07:00
Samuel Clay
9ef8b9b3c1 Merge branch 'master' into ruserstory
# By Fake Name
# Via Fake Name (2) and Samuel Clay (1)
* master:
  cleanup and fixing some of my stupid bugs
  cleanup and fixing some of my stupid bugs
  whoops, that section isn't called in the normal installation process. Reverted.
  Fix to make detecting if the install is a dev env work properly
  Fixed typo. Also, extracted most of the instances of a specific username out to `env.user`, so you don't need to search&replace to do an install. Lastly, added a separate function to change the shell of the host, so it's easier to disable.
2013-05-09 15:31:28 -07:00
Samuel Clay
22070f055b Merge pull request #236 from fake-name/master
Further corrections (mostly to my changes)
2013-05-09 15:00:24 -07:00
Samuel Clay
e5a87464ab Moving read stories over to RUserStory when merging feeds. 2013-05-09 14:56:51 -07:00
Fake Name
4da6eb77a2 Merge branch 'master' of https://github.com/fake-name/NewsBlur 2013-05-09 01:32:07 -07:00
Fake Name
0c82d782f8 cleanup and fixing some of my stupid bugs 2013-05-09 01:30:37 -07:00
Fake Name
a31731bbf9 cleanup and fixing some of my stupid bugs 2013-05-09 01:27:53 -07:00
Samuel Clay
03ad1f5077 Merge branch 'master' into ruserstory
# By Samuel Clay (6) and ojiikun (1)
* master:
  ES requires valid url.
  Overriding haystack elasticsearch url.
  Removing Redis autocomplete. Upgrading elasticsearch.
  Using haystack and elasticsearch for a third autocomplete feature.
  Refactor/fix mark-as-read-while-reading workflow.
  Selecting story when clicking on a link.
  Preventing infinite loop on merged dupe feeds.
2013-05-08 15:23:27 -07:00
Samuel Clay
a6c3fa7830 ES requires valid url. 2013-05-08 12:23:10 -07:00
Samuel Clay
d620fb9ea0 Overriding haystack elasticsearch url. 2013-05-08 12:23:10 -07:00
Samuel Clay
777d5a5e9c Removing Redis autocomplete. Upgrading elasticsearch. 2013-05-08 12:23:10 -07:00
Samuel Clay
365e0c2813 Using haystack and elasticsearch for a third autocomplete feature. 2013-05-08 12:23:09 -07:00
Samuel Clay
6633560587 Merge pull request #235 from ojiikun/master
Android: Fix Mark-As-Read-While-Reading Workflow
2013-05-08 10:41:51 -07:00
ojiikun
35b680c0d9 Refactor/fix mark-as-read-while-reading workflow. 2013-05-08 10:09:36 +00:00
Fake Name
cf7401a262 whoops, that section isn't called in the normal installation process. Reverted. 2013-05-08 02:27:32 -07:00
Fake Name
78cde45f05 Fix to make detecting if the install is a dev env work properly 2013-05-08 02:15:55 -07:00
Fake Name
e7e819444a Fixed typo.
Also, extracted most of the instances of a specific username out to `env.user`, so you don't need to search&replace to do an install.
Lastly, added a separate function to change the shell of the host, so it's easier to disable.
2013-05-08 01:59:33 -07:00
Samuel Clay
530f8ea3dd Selecting story when clicking on a link. 2013-05-07 16:39:05 -07:00
Samuel Clay
d91cc66178 Preventing infinite loop on merged dupe feeds. 2013-05-07 16:23:30 -07:00
Samuel Clay
1c5866993b Merge branch 'master' into ruserstory
* master:
  Migrating comment feeds to non-comment feeds.
  Disallowing branched feeds from feed search.
2013-05-07 16:04:31 -07:00
Samuel Clay
5ceb0c45bf Migrating comment feeds to non-comment feeds. 2013-05-07 15:37:36 -07:00
Samuel Clay
477d928d70 Disallowing branched feeds from feed search. 2013-05-07 11:37:01 -07:00
Samuel Clay
92b594e0bd Merge branch 'master' into ruserstory
* master:
  Fixing double click on unread count to actually mark the feed as read.
  Fixing scrolling height when mouse indicator position is locked. Expands padding to fit the bottom-most story. Thanks to @bdarnell and @dancarroll for the push. Fixes #230.
  Slight cleanup of fabfile.
2013-05-06 13:28:11 -07:00
Samuel Clay
34046ad2da Fixing double click on unread count to actually mark the feed as read. 2013-05-06 13:22:44 -07:00
Samuel Clay
23d8c87bda Fixing scrolling height when mouse indicator position is locked. Expands padding to fit the bottom-most story. Thanks to @bdarnell and @dancarroll for the push. Fixes #230. 2013-05-06 12:33:17 -07:00
Samuel Clay
fe23985e6d Slight cleanup of fabfile. 2013-05-05 10:18:39 -07:00
Samuel Clay
bdda1ee011 Merge branch 'master' into ruserstory
* master:
  Adding all role to send commands to every server (specificaly setup_hosts).
  Removing sparse constraint on MStory's story_hash index. Goodbye old stories that didn't make the cut.
2013-05-05 10:07:18 -07:00
Samuel Clay
76c306afee Adding all role to send commands to every server (specificaly setup_hosts). 2013-05-04 23:27:36 -07:00
Samuel Clay
e27b7f5688 Removing sparse constraint on MStory's story_hash index. Goodbye old stories that didn't make the cut. 2013-05-04 19:03:02 -07:00
Samuel Clay
6d73bdc352 Cleaning up MUserStory imports. 2013-05-03 17:47:38 -07:00
Samuel Clay
4c1983e5cc Speeding up blurblog sub counter b yonly using unread stories instead of all stories since a certain date. 2013-05-03 17:45:19 -07:00
Samuel Clay
85ab5248ca Merge branch 'master' into ruserstory
* master:
  Adding optional force param to sub counter.
2013-05-03 17:42:47 -07:00
Samuel Clay
b54c062442 Adding optional force param to sub counter. 2013-05-03 17:42:41 -07:00
Samuel Clay
d03a9c30a7 Speeding up unread story counts. 2013-05-03 17:28:05 -07:00
Samuel Clay
b9f6626358 Speeding up unread story counts. 2013-05-03 17:24:02 -07:00
Samuel Clay
93a2f5f784 Adding force calculate sub scores option. 2013-05-03 17:07:45 -07:00
Samuel Clay
03378fe23b Showing starred and shared status on global/river blurblog. 2013-05-03 16:50:16 -07:00
Samuel Clay
b8f2571a1a Fixing global feed to show read stories. 2013-05-03 16:48:17 -07:00
Samuel Clay
d1cb05a09e Fixing reading stories in river blurblog. 2013-05-03 15:08:12 -07:00
Samuel Clay
8da72b2c22 Merge branch 'master' into ruserstory
* master:
  Using story cache when calculating unreads, for those who need unread counts updating.
2013-05-03 14:46:47 -07:00
Samuel Clay
1a04bcd400 Moving river blurblog to no longer use MUserStory. 2013-05-03 14:46:44 -07:00
Samuel Clay
882a307026 Merge branch 'master' into ruserstory
# By Samuel Clay (2) and daanzu (1)
* master:
  Fixing bug in autocomplete returning lost feeds.
  Fixing issue where user agent doesn't exist.
  Change crossover to narrow view from 700 to 720px.
2013-05-03 12:21:01 -07:00
Samuel Clay
550a33d9ab Using story cache when calculating unreads, for those who need unread counts updating. 2013-05-03 09:43:21 -07:00
Samuel Clay
89c3b5222e Fixing bug in autocomplete returning lost feeds. 2013-05-02 18:06:04 -07:00
Samuel Clay
2e6f1af4a2 Fixing issue where user agent doesn't exist. 2013-05-02 17:52:21 -07:00
Samuel Clay
39f063d157 Merge pull request #228 from daanzu/master
Change crossover to narrow view from 700 to 720px.
2013-05-02 17:45:16 -07:00
Samuel Clay
670625acf6 Adding MUserStory back in when reading and unreading, to maintain backwards compatibility. 2013-05-02 17:42:04 -07:00
daanzu
44f6d66dc2 Change crossover to narrow view from 700 to 720px. 2013-05-02 20:24:30 -04:00