Commit graph

9625 commits

Author SHA1 Message Date
Samuel Clay
a856a21e7c Adding export csv. 2015-07-14 16:20:46 -07:00
Samuel Clay
0711ba124d Whoops, forgotten import. 2015-07-09 20:09:35 -07:00
Samuel Clay
c538831f86 Switching free premiums to gift code based premiums. 2015-07-09 20:08:34 -07:00
Samuel Clay
48949f22a7 Deleting old shared stories by free users no longer using the service. 2015-07-09 18:03:30 -07:00
Samuel Clay
969113c52e New task image. 2015-07-09 15:17:16 -07:00
Samuel Clay
d8d5a33717 River needs to ignore classifiers from social feeds. 2015-07-09 11:22:01 -07:00
Samuel Clay
45a6243bfd Handling youtube feed brokenness. 2015-07-07 13:40:22 -07:00
Samuel Clay
e446103392 Handling broken youtube feeds. 2015-07-07 13:37:07 -07:00
Samuel Clay
82fbccd1c2 Handling invalid urls for icons. 2015-07-07 13:35:00 -07:00
Samuel Clay
b27590506c Fixing notuniqueerrors. 2015-07-07 13:34:06 -07:00
Samuel Clay
94ce13183b Handling requests issue with too many redirects. 2015-07-07 13:30:46 -07:00
Samuel Clay
469e591bde Handling missing shared story when liking a comment. 2015-07-07 13:28:43 -07:00
Samuel Clay
a849e20209 Missing semicolon. 2015-07-07 09:36:40 -07:00
Samuel Clay
98c5ee9c57 Adding retry to all web calls. Hopefully I don't regret this. 2015-07-07 09:21:57 -07:00
Samuel Clay
ec066f54e9 Zgrep shouldnt use dev. 2015-07-07 08:42:15 -07:00
Samuel Clay
46b371c8a4 Updating postgres migration. 2015-07-06 19:09:13 -07:00
Samuel Clay
20e4660336 Fixing striptags to handle broken html that regex can't parse. Thanks to @zacwest for letting me know: https://twitter.com/zacwest/status/616381017130074112 2015-07-01 16:17:22 -07:00
Samuel Clay
5d26239ba2 Merge pull request #712 from manderson23/profile
Android: Unfollow from long press menu
2015-07-01 13:52:16 -07:00
Mark Anderson
e9d0b2c684 Merge remote-tracking branch 'upstream/master' into profile 2015-07-01 21:47:01 +01:00
Mark Anderson
b4aa2f9913 Remove unused imports 2015-07-01 21:46:42 +01:00
Mark Anderson
219d321ff9 Fix unfollowing a user from the long press menu (#710) 2015-07-01 21:44:00 +01:00
Samuel Clay
7246a45c94 Merge pull request #711 from dosiecki/master
Android - FS HTML5 and on-load hook
2015-07-01 13:17:07 -07:00
dosiecki
5d0ca3b247 Add on-post-load hook to webview. 2015-07-01 12:15:43 -07:00
Samuel Clay
d917fbcc47 Gifting code as first param for convenience. 2015-06-30 18:17:20 -07:00
Samuel Clay
552311517d Adding new model for gift codes. Can now use gift codes for premium accounts. 2015-06-30 16:06:10 -07:00
dosiecki
c6ff21dc91 Merge remote-tracking branch 'upstream/master' 2015-06-30 11:59:05 -07:00
Samuel Clay
647ca40c3b Merge pull request #709 from manderson23/profile
Android: Activities and Interactions
2015-06-29 13:44:35 -07:00
Mark Anderson
e6b3e4a419 Formatting 2015-06-28 22:00:19 +01:00
Mark Anderson
68d2e63d85 Merge remote-tracking branch 'upstream/master' into profile 2015-06-28 21:44:10 +01:00
Samuel Clay
5e6806e96a Logging emails during signup. 2015-06-27 10:59:06 -07:00
Samuel Clay
5b07ac9d30 Attempting to limit mailbox96/5/mailwire spammer. 2015-06-26 11:09:31 -07:00
Samuel Clay
577935dcc6 Switching 'd' to 'shift+d' for dashboard. Should be using ESC anyway. 2015-06-25 18:20:22 -07:00
Samuel Clay
5e0cd7b1a3 Android 4.3.1b1. 2015-06-25 18:20:10 -07:00
dosiecki
34a84fdd42 Cleanup custom CSS. 2015-06-25 18:14:10 -07:00
dosiecki
ca952f2f9e Re-up version num. 2015-06-24 18:53:34 -07:00
dosiecki
ba31352b5d Merge remote-tracking branch 'upstream/master'
Conflicts:
	clients/android/NewsBlur/AndroidManifest.xml
2015-06-24 18:52:15 -07:00
dosiecki
b858085183 Fit inline web content to match viewport. 2015-06-24 18:51:03 -07:00
dosiecki
95e4e123d6 Force HTML5 fullscreen compat. 2015-06-24 18:50:04 -07:00
dosiecki
4ac7732a9b Let HTML5 content/videos swap in their own views. 2015-06-24 16:50:53 -07:00
Mark Anderson
7848e1dca6 Fix crash navigating to another users shared story. 2015-06-24 23:28:01 +01:00
Mark Anderson
2b1a92fe02 Delete TODO 2015-06-24 23:01:24 +01:00
Samuel Clay
5b54077586 Adding email to activation. 2015-06-24 14:38:02 -07:00
Mark Anderson
c237a88f10 Merge remote-tracking branch 'upstream/master' into profile 2015-06-23 23:08:21 +01:00
Samuel Clay
3f95f41d31 Merge pull request #707 from dosiecki/master
Android: 4.3.0 Bugfixes
2015-06-22 18:52:49 -07:00
dosiecki
a855b2ca93 Fix su logins. 2015-06-22 18:05:07 -07:00
dosiecki
efab3e9219 Fix su logins. 2015-06-22 17:57:16 -07:00
dosiecki
50e1f0c8bf Fix on-upgrade crash. (pt 2) 2015-06-22 15:56:31 -07:00
dosiecki
f303a74d15 Fix on-upgrade crash. 2015-06-22 15:20:12 -07:00
Mark Anderson
fd7c0e8fe8 You vs username for interactions view. 2015-06-22 23:10:42 +01:00
Mark Anderson
4f7fc797d0 You vs username for strings in activities list. 2015-06-22 22:51:34 +01:00