Mark Anderson
22852dddcf
Merge remote-tracking branch 'upstream/master' into storyorder
2013-05-18 16:21:46 +01:00
ojiikun
9f422f9e3e
Reverse gradient colours for folder bars.
2013-05-17 23:35:45 +00:00
Samuel Clay
0776e8d487
Merge pull request #250 from ojiikun/circular
...
Android: New Folder Icons/Colours, Remove Feed-View Intel
2013-05-17 16:08:15 -07:00
ojiikun
0ebb770f17
Fix BG colour of feed rows in Main act.
2013-05-17 22:36:52 +00:00
Samuel Clay
edded2df63
Merge branch 'master' into circular
...
* master:
Slight improvement to unread story hashes endpoint by skipping feeds with no neutral/positive unreads.
2013-05-17 14:01:36 -07:00
Samuel Clay
f9eab468cf
Slight improvement to unread story hashes endpoint by skipping feeds with no neutral/positive unreads.
2013-05-17 14:01:30 -07:00
Samuel Clay
5f1f46e24a
Merge branch 'master' into circular
...
* master:
Logging unread story hashes.
2013-05-17 13:54:45 -07:00
Samuel Clay
fa44dfd5f8
Logging unread story hashes.
2013-05-17 13:54:41 -07:00
Samuel Clay
bd03e24c8f
Merge branch 'master' into circular
...
* master:
New API endpoint: /reader/unread_story_hashes.
2013-05-17 13:51:52 -07:00
Samuel Clay
3bc1379455
New API endpoint: /reader/unread_story_hashes.
2013-05-17 13:51:46 -07:00
ojiikun
4e1008a6b5
New group icons and row bg colors.
2013-05-17 20:45:34 +00:00
Samuel Clay
753366ed11
Merge branch 'master' into circular
...
* master:
Adding order/read_filter to river log.
2013-05-17 13:30:51 -07:00
Samuel Clay
7c7721e472
Adding order/read_filter to river log.
2013-05-17 13:30:47 -07:00
Samuel Clay
fa0b1e33de
Merge branch 'master' into circular
...
* master:
Making river queries waaaay faster for all site stories by only getting feed ids.
2013-05-17 13:22:57 -07:00
Samuel Clay
0d6bd9d0e7
Making river queries waaaay faster for all site stories by only getting feed ids.
2013-05-17 13:22:53 -07:00
ojiikun
f1061b2cc1
New folder icons.
2013-05-17 18:59:39 +00:00
Samuel Clay
eba42ca0e3
Grammar fix in email base. Thanks @alankarma.
2013-05-17 11:25:54 -07:00
ojiikun
a9d97ce734
Remove intel select on story list.
2013-05-17 17:35:42 +00:00
Samuel Clay
76744948be
Merge branch 'master' into circular
...
* master:
Fixing river blurblog when user has shared one of the stories.
Conflicts:
apps/social/views.py
2013-05-16 18:27:46 -07:00
Samuel Clay
19316b7689
Fixing river blurblog when user has shared one of the stories.
2013-05-16 18:26:58 -07:00
Samuel Clay
1d2d1ae7a4
Cleaning up certs for new certificate.
2013-05-16 18:20:54 -07:00
Samuel Clay
74d6301df3
Merge branch 'master' into circular
...
* master:
Marking feeds as read when there are no neutral or positive unreads. Dropping negatives.
2013-05-16 11:21:24 -07:00
Samuel Clay
ca5ef47e02
Marking feeds as read when there are no neutral or positive unreads. Dropping negatives.
2013-05-16 11:21:20 -07:00
Samuel Clay
5873014535
Merge branch 'master' into circular
...
* master:
Forcing limit of 6 stories per feed load.
2013-05-16 11:16:57 -07:00
Samuel Clay
1505e0ba50
Forcing limit of 6 stories per feed load.
2013-05-16 11:16:51 -07:00
Samuel Clay
6c394f18c2
Merge branch 'master' into circular
...
* master:
Adding ReadKit to supported clients.
2013-05-16 11:11:52 -07:00
Samuel Clay
0b81e57871
Adding ReadKit to supported clients.
2013-05-16 11:11:46 -07:00
Samuel Clay
774a78deb4
Merge branch 'master' into circular
...
* master:
Just use regular yaml and link it.
2013-05-15 18:19:21 -07:00
Samuel Clay
f332a90140
Just use regular yaml and link it.
2013-05-15 18:19:17 -07:00
Samuel Clay
ada894441b
Just use regular yaml and link it.
2013-05-15 18:19:00 -07:00
Samuel Clay
67f2028aef
Merge branch 'master' into circular
...
* master:
Moving to vendorized yaml.
Removing PyYAML as a non-vendorized dependency.
Vendorizing pyyaml because pyyaml.org is down so often.
2013-05-15 18:08:41 -07:00
Samuel Clay
0b793a3797
Moving to vendorized yaml.
2013-05-15 18:08:37 -07:00
Samuel Clay
950a159387
Removing PyYAML as a non-vendorized dependency.
2013-05-15 17:57:09 -07:00
Samuel Clay
d83742fe81
Vendorizing pyyaml because pyyaml.org is down so often.
2013-05-15 17:52:35 -07:00
Samuel Clay
1e1433de06
Merge branch 'master' into circular
...
* master:
Fixing fabfile.
Fixing bug where dupe feed has no link.
2013-05-15 17:46:49 -07:00
Samuel Clay
399787aeb1
Fixing fabfile.
2013-05-15 17:46:45 -07:00
Samuel Clay
f5eac30a5a
Fixing bug where dupe feed has no link.
2013-05-15 17:21:10 -07:00
Samuel Clay
fd148e106f
Merge branch 'master' into circular
...
* master:
Temporarily commenting out story hash switching on read stories because of massive redis locking.
2013-05-15 17:13:11 -07:00
Samuel Clay
88d474d62b
Temporarily commenting out story hash switching on read stories because of massive redis locking.
2013-05-15 17:13:06 -07:00
Samuel Clay
842d65c0f0
Merge branch 'master' into circular
...
* master:
2013-05-15 16:50:03 -07:00
Samuel Clay
6461225740
Merge branch 'muserstory_remove'
...
* muserstory_remove:
Fixing remaining share hash bug. Shared stories wouldnt show as shared on original feed.
Switching to faster unread counting for socialsubs and usersubs.
Fixing mark as read bug for socialsubs.
Removing story blurblog permalink, making it called explicitly.
Adding node group to fabfile.
Using popular instead of homepage user to suggest new users to follow.
Cleaning up unused detritus. Ready to deploy.
Final cleanup before deploying.
Removing MUserStory entirely.
2013-05-15 16:06:31 -07:00
Samuel Clay
be3bc8d16b
Merge branch 'master' into muserstory_remove
...
* master:
Typo on duplicate feed saving truncation.
Adding duplicate feed address+link truncation.
Adding duplicate feed address+link truncation.
2013-05-15 16:06:26 -07:00
Samuel Clay
ede28f2373
Merge branch 'master' into circular
...
* master:
Typo on duplicate feed saving truncation.
2013-05-15 15:43:10 -07:00
Samuel Clay
44b4559d0b
Typo on duplicate feed saving truncation.
2013-05-15 15:43:07 -07:00
Samuel Clay
f21f8231bf
Merge branch 'master' into circular
...
* master:
Adding duplicate feed address+link truncation.
2013-05-15 15:41:43 -07:00
Samuel Clay
3a0cded0d9
Adding duplicate feed address+link truncation.
2013-05-15 15:41:39 -07:00
Samuel Clay
21ad2d400e
Merge branch 'master' into circular
...
* master:
Adding duplicate feed address+link truncation.
2013-05-15 15:40:43 -07:00
Samuel Clay
f6f053b285
Adding duplicate feed address+link truncation.
2013-05-15 15:40:38 -07:00
Samuel Clay
ea87a4866d
Padding read more link on blurblogs.
2013-05-15 14:30:29 -07:00
Samuel Clay
9f6474b0bc
Darker bio title color on blurblogs.
2013-05-15 13:40:47 -07:00
