Commit graph

10101 commits

Author SHA1 Message Date
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
Samuel Clay
d1d5b3b644 Adding section on what you cna safely ignore when installing NewsBlur. 2015-06-22 14:17:58 -07:00
Samuel Clay
b3cc5b53e8 Adding apple touch icon. 2015-06-22 13:21:56 -07:00
Samuel Clay
a140be5ecb Adding activate_all classmethod for queued users. 2015-06-22 11:04:06 -07:00
dosiecki
7631202af0 Fix crash. 2015-06-22 03:25:33 -07:00
Mark Anderson
29c67b338b Restore footer progress throbber. 2015-06-21 22:24:26 +01:00
dosiecki
05ad4d6472 Fix read-stories re-ordering themselves while reading. 2015-06-19 16:37:58 -07:00
Samuel Clay
d90607ca6b Bumping Android to v4.3.0. 2015-06-18 18:38:28 -07:00
dosiecki
f60018db6b Fix crash. 2015-06-18 16:20:59 -07:00
Mark Anderson
cb4de5eb7a Tweak toast when social feed not available. Support navigating for reply/reply. 2015-06-18 22:32:07 +01:00
Mark Anderson
835bbd1bd3 Delete unused class 2015-06-18 22:25:30 +01:00
Mark Anderson
ea270d3834 Fix formatting of interactions and activities. 2015-06-18 22:24:52 +01:00
Mark Anderson
5d9fcd1ae8 Styling for activity details pager. 2015-06-18 21:53:33 +01:00
Mark Anderson
fc39ad21aa Initial implementation of the InteractionsAdapter. 2015-06-17 21:01:21 +01:00
Mark Anderson
c7475cccd0 Handle empty interactions list. 2015-06-17 20:29:41 +01:00
dosiecki
c7c0dcf422 Fix crash. 2015-06-17 03:15:05 -07:00
dosiecki
bbdfd417eb Merge remote-tracking branch 'upstream/master' 2015-06-15 18:05:01 -07:00
Samuel Clay
21e7f29b5d Forcing IFTTT shares to hit ceiling of 1 story per day from free users. 2015-06-15 16:59:35 -07:00
Mark Anderson
f4891f6783 Add fragment for showing interactions. 2015-06-15 23:14:00 +01:00
Mark Anderson
30bbef47a8 Merge remote-tracking branch 'upstream/master' into profile 2015-06-15 21:45:34 +01:00
Samuel Clay
27a76f5f47 Adding sailfish OS client - Sailblur. Thanks @jrutila! 2015-06-14 23:32:03 -07:00
Samuel Clay
8de7b7ff79 will renew -> paid until 2015-06-14 23:13:08 -07:00
Samuel Clay
76b93aa795 Removing dev from fabfile hosts. Also fixing db motd. 2015-06-14 22:20:47 -07:00
dosiecki
db5ca06f2d Fix crash. 2015-06-13 12:17:28 -07:00
Samuel Clay
f3c3cf3ef3 Android beta 5 for v4.3.0. 2015-06-11 22:57:14 -07:00