ojiikun
ddf842bb40
Remove orange-themed borders.
2013-05-20 02:42:34 +00:00
ojiikun
2b27555816
Change top/bottom bars to new theme.
2013-05-20 02:11:30 +00:00
ojiikun
9f422f9e3e
Reverse gradient colours for folder bars.
2013-05-17 23:35:45 +00:00
ojiikun
0ebb770f17
Fix BG colour of feed rows in Main act.
2013-05-17 22:36:52 +00:00
ojiikun
4e1008a6b5
New group icons and row bg colors.
2013-05-17 20:45:34 +00:00
ojiikun
f1061b2cc1
New folder icons.
2013-05-17 18:59:39 +00:00
ojiikun
a9d97ce734
Remove intel select on story list.
2013-05-17 17:35:42 +00: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
Samuel Clay
883991c1d5
Taking single story feed view with locked mouse indicator line into consideration. Thanks to @bdarnell for the suggestion.
2013-05-15 13:09:24 -07:00
Samuel Clay
b322adb509
Merge branch 'muserstory_remove' into circular
...
* muserstory_remove:
Fixing remaining share hash bug. Shared stories wouldnt show as shared on original feed.
2013-05-15 12:36:30 -07:00
Samuel Clay
1df1e3d071
Fixing remaining share hash bug. Shared stories wouldnt show as shared on original feed.
2013-05-15 12:36:24 -07:00
Samuel Clay
5259147e8e
Merge branch 'muserstory_remove' into circular
...
* muserstory_remove:
Switching to faster unread counting for socialsubs and usersubs.
2013-05-14 17:31:13 -07:00
Samuel Clay
9a6e9078c3
Switching to faster unread counting for socialsubs and usersubs.
2013-05-14 17:31:08 -07:00
Samuel Clay
72081f9f43
Merge branch 'muserstory_remove' into circular
...
* muserstory_remove:
Fixing mark as read bug for socialsubs.
2013-05-14 16:49:46 -07:00
Samuel Clay
bd51fc6abb
Fixing mark as read bug for socialsubs.
2013-05-14 16:49:36 -07:00
Samuel Clay
be33aba026
Merge branch 'muserstory_remove' into circular
...
* muserstory_remove:
Removing story blurblog permalink, making it called explicitly.
Conflicts:
apps/social/views.py
2013-05-14 16:38:28 -07:00
Samuel Clay
7068119208
Removing story blurblog permalink, making it called explicitly.
2013-05-14 16:36:03 -07:00
Samuel Clay
6ebaa81ea1
Merge branch 'muserstory_remove' into circular
...
* muserstory_remove:
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-14 16:11:44 -07:00
Samuel Clay
dd6e33ac33
Merge branch 'master' into circular
...
# By Samuel Clay (2) and ojiikun (2)
* master:
Adding node group to fabfile.
Fix crash on empty use pictures.
Correcting for feedburner stupidity.
Auto-sync the feed/folder list if it has been more than 10 minutes since the last refresh.
2013-05-14 16:01:34 -07:00
Samuel Clay
43ab118a21
Merge branch 'master' into muserstory_remove
...
# By Samuel Clay (1) and ojiikun (1)
* master:
Adding node group to fabfile.
Fix crash on empty use pictures.
2013-05-14 16:01:29 -07:00
Samuel Clay
1dccb74c46
Adding node group to fabfile.
2013-05-14 16:01:26 -07:00
Samuel Clay
254c704637
Merge branch 'master' into muserstory_remove
...
* master:
Adding node group to fabfile.
2013-05-14 16:01:11 -07:00
