Commit graph

10101 commits

Author SHA1 Message Date
Samuel Clay
8ad75f4bf9 Merge branch 'master' into grid
* master: (42 commits)
  Switching to new redis sessions db.
  If text fails to fetch, tapping the text button should not change the text lock.
  Fixing Feed view space bar scrolling bug where story is collapsed.
  Adding new space bar behavior to full view as well.
  Fixing space bar scrolling in list view.
  Adding 'm' keyboard shortcut to toggle read/unread.
  Shift+space goes backwards too.
  Jumping to next story when scrolling using space bar.
  Handling timeout on original page fetch.
  Fixing timeout error on PUSH. Also fixing requests error on page importing.
  Boosting timeout on analtics cleaning.
  Adding fetch original page to msharedstory.
  Fixing switching to and from text mode while still in current feed. Now to change river so that it uses text view setting from feed, not folder (unlike web).
  Cutting unneccessary logging.
  Adding user agents to logging. Reeder, Fever, Superfeedr, Old Reader, IE11.
  Adding modern android app user agent in logging.
  Switching back to original redis server for sessions while the new sessions server gets monitored.
  Adding redis sessions db.
  Making text view sticky on ios. Maybe bugs?
  Upgrading to redis 2.8.
  ...

Conflicts:
	media/js/newsblur/reader/reader_preferences.js
