Samuel Clay
9711ec93d6
Merge branch 'categories'
...
* categories:
Fixing folder merge so category additions can be idempotent. Also fixing social connect size for iPhone.
Adding categories. Still needs subscription to categories being added to a user's subscription folders.
2012-08-12 18:57:33 -07:00
Samuel Clay
32ba51a775
Fixing folder merge so category additions can be idempotent. Also fixing social connect size for iPhone.
2012-08-12 18:57:29 -07:00
Roy Yang
88163bd340
housekeeping and removing old unneeded files
2012-08-12 18:50:32 -07:00
Roy Yang
07147175ca
adding in twitter facebook checks
2012-08-12 18:07:54 -07:00
Roy Yang
d74406dafe
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad
2012-08-12 16:51:05 -07:00
Samuel Clay
284c0aafbe
Fixing bug when setting autofollow_friends to false when the user has not setup any twitter/fb login details.
2012-08-12 16:50:42 -07:00
Roy Yang
3249fd3d32
FTUX google reader stuff
2012-08-12 16:50:34 -07:00
Samuel Clay
8820b9a62c
Adding categories. Still needs subscription to categories being added to a user's subscription folders.
2012-08-12 16:49:14 -07:00
Samuel Clay
8b0ecf5535
Styling share buttons.
2012-08-12 15:19:41 -07:00
Samuel Clay
c25578c335
Showing correct avatars on blurblogs.
2012-08-12 12:23:50 -07:00
Samuel Clay
4a0bab6bef
Moving slow-ass follow-back query to the end of the twitter/facebook import process, so at least we have the profile photo.
2012-08-12 11:59:39 -07:00
Samuel Clay
f2e53ed255
Merge branch 'geometric'
...
* geometric:
Merging separate task feeds tasks.
Fixing feed update times for inactive feeds to never go inadctive but to instead go into geometrically longer feed fetches.
2012-08-12 10:52:44 -07:00
Samuel Clay
9cd4879e3c
Merge branch 'master' into geometric
...
* master: (23 commits)
Changing colors on share buttons to increase sharing.
Adding logging for failed social connects.
Fixing bug in sycning twitter/facebook.
Removing scroll on iPhone social connect, used for new iPhone ftux.
Forcing re-approval on Google Reader import.
Adding feed count to google reader import endpoint.
Adding auto_active flag to reader import, for the iPad.
Adding gflags and fixing facebook website on import.
Vendored OAuth2 library + migration.
OAuth -> OAuth 2! For a better feed import experience.
Handing over url to iPad app during social connect.
Fixing intro and friend's twitter/facebook connect once and for all.
This is seriously the most f'ed typo I've commited. It pulled in extra stories after the last few had loaded using the unread-only filter.
Forcing unread recalcs on feed open. May fix a bunch of mis-calced unreads.
Moving to shared_story dates for unread counts on social subs.
Forcing unread recalcs when necessary.
Fixing mark stories as read when on socialsub.
Changing oldest unread calculation to use share date instead of story date.
Attempting to fix the unread count bug in socialsubs.
Fixing double-cpunting bug and cleaning up unread counts on friend subs.
...
2012-08-12 10:52:25 -07:00
Samuel Clay
89e917e18f
Changing colors on share buttons to increase sharing.
2012-08-12 10:52:21 -07:00
Samuel Clay
97c190e93f
Adding logging for failed social connects.
2012-08-11 21:01:33 -07:00
Samuel Clay
bef2e307be
Fixing bug in sycning twitter/facebook.
2012-08-11 20:51:12 -07:00
Roy Yang
a2cd9c2efa
FTUX for iphone
2012-08-11 18:03:28 -07:00
Samuel Clay
1e857ec345
Removing scroll on iPhone social connect, used for new iPhone ftux.
2012-08-11 17:40:35 -07:00
Roy Yang
4e6a553f4e
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad
2012-08-11 17:18:59 -07:00
Samuel Clay
28d3842776
Two sides to the share bookmarklet.
2012-08-11 17:18:35 -07:00
Roy Yang
dc107bc94e
FTUX styling
2012-08-11 16:58:03 -07:00
Roy Yang
24e414e3e4
adding in facebook and twitter buttons, styling
2012-08-11 16:43:53 -07:00
Roy Yang
c8c7ba982a
adding google reader import logic to FTUX
2012-08-11 15:16:35 -07:00
Samuel Clay
cccee1e787
Forcing re-approval on Google Reader import.
2012-08-11 15:15:00 -07:00
Roy Yang
5b64858ef5
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad
2012-08-11 15:04:47 -07:00
Samuel Clay
a0f75e6396
Adding feed count to google reader import endpoint.
2012-08-11 14:56:27 -07:00
Samuel Clay
73721f2fb7
Formatting article.
2012-08-11 14:54:44 -07:00
Samuel Clay
7aaa7b8920
Merge branch 'master' into bookmarklet
...
* master:
Adding auto_active flag to reader import, for the iPad.
2012-08-11 13:59:05 -07:00
Roy Yang
913f447d41
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad
2012-08-11 13:58:37 -07:00
Samuel Clay
5cf90ea8d0
Adding auto_active flag to reader import, for the iPad.
2012-08-11 13:56:30 -07:00
Samuel Clay
4689b47a4e
Cleaning up text on share bookmarklet.
2012-08-11 13:53:00 -07:00
Samuel Clay
8a5a5edacc
Merge branch 'master' into bookmarklet
...
* master:
Adding gflags and fixing facebook website on import.
Vendored OAuth2 library + migration.
OAuth -> OAuth 2! For a better feed import experience.
2012-08-11 11:52:15 -07:00
Samuel Clay
d31a29f477
Adding gflags and fixing facebook website on import.
2012-08-11 11:52:00 -07:00
Roy Yang
0339a731d7
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad
2012-08-11 11:19:28 -07:00
Samuel Clay
16b69dd68d
Vendored OAuth2 library + migration.
2012-08-10 23:15:30 -07:00
Samuel Clay
4892e14f29
OAuth -> OAuth 2! For a better feed import experience.
2012-08-10 23:15:16 -07:00
Roy Yang
0c3b369297
ftux
2012-08-10 21:10:32 -07:00
Samuel Clay
1a6107aace
Merge branch 'master' into bookmarklet
...
* master:
Handing over url to iPad app during social connect.
2012-08-10 19:56:51 -07:00
Samuel Clay
312857bdf8
Handing over url to iPad app during social connect.
2012-08-10 19:56:40 -07:00
Roy Yang
dd08610566
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad
...
Conflicts:
.gitignore
2012-08-10 19:29:35 -07:00
Samuel Clay
68ec38af80
Stubbing out new bookmarklet with readability script.
2012-08-10 19:20:44 -07:00
Samuel Clay
1283092c5f
Fixing intro and friend's twitter/facebook connect once and for all.
2012-08-10 19:20:08 -07:00
Roy Yang
d48b3a771e
styling for the feed detail
2012-08-10 18:10:07 -07:00
Samuel Clay
335ccfa504
This is seriously the most f'ed typo I've commited. It pulled in extra stories after the last few had loaded using the unread-only filter.
2012-08-10 16:13:14 -07:00
Samuel Clay
2a7af9d20e
Forcing unread recalcs on feed open. May fix a bunch of mis-calced unreads.
2012-08-10 14:22:51 -07:00
Samuel Clay
432a26356a
Moving to shared_story dates for unread counts on social subs.
2012-08-10 13:28:35 -07:00
Samuel Clay
0a4cb3a243
Forcing unread recalcs when necessary.
2012-08-10 13:18:54 -07:00
Samuel Clay
7046662694
Fixing mark stories as read when on socialsub.
2012-08-10 11:51:25 -07:00
Samuel Clay
04ae4239dd
Changing oldest unread calculation to use share date instead of story date.
2012-08-10 11:37:34 -07:00
Samuel Clay
7bdf4aa64e
Attempting to fix the unread count bug in socialsubs.
2012-08-10 10:35:11 -07:00
