Samuel Clay
bc529ef99f
Merge branch 'master' into social
...
* master:
db02 -> db01.
2012-05-03 19:09:42 -07:00
Samuel Clay
7f7887c680
db02 -> db01.
2012-05-03 19:09:36 -07:00
Samuel Clay
8142087a49
Merge branch 'master' into social
...
* master:
db01 -> db02
2012-05-03 18:51:44 -07:00
Samuel Clay
8f28e8e52e
db01 -> db02
2012-05-03 18:51:40 -07:00
Samuel Clay
e02f3833ce
Deleting dupe interactions and activities around follows.
2012-05-03 18:42:32 -07:00
Samuel Clay
a428765b1e
Merge branch 'master' into social
...
* master:
Adding backup restore for psql.
2012-05-03 18:33:36 -07:00
Samuel Clay
5f167251bb
Adding backup restore for psql.
2012-05-03 18:33:29 -07:00
Samuel Clay
5d5eb2e8c9
Merge branch 'master' into social
...
* master:
Adding NEWSBLUR.reader.count_unreads_across_all_sites()
2012-05-03 13:45:05 -07:00
Samuel Clay
740cba1586
Adding NEWSBLUR.reader.count_unreads_across_all_sites()
2012-05-03 13:45:00 -07:00
Samuel Clay
3b4698514e
Adding browser speedups to socket.io
2012-05-03 13:43:18 -07:00
Samuel Clay
ac46d964f2
Merge branch 'master' of github.com:samuelclay/NewsBlur
...
* 'master' of github.com:samuelclay/NewsBlur:
Mongoengine difficulties again, forcing insert on feed pages.
2012-05-02 22:14:36 -07:00
Samuel Clay
1d580554a5
Adding logo to Original blurblogs.
2012-05-02 19:00:17 -07:00
Samuel Clay
86b6788cc2
Merge branch 'master' into social
...
* master:
Copying server settings.
Mongoengine difficulties again, forcing insert on feed pages.
Conflicts:
fabfile.py
2012-05-02 16:50:48 -07:00
Samuel Clay
c52e5c562b
Copying server settings.
2012-05-02 16:46:00 -07:00
Samuel Clay
049d75c16d
Merge branch 'master' of github.com:samuelclay/NewsBlur
...
* 'master' of github.com:samuelclay/NewsBlur:
Truncating feed title in trainer dialog.
Adding French review to press page.
2012-05-02 15:59:20 -07:00
Samuel Clay
b3bbdd6c5c
Mongoengine difficulties again, forcing insert on feed pages.
2012-05-02 15:59:06 -07:00
Samuel Clay
b0904ea0b3
Hiding context menu on sucessful share.
2012-05-02 13:29:17 -07:00
Samuel Clay
3a05ccc118
Fixing sharing by checking for active feed to re-share.
2012-05-02 13:23:54 -07:00
Samuel Clay
dc4cdddf14
Slugifying usernames for use in social urls.
2012-05-02 12:25:17 -07:00
Samuel Clay
571081ae5c
Slugifying usernames for use in social urls.
2012-05-02 12:23:12 -07:00
Samuel Clay
c19e068262
Merge branch 'master' of github.com:samuelclay/NewsBlur into social
...
* 'master' of github.com:samuelclay/NewsBlur:
Truncating feed title in trainer dialog.
Adding French review to press page.
Conflicts:
media/js/newsblur/reader/reader_classifier.js
2012-05-02 12:08:08 -07:00
Samuel Clay
9583ccee05
Doh, left in repeat reply interactions.
2012-05-02 12:06:45 -07:00
Samuel Clay
48be6d798d
Truncating feed title in trainer dialog.
2012-05-02 09:34:13 -07:00
Samuel Clay
a9bdc7e3ad
Adding French review to press page.
2012-05-02 09:22:38 -07:00
Samuel Clay
34a413b71e
Merge branch 'master' of github.com:samuelclay/NewsBlur
...
* 'master' of github.com:samuelclay/NewsBlur:
Adding send raw email link to Email Dialog. Thanks to @tylast for the idea.
Adding French review to press page.
Fixing icon fetching error when the page is corrupted.
Writing a glorious hack that forces a count of unread scores.
Trying to fix inaccurate unread counts by forcing the dirty flag and not allowing timeouts.
Removing unused cache.
Upping refresh interval a bit since every 6 seconds is a bit too much when importing new feeds.
Starred story titles, even if it kills us.
Chucking ntpd in favor of bluntly recalibrating time on VPSs.
2012-05-02 09:18:46 -07:00
Samuel Clay
9e4cea939c
Changing interactions and activities on comment reply edits.
2012-05-01 18:15:58 -07:00
Samuel Clay
aeb7accab4
Editing of replies.
2012-05-01 18:00:54 -07:00
Samuel Clay
1736c35b2f
Cleanup on social beta signup. Feedback from @jwegener.
2012-04-30 17:15:43 -07:00
Samuel Clay
89fb7a37d9
Fixing unread counts when marking stories unread in social subs.
2012-04-30 13:45:09 -07:00
Samuel Clay
64159c363c
Fixing mark_as_unread for social feeds which the user does not subscribe.
2012-04-30 13:26:20 -07:00
Samuel Clay
b417dc44a0
Preventing infinite loops on native re-shares.
2012-04-30 13:22:59 -07:00
Samuel Clay
7770e131f2
Showing re-shares. Ship it.
2012-04-30 13:05:14 -07:00
Samuel Clay
25fce20e07
Fixing bug to allow URLs to be passed around, evne if the user doesn't follow the blurblog.
2012-04-30 12:20:04 -07:00
Samuel Clay
18ffdb3920
Backend for storing reshares (sources) on shared stories. Needs front-end to supply original blog user id, as well as show the source in the comment feed.
2012-04-30 11:52:19 -07:00
Samuel Clay
71937f92d1
Adding shift+s and ctrl+enter to share and submit a story.
2012-04-27 17:44:00 -07:00
Samuel Clay
7c3b0d6991
Publishing updates to subscribers of popular shared stories.
2012-04-27 14:37:06 -07:00
Samuel Clay
78225cfe29
Finishing popular stories account. Just needs a cronjob.
2012-04-25 20:00:52 -07:00
Samuel Clay
ffaa20be66
Merge branch 'master' into social
...
* master:
Adding send raw email link to Email Dialog. Thanks to @tylast for the idea.
Conflicts:
media/js/newsblur/reader/reader_send_email.js
2012-04-25 18:19:26 -07:00
Samuel Clay
48d6633368
Adding send raw email link to Email Dialog. Thanks to @tylast for the idea.
2012-04-25 17:15:11 -07:00
Samuel Clay
1e44430698
Merge branch 'master' into social
...
* master:
Adding French review to press page.
2012-04-25 12:20:21 -07:00
Samuel Clay
121adb1cb2
Adding French review to press page.
2012-04-25 12:20:12 -07:00
Samuel Clay
7f3ec48665
Cleanup.
2012-04-25 12:18:26 -07:00
Samuel Clay
b5c5cdeda3
Merge branch 'master' into social
...
* master:
Fixing icon fetching error when the page is corrupted.
Writing a glorious hack that forces a count of unread scores.
Conflicts:
apps/reader/models.py
apps/rss_feeds/management/commands/refresh_feeds.py
fabfile.py
utils/feed_fetcher.py
2012-04-24 17:55:20 -07:00
Samuel Clay
c1b5aef983
Fixing icon fetching error when the page is corrupted.
2012-04-24 17:40:34 -07:00
Samuel Clay
d209aa5e25
Writing a glorious hack that forces a count of unread scores.
2012-04-24 17:02:55 -07:00
Samuel Clay
60eceda244
Merge branch 'master' into social
...
* master:
Trying to fix inaccurate unread counts by forcing the dirty flag and not allowing timeouts.
Removing unused cache.
Conflicts:
apps/reader/models.py
utils/feed_fetcher.py
2012-04-24 16:36:38 -07:00
Samuel Clay
2474c987c5
Trying to fix inaccurate unread counts by forcing the dirty flag and not allowing timeouts.
2012-04-24 16:34:28 -07:00
Samuel Clay
20eeef3dc9
Removing unused cache.
2012-04-24 16:00:14 -07:00
Samuel Clay
34083085cf
Sorting social feeds according to preferences.
2012-04-24 13:18:08 -07:00
Samuel Clay
0af2704627
Counting social sub feed opens (used for sorting).
2012-04-24 12:54:37 -07:00
