Commit graph

6729 commits

Author SHA1 Message Date
Samuel Clay
9ac6c399cf Fixing premium option in stripe form. 2013-07-04 11:53:01 -07:00
Samuel Clay
ac35021f58 Fixing premium option in stripe form. 2013-07-04 11:43:37 -07:00
Samuel Clay
3876231e5c Partial refunds of , not -zsh.12. 2013-07-04 11:34:09 -07:00
Samuel Clay
0c484b1d2c Adding partial refunds to admin. 2013-07-04 11:29:50 -07:00
Samuel Clay
1cb9b4eec4 Showing empty story notifier instead of selecting rist story. 2013-07-04 01:10:38 -07:00
Samuel Clay
3bb6419d24 Tripling invite speed. Also fixing "o" keyboard shortcut. 2013-07-03 22:18:43 -07:00
Samuel Clay
1d9af7d610 Correcting typo. 2013-07-03 22:16:16 -07:00
Samuel Clay
39f67938ef Last few fixes for intro wizard. 2013-07-03 22:16:02 -07:00
Samuel Clay
2616114132 Stlying starred stories in intro wizard. 2013-07-03 22:16:02 -07:00
Samuel Clay
9eb7aa4d4d Temporarily disabling starred story import. 2013-07-03 22:16:02 -07:00
Samuel Clay
f30ffe12dc Changing OPML upload display entirely in intro wizard. Still need to handle uploading starred json. 2013-07-03 22:16:01 -07:00
Samuel Clay
63bbfc8f63 Removing Reader import, adding categories. 2013-07-03 22:16:01 -07:00
Samuel Clay
3957507a4d Trying to fix the favicon. 2013-07-03 22:16:01 -07:00
Samuel Clay
21dfcc91eb Fixing autocomplete. Upgrading jQuery 2.0.2 -> 2.0.3. 2013-07-03 22:16:01 -07:00
Samuel Clay
0a6499934e Upgrading to jQuery 2, removing all old migrations. Need to fix autocomplete. 2013-07-03 22:16:01 -07:00
Samuel Clay
44c2ff61bf Merge pull request #341 from ojiikun/master
Android: API Retry Logic
2013-07-03 14:26:08 -07:00
Samuel Clay
d941c994f8 Updating android to work with android studio. Version 2.1. 2013-07-03 13:05:42 -07:00
ojiikun
786999b27a Retry logic for failed API calls. 2013-07-03 08:49:31 +00:00
Samuel Clay
2c601e9435 Merge pull request #339 from ojiikun/master
Android: A Few Bugfixes
2013-07-02 17:09:51 -07:00
Samuel Clay
6ae5628d2c Taking Feed Reader off the ban list. 2013-07-02 16:55:14 -07:00
Samuel Clay
68f9d0bb38 Revert "Updating styles on iOS story list to emphasize story title (thanks to @nriley for the inspiration)."
This reverts commit cdc62e46ce.

Conflicts:
	apps/statistics/rstats.py
2013-07-02 16:55:14 -07:00
Samuel Clay
5f6bcefbbc Back to dev entitlements. 2013-07-02 16:55:14 -07:00
ojiikun
5bc24ad42b Fix bug where social folder unread count blew up when collapsed. 2013-07-02 23:43:26 +00:00
ojiikun
ceaacce28e Fix crash on comments by users with no picture. 2013-07-02 23:40:02 +00:00
ojiikun
8daca86241 Fix load loop on social reading when API returns last page. 2013-07-02 23:39:33 +00:00
ojiikun
dac141633f Fix crash on missing feed titles. 2013-07-02 23:38:50 +00:00
ojiikun
b5065e98c7 Remove crash-causing background animation. 2013-07-02 23:38:07 +00:00
Samuel Clay
e3cd9736eb Merge pull request #337 from Phoenixsong/master
Fix months_since_last_story logic
2013-07-02 15:49:33 -07:00
Samuel Clay
b94fb83a77 Merge pull request #335 from ojiikun/master
Android: Mark Unread, Better API Error Handling
2013-07-02 15:46:10 -07:00
Samuel Clay
32af8dc6fb Coloring trim. 2013-07-02 12:47:49 -07:00
Samuel Clay
a09394df16 Adding feed id to logging for read storty trimmer. 2013-07-02 12:10:46 -07:00
Samuel Clay
431ca3c648 Trimming read stories on feed unread recalc. 2013-07-02 12:08:22 -07:00
Samuel Clay
69492f9a52 Adding read story trimmer. 2013-07-02 12:02:41 -07:00
Samuel Clay
f632ab53f9 Loading twice the height of the story titles pane in List view to avoid obnoxious scrolling behavior. 2013-07-02 12:02:32 -07:00
Phoenixsong
e25dc1bb8c Fixing months_since_last_story logic
Conversion from seconds to months should be division, not multiplication
2013-07-02 10:36:16 -04:00
ojiikun
a44b1410e6 Fix bad merge. 2013-07-02 09:22:09 +00:00
ojiikun
130ceea9ad Fixing bad merge. 2013-07-02 08:58:41 +00:00
ojiikun
98ea0b4892 Merge remote-tracking branch 'upstream/master'
Conflicts:
	clients/android/NewsBlur/src/com/newsblur/network/APIClient.java
	clients/android/NewsBlur/src/com/newsblur/network/domain/LoginErrors.java
	clients/android/NewsBlur/src/com/newsblur/network/domain/LoginResponse.java
	clients/android/NewsBlur/src/com/newsblur/network/domain/Message.java
	media/android
	media/android/NewsBlur/src/com/newsblur/network/domain/LoginErrors.java
	media/android/NewsBlur/src/com/newsblur/network/domain/ResponseErrors.java
2013-07-02 08:53:47 +00:00
ojiikun
9ff983a7db Disable API response debugging. 2013-07-02 08:34:30 +00:00
ojiikun
2db5f3b6c3 More transition to the generic API response handling. 2013-07-02 08:33:25 +00:00
Samuel Clay
051c46ff11 Expiring read story keys when switching feeds. 2013-07-01 22:39:16 -07:00
Samuel Clay
7e27a24b88 Also expiring feeds on new stories. 2013-07-01 22:19:22 -07:00
Samuel Clay
2917d0b4cf Adding new redis3 host for dupe story read status and feed story status. Now with expiring read stories (that need an expunger, still). 2013-07-01 21:59:09 -07:00
Samuel Clay
02e17f1dd6 Adding better OAuth test to Google Reader import. 2013-07-01 19:17:10 -07:00
Samuel Clay
6fda0b6a35 Timing out on PuSH hubs when down. 2013-07-01 18:46:21 -07:00
Samuel Clay
dac6eefb4c Adding non-expiring key totals to rstats. 2013-07-01 18:44:01 -07:00
Samuel Clay
74ae3dc564 Adding % space for keys in redis sampler. 2013-07-01 18:22:37 -07:00
Samuel Clay
60b78a3dda Adding key space to redis stats. 2013-07-01 18:13:31 -07:00
Samuel Clay
faffa91791 Adding simple website uptime checker. 2013-07-01 16:52:21 -07:00
Samuel Clay
597cc7da68 Fixing empty folder river issue. Now loads unreads/all correctly, as well as river for all feeds when omitting feed ids. Whew. 2013-07-01 16:52:21 -07:00