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
1d4ad3b3be
Merge branch 'master' into circular
...
* master:
Migrating comment feeds to non-comment feeds.
2013-05-07 15:37:46 -07:00
Samuel Clay
5ceb0c45bf
Migrating comment feeds to non-comment feeds.
2013-05-07 15:37:36 -07:00
Samuel Clay
774028d0d6
Merge branch 'master' into circular
...
* master:
Disallowing branched feeds from feed search.
2013-05-07 11:37:21 -07:00
Samuel Clay
477d928d70
Disallowing branched feeds from feed search.
2013-05-07 11:37:01 -07:00
Samuel Clay
9d2925fe0b
Moving follow iframes.
2013-05-07 11:28:52 -07:00
Samuel Clay
03018669bf
Starting intro at the first page.
2013-05-06 18:32:45 -07:00
Samuel Clay
53b2893df9
New ios and web screenshots for welcome page.
2013-05-06 17:22:25 -07:00
Samuel Clay
2c9b321312
New welcome page feature screenshots.
2013-05-06 16:40:38 -07:00
Samuel Clay
8d4647920e
Fixing story river header.
2013-05-06 16:16:45 -07:00
Samuel Clay
0cbf23fdf2
Handling errors correctly in account settings dialog.
2013-05-06 15:21:17 -07:00
Samuel Clay
007481ebff
Handling username changes for users with no passwords.
2013-05-06 15:12:18 -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
66125d306f
Merge branch 'master' into circular
...
* master:
Fixing double click on unread count to actually mark the feed as read.
Conflicts:
media/js/newsblur/views/feed_title_view.js
2013-05-06 13:23:14 -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
28a8f81c7f
Merge branch 'master' into circular
...
* master:
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.
Adding all role to send commands to every server (specificaly setup_hosts).
2013-05-06 12:33:22 -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
af75b90509
Merge branch 'master' into circular
...
* master:
Removing sparse constraint on MStory's story_hash index. Goodbye old stories that didn't make the cut.
Adding optional force param to sub counter.
2013-05-04 19:50:50 -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
Mark Anderson
d1aa518331
More chages to use StoryOrder for sort order when calling FeedProvider
2013-05-04 21:41:56 +01:00
Mark Anderson
e5ae262f9f
Merge remote-tracking branch 'upstream/master' into storyorder
2013-05-04 21:41:08 +01: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
23a7aa84d7
Merge branch 'master' into circular
...
* master:
Using story cache when calculating unreads, for those who need unread counts updating.
2013-05-03 13:17:07 -07:00
Samuel Clay
36504d3543
Better iPad/iPhone screenshots.
2013-05-03 13:16:42 -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
2f99f03e0d
Merge branch 'master' into circular
...
* master:
Fixing bug in autocomplete returning lost feeds.
Conflicts:
apps/rss_feeds/views.py
2013-05-02 18:09:00 -07:00
Samuel Clay
89c3b5222e
Fixing bug in autocomplete returning lost feeds.
2013-05-02 18:06:04 -07:00
Samuel Clay
3320c7356e
Tightening up unread counts.
2013-05-02 18:05:32 -07:00
Samuel Clay
191738b621
Merge branch 'master' into circular
...
* master:
Fixing issue where user agent doesn't exist.
Change crossover to narrow view from 700 to 720px.
Conflicts:
media/js/newsblur/reader/reader.js
2013-05-02 17:52:59 -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
Samuel Clay
ed017514e6
Fully converting feeds and folders to use redis-only read stories (removing MUserStory). Still need to do socialsubs.
2013-05-02 16:49:44 -07:00
