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
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
Samuel Clay
70877d4323
Merge branch 'preshard'
...
* preshard:
Removing unused redis story objectid db.
Force all feed queries to use redis.
2013-05-02 12:33:20 -07:00
Samuel Clay
009010f879
Removing unused redis story objectid db.
2013-05-02 12:27:37 -07:00
Samuel Clay
0ff3d41c09
Force all feed queries to use redis.
2013-05-02 11:27:33 -07:00
Samuel Clay
49245ce9e3
Another bug found by @kyleniemeyer's story. a - b was supposed to be b - a.
2013-05-01 14:33:12 -07:00
Samuel Clay
38d01df4ab
Fixing Global shared stories by checking for missing story hashes properly.
2013-05-01 14:33:12 -07:00
Samuel Clay
ed1e71e407
Using index in msharedstory search.
2013-05-01 14:33:12 -07:00
Samuel Clay
c01d8e7ba9
Using new story_hashes instead of story object ids.
2013-05-01 14:33:12 -07:00
Samuel Clay
7a5dfc9a47
Updating Android from v1.3 to v1.3.1, fixing duplicate All Site Stories bug.
2013-05-01 14:32:54 -07:00
Samuel Clay
06cf8de130
Fixing Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug.
2013-04-30 13:58:16 -07:00
Samuel Clay
d28adf1f48
Upping ulimit file descriptor limits.
2013-04-30 10:26:13 -07:00
Samuel Clay
3d0fe64557
Merge pull request #226 from brainwane/master
...
Typofixes in README
2013-04-30 09:31:50 -07:00
Samuel Clay
68127fbf6c
Merge pull request #225 from ojiikun/master
...
Android: Fix duplicate appearance of All Stories heading
2013-04-30 09:31:13 -07:00
Sumana Harihareswara
a52a4bea16
README.md typo fixes
2013-04-30 01:14:38 -03:00
Sumana Harihareswara
a9a9aa8301
newline at end of readme
2013-04-30 01:12:35 -03:00
ojiikun
6dcceba7ba
Fix duplicate appearance of All Stories heading.
2013-04-30 02:59:24 +00:00
Samuel Clay
a36f453ffd
Switching to real prod database for migration.
2013-04-29 18:05:33 -07:00
Samuel Clay
bbd430ec59
Merge branch 'story_hash_1'
...
* story_hash_1:
Fixing story hash migration to run by user.
Adding story_hash to starred stories, user stories, and shared stories.
2013-04-29 18:00:48 -07:00
Samuel Clay
97a6768d67
Fixing story hash migration to run by user.
2013-04-29 18:00:43 -07:00
ojiikun
24aca7ccf2
Merge remote-tracking branch 'upstream/master'
2013-04-30 00:12:34 +00:00
Samuel Clay
8d516fc493
Adding story_hash to starred stories, user stories, and shared stories.
2013-04-29 16:07:08 -07:00
Samuel Clay
4d014033b6
Adding redis backup script.
2013-04-29 14:06:42 -07:00
Samuel Clay
7c32fea650
Normalizing settings.
2013-04-28 21:39:52 -07:00
Samuel Clay
7e5172876d
Merge pull request #221 from pmitros/master
...
Slightly simplified development install
2013-04-27 20:36:44 -07:00
ojiikun
31fe0293da
Revert "Fix NPE on login."
...
This reverts commit 6eeac845d8
2013-04-28 02:28:34 +00:00
Daniel
3fadddd399
Merge pull request #222 from manderson23/master
...
Android: Remove (via Newsblur) when sharing
2013-04-27 19:15:46 -07:00
Mark Anderson
500cc6bad5
Fixed #217 . Remove (via Newsblur) when sharing
2013-04-27 22:59:09 +01:00
Piotr Mitros
7ad5693a49
Documented additional hack to get into the system without Stripe installed
2013-04-27 15:18:56 -04:00
Piotr Mitros
a5b7b85b03
Expanded requirements
2013-04-27 14:54:14 -04:00
Piotr Mitros
81fd273b15
Fixed doc. We do require a non-fake migrate as well.
2013-04-27 14:30:39 -04:00
Piotr Mitros
5fa8bde9ca
Removed SES dependency for development. Fixed bug where DEVELOPMENT was used before being overridden by local_settings.py.
2013-04-27 14:26:53 -04:00
Piotr Mitros
abed85920b
Added requirements.txt
...
This allows you to:
pip install -r requirements.txt
2013-04-27 14:01:04 -04:00
ojiikun
6eeac845d8
Fix NPE on login.
2013-04-27 07:00:15 +00:00