2015-03-11 19:04:42 -07:00
Samuel Clay
ae926d5c57 Switching to new redis sessions db. 2015-03-11 18:55:01 -07:00
Samuel Clay
9694d93538 If text fails to fetch, tapping the text button should not change the text lock. 2015-03-11 18:51:35 -07:00
Samuel Clay
c25fe7cecc Fixing Feed view space bar scrolling bug where story is collapsed. 2015-03-11 17:41:52 -07:00
Samuel Clay
441b93ce0f Adding new space bar behavior to full view as well. 2015-03-11 17:06:27 -07:00
Samuel Clay
1c3c54af5c Fixing space bar scrolling in list view. 2015-03-11 16:45:41 -07:00
Samuel Clay
98e0ff393a Adding 'm' keyboard shortcut to toggle read/unread. 2015-03-11 13:33:35 -07:00
Samuel Clay
852752c319 Shift+space goes backwards too. 2015-03-11 13:13:11 -07:00
Samuel Clay
5aae20ab8d Jumping to next story when scrolling using space bar. 2015-03-11 13:06:10 -07:00
Samuel Clay
5001ad7602 Handling timeout on original page fetch. 2015-03-11 11:50:46 -07:00
Samuel Clay
02c91bb8b0 Fixing timeout error on PUSH. Also fixing requests error on page importing. 2015-03-11 11:44:47 -07:00
Samuel Clay
0b270fe695 Boosting timeout on analtics cleaning. 2015-03-11 11:39:54 -07:00
Samuel Clay
f1782ca17e Adding fetch original page to msharedstory. 2015-03-11 11:36:41 -07:00
Samuel Clay
0a365abf73 Fixing switching to and from text mode while still in current feed. Now to change river so that it uses text view setting from feed, not folder (unlike web). 2015-03-11 11:21:59 -07:00
Samuel Clay
ee2bbacce6 Cutting unneccessary logging. 2015-03-11 10:59:13 -07:00
Samuel Clay
275551e396 Adding user agents to logging. Reeder, Fever, Superfeedr, Old Reader, IE11. 2015-03-11 10:55:17 -07:00
Samuel Clay
19fba9cbd8 Adding modern android app user agent in logging. 2015-03-11 10:47:57 -07:00
dosiecki
ad55782686 Override actionbar views for custom icon control. 2015-03-11 03:05:29 -07:00
Samuel Clay
10edceda1c Switching back to original redis server for sessions while the new sessions server gets monitored. 2015-03-10 20:40:22 -07:00
Samuel Clay
83eec45952 Adding redis sessions db. 2015-03-10 19:13:56 -07:00
Samuel Clay
95edf8c1a8 Making text view sticky on ios. Maybe bugs? 2015-03-10 18:58:23 -07:00
Samuel Clay
39fe1573f8 Upgrading to redis 2.8. 2015-03-10 13:45:15 -07:00
Samuel Clay
d6e6e6410c Fixing backups. 2015-03-10 12:02:23 -07:00
Samuel Clay
71ed8670d6 No longer relying on repo'd pymongo. 2015-03-09 18:20:49 -07:00
Samuel Clay
1a7c9f6aed Switch back to non-pubsub server. 2015-03-09 17:02:33 -07:00
Samuel Clay
2a4ec49b79 Using django-redis-sessions's settings. 2015-03-09 16:05:40 -07:00
Samuel Clay
4d91df3083 Switching sessions db. 2015-03-09 15:50:29 -07:00
Samuel Clay
b18e58d815 Switching default story layout to west from south. 2015-03-09 15:32:05 -07:00
Samuel Clay
17412b6277 Adding redis sessions backups. Also adding crontabs for backups directly to fabfile and db server creation. 2015-03-09 14:50:07 -07:00
Samuel Clay
159db6090e Using folders for backups. 2015-03-09 14:27:33 -07:00
Samuel Clay
1fac3f95c4 Prepping Text view on iOS to become sticky. 2015-03-09 14:20:45 -07:00
Samuel Clay
ad960f773d Merge pull request #667 from dosiecki/master
Android: Bugfixes and UI Tweaks
2015-03-09 15:52:54 -04:00
Samuel Clay
74fefd0fe4 Adding mark read on story titles scroll preference, defaulting to off. 2015-03-09 12:52:00 -07:00
Samuel Clay
14f0f487af Fixing failed unread sentiment opacity bug. 2015-03-09 12:11:25 -04:00
Samuel Clay
a5a61cdde1 Changing settings text. 2015-03-09 12:11:25 -04:00
ildrenchay
68f9fd7aa9 Bumping nltk to 2.0.5
due to nltk/nltk#824
2015-03-09 12:11:25 -04:00
Samuel Clay
be8cba8bd8 Adding ios preference to disable swiping of feed or story titles. 2015-03-09 12:11:25 -04:00
Samuel Clay
d7e239217d Updating inappsettingskit. 2015-03-09 12:11:25 -04:00
Samuel Clay
c0b187b115 Changing settings text. 2015-03-08 19:50:11 -04:00
Samuel Clay
4e7de87012 Merge pull request #668 from ildrenchay/master
Bumping nltk to 2.0.5
2015-03-06 15:00:17 -05:00
ildrenchay
d4888604c9 Bumping nltk to 2.0.5
due to nltk/nltk#824
2015-03-05 00:08:05 +02:00
Samuel Clay
5ded641d26 Adding ios preference to disable swiping of feed or story titles. 2015-03-03 15:57:08 -05:00
Samuel Clay
66a421b7b3 Updating inappsettingskit. 2015-03-03 15:56:32 -05:00
dosiecki
a2807aa8cd Actionbar icons for reading views. 2015-03-02 15:14:54 -08:00
dosiecki
0ab0d615bb Fix async crash. 2015-03-02 14:58:25 -08:00
dosiecki
94091bb4e6 Add a loading throbber to the empty-list-view that matches the footer throbber. 2015-03-02 14:57:45 -08:00
dosiecki
7545b3a489 Add a loading throbber to the empty-list-view that matches the footer throbber. 2015-03-02 13:58:46 -08:00
dosiecki
ba7516db93 Comment about actionbar images. 2015-03-02 13:10:49 -08:00
dosiecki
2e41ec2d39 Better loading of actionbar icons. 2015-03-02 13:05:17 -08:00
dosiecki
107c9c8f0b Merge remote-tracking branch 'upstream/master' 2015-02-28 13:09:06 -08:00