Commit graph

1495 commits

Author SHA1 Message Date
Samuel Clay
5ff9b16447 Trimming river URL by allowing 'f' to be used as a feed id parameter. 2013-07-15 12:26:21 -07:00
Jesper Kamstrup Linnet
f0b85ee029 Changed the read later success confirmation to use the checkmark HUD instead of an alert view. 2013-07-13 16:57:29 +02:00
ojiikun
ad58aadd98 Change save-story to use story hash. 2013-07-13 01:16:03 +00:00
Samuel Clay
ebb505e3f2 Merge branch 'offline' into ios6
* offline: (247 commits)
  Adding preferences for offline story limit and image download concurrency.
  Better next unread button min width in narrow mode.
  Fixing tooltip on Full view.
  Speeding up new user queue.
  Adding starred stories to munin.
  Showing empty explainers.
  Cleaning up starred story trimmer.
  New starred story trimmer.
  Turning off SSL verification on text importing.
  Using latest feedparser.
  Adding Xcode5-specific directories to gitignore.
  Fixing crash on iOS 7 for offline stories. Still looks like shit.
  Bumping feed blast limit from 50 to 100 stories at a time.
  Need to pass story order and read filter to sync service when refresh triggered in AllSharedStoriesReading activity
  Fixing autocomplete to not choke on missing feeds.
  Fix #351 - support oldest first/unread for viewing all shared stories and individual blurblogs
  Fixing spacebar and arrow keys for new scroll story list.
  Normaling user agents between feed/page/icon fetchers. Adding full site permalink.
  Fixing text view.
  Fixing esc key to close popovers and menus without closing current feed.
  ...

Conflicts:
	clients/ios/NSAttributedString+Attributes.h
	clients/ios/NSAttributedString+Attributes.m
	clients/ios/OHAttributedLabel.h
	clients/ios/OHAttributedLabel.m
2013-07-12 15:27:50 -07:00
ojiikun
ab4c8bea15 Switch mark-unread task to use story hash. 2013-07-12 05:11:48 +00:00
Samuel Clay
2d7171ed45 Adding preferences for offline story limit and image download concurrency. 2013-07-11 18:36:09 -07:00
ojiikun
51af802ae2 Merge remote-tracking branch 'upstream/master' 2013-07-10 23:30:42 +00:00
Samuel Clay
d2fef8f6f3 Fixing crash on iOS 7 for offline stories. Still looks like shit. 2013-07-10 16:10:19 -07:00
Samuel Clay
0eed89f985 Merge pull request #355 from manderson23/master
Android: Fix blurblogs for oldest/unread
2013-07-10 15:31:00 -07:00
ojiikun
ebc7120f54 More error handling improvements. Added developer debug mode. 2013-07-10 21:56:15 +00:00
Mark Anderson
1b7e1ae8ed Need to pass story order and read filter to sync service when refresh triggered in AllSharedStoriesReading activity 2013-07-10 22:52:39 +01:00
Mark Anderson
e05c396c4b Fix #351 - support oldest first/unread for viewing all shared stories and individual blurblogs 2013-07-10 22:47:46 +01:00
ojiikun
7aec9b5725 Merge remote-tracking branch 'upstream/master' 2013-07-10 01:04:25 +00:00
ojiikun
37ebbb4fd5 More rework of feed item list to deal with missing feeds. 2013-07-08 09:21:43 +00:00
Christopher Loessl
3dec92679a FIX: Crash on "mark as unread" 2013-07-08 03:24:02 +02:00
Samuel Clay
3482be85a9 Updating jquery UI image. 2013-07-06 06:44:48 -07:00
Samuel Clay
af0fbbdc57 Updating redis conf to work with monit. 2013-07-05 23:24:38 -07:00
Samuel Clay
53d1ed0371 Android v2.1.1. 2013-07-05 22:43:11 -07:00
ojiikun
7acea2d7b2 Fix crash when story list tries to load empty set of feeds. 2013-07-06 05:38:05 +00:00
ojiikun
e3b0ae28fa Clean up more build artifacts that got checked in. 2013-07-06 05:23:20 +00:00
ojiikun
0833423b9d Fix dynamic instantiation of generic error responses. 2013-07-06 05:21:53 +00:00
ojiikun
b94f01ad04 Fix crash on certain types of error response. 2013-07-06 05:05:48 +00:00
ojiikun
603610a072 Removing erroniously checked-in build artifacts. 2013-07-06 00:45:30 +00:00
Samuel Clay
63bbfc8f63 Removing Reader import, adding categories. 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
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
ojiikun
a44b1410e6 Fix bad merge. 2013-07-02 09:22:09 +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
Samuel Clay
cdc62e46ce Updating styles on iOS story list to emphasize story title (thanks to @nriley for the inspiration). 2013-06-30 21:29:17 -07:00
Samuel Clay
0214725435 Correctly handling reading stories offline and updating feed unread counts, even after pull to refresh. 2013-06-29 17:28:41 -07:00
Samuel Clay
7b84d65d95 Adding training to new fast river. Ready to ship! 2013-06-28 18:30:20 -07:00
Samuel Clay
e6867732e9 Fixing provisioning profile. 2013-06-27 18:26:42 -07:00
Samuel Clay
936c62d48f Dev -> www 2013-06-27 18:20:19 -07:00
Samuel Clay
c347594251 Updating ipa 2013-06-27 18:18:38 -07:00
Samuel Clay
ca7f3f5bb7 Preparing ios 2.4 for distribution. 2013-06-27 18:07:47 -07:00
Samuel Clay
bfff777490 Moving ios and android from media to clients. 2013-06-27 09:43:22 -07:00