Mark Anderson
c81b7d9a0c
Use StoryOrder to determine sortOrder on calls into FeedProvider
2013-05-01 22:17:09 +01:00
Mark Anderson
5084949195
Merge remote-tracking branch 'upstream/master' into storyorder
2013-04-30 22:57:21 +01:00
Samuel Clay
1024db2295
Merge branch 'master' into circular
...
# By ojiikun (3) and others
# Via Samuel Clay (3) and ojiikun (1)
* master:
Upping ulimit file descriptor limits.
README.md typo fixes
newline at end of readme
Fix duplicate appearance of All Stories heading.
Revert "Fix NPE on login."
Fix NPE on login.
2013-04-30 10:28:45 -07:00
ojiikun
6dcceba7ba
Fix duplicate appearance of All Stories heading.
2013-04-30 02:59:24 +00:00
Mark Anderson
cd79312d47
Specify story order when refreshing views. Hard-coded to newest.
2013-04-29 23:50:57 +01:00
Samuel Clay
4e3df85b61
Merge branch 'master' into circular
...
# By Piotr Mitros (5) and others
# Via Samuel Clay (2) and Daniel (1)
* master:
Normalizing settings.
Fixed #217 . Remove (via Newsblur) when sharing
Documented additional hack to get into the system without Stripe installed
Expanded requirements
Fixed doc. We do require a non-fake migrate as well.
Removed SES dependency for development. Fixed bug where DEVELOPMENT was used before being overridden by local_settings.py.
Added requirements.txt
2013-04-29 11:28:38 -07:00
Mark Anderson
500cc6bad5
Fixed #217 . Remove (via Newsblur) when sharing
2013-04-27 22:59:09 +01:00
Samuel Clay
86e24f78a4
Merge branch 'master' into circular
...
* master:
Android v1.3 (33).
2013-04-26 15:42:43 -07:00
Samuel Clay
ae3d16335a
Android v1.3 (33).
2013-04-26 15:42:35 -07:00
Samuel Clay
9d149ea140
Merge branch 'master' into circular
...
# By ojiikun
# Via Samuel Clay (1) and ojiikun (1)
* master:
Extra documentation on sqlite quirks.
Clear DB on upgrade. Fix DB query for all folders.
2013-04-26 11:59:49 -07:00
ojiikun
0ad5f392a8
Extra documentation on sqlite quirks.
2013-04-26 09:04:09 +00:00
ojiikun
d38a9d5275
Clear DB on upgrade. Fix DB query for all folders.
2013-04-26 07:17:09 +00:00
Samuel Clay
82b9055af5
Merge branch 'master' into circular
...
# By ojiikun
# Via Samuel Clay (1) and ojiikun (1)
* master:
Log user out if API response claims not authed.
2013-04-25 13:03:00 -07:00
ojiikun
96d0e077a2
Log user out if API response claims not authed.
2013-04-24 09:54:41 +00:00
Lance Johnson
6efd51576a
New unread count rectangle colors - #182
2013-04-23 23:25:39 -05:00
Lance Johnson
f1748e88e6
Revert "New unread count colors - #182 "
...
This reverts commit 46f41c3082
.
2013-04-23 21:26:09 -05:00
Lance Johnson
46f41c3082
New unread count colors - #182
2013-04-23 01:16:24 -05:00
Lance Johnson
c3cb21865a
Fix issue of 'marking read' or 'marking previous read' from feed story
...
list not updating feed counts correctly
2013-04-21 23:59:25 -05:00
ojiikun
5308abaeae
Fix tabbing in previous commit.
2013-04-19 10:51:34 +00:00
ojiikun
0840ca23bb
Fix folder select clauses to always include root folder. Refactor selection clauses in general.
2013-04-19 10:37:27 +00:00
ojiikun
22a6c323d2
Fix group type caching in FolderList, and much refactoring for readability therein.
2013-04-18 08:11:28 +00:00
ojiikun
1b902483d0
Remove special All Stories group and make the now-visible root folder perform it's function.
2013-04-17 10:57:16 +00:00
ojiikun
2edcabc0c9
Formalize top-level folder name workaround.
2013-04-17 00:38:13 +00:00
ojiikun
01dfc14a85
Nonfunctional refactoring in list adapter (unused vars, method visibilities, annotations).
2013-04-17 00:37:05 +00:00
ojiikun
2f9c6a27b1
Fix an initialization edge case in creating column/resource ID mappings.
2013-04-16 09:56:10 +00:00
ojiikun
3c6471bbc9
Fix regression in API to get /reader/feeds and set update_counts to true.
2013-04-16 09:53:56 +00:00
ojiikun
94a1257c56
Factor out duplicate code in APIClient to ensure parameterized GETs behave like bare GETs.
2013-04-16 09:52:28 +00:00
ojiikun
cddf0820db
Refactor FolderListFragment and associated Adapter.
2013-04-11 09:31:29 +00:00
ojiikun
d84c1b8a7b
Fix bad merge.
2013-04-11 07:12:15 +00:00
ojiikun
49e852a7cb
Merge remote-tracking branch 'upstream/master'
2013-04-11 06:38:17 +00:00
ojiikun
40664919db
Remove accidentally added swapfile.
2013-04-11 06:37:56 +00:00
ojiikun
9f9f7c59c7
Removed missing root feed workaround. Refactoring FolderListFragment for readability.
2013-04-11 06:36:40 +00:00
Lance Johnson
a77f22da10
Have RegisterProgressFragment finished via noHistory Manifest option
...
rather than hackish finish with Fragment. Improve comments
2013-04-09 23:38:00 -05:00
Lance Johnson
0d71c8ac59
Fix registration regression bug caused by #151
2013-04-09 23:16:02 -05:00
Lance Johnson
b245754710
Fix for #159 force close during add feed (auto complete) now that is is enabled
...
again
2013-04-09 22:09:08 -05:00
Mark Anderson
1dced9d1bd
Remove log call from DeleteFeedFragment
2013-04-09 22:48:23 +01:00
Mark Anderson
d5b33f68fe
Fix #140 . Delete feed now works and confirmation dialog has been added.
2013-04-09 22:45:27 +01:00
ojiikun
3ff10b9668
Clean up parsing of /reader/feeds response and work around problems with empty-named root folder.
2013-04-09 09:02:22 +00:00
ojiikun
9707b2faf2
Merge remote-tracking branch 'upstream/master'
2013-04-08 23:42:27 +00:00
Lance Johnson
cf03732817
Fix login/logout problem of old activities hanging around on back stack
...
from the previous users' session. More info in issue #142
2013-04-07 23:07:00 -05:00
ojiikun
24f54cec25
Fix NPE crash when adding new feed.
2013-04-06 20:09:14 +00:00
Samuel Clay
8b13f22a59
Upping Android to version 1.2.
2013-04-05 18:39:58 -07:00
Samuel Clay
eb98f4524e
ActionBar is part of the repo now (vendorized).
2013-04-05 17:54:22 -07:00
ojiikun
7bdd82c47d
Make initial sync on creation of Main activity folllow recommended two-step API pattern.
2013-04-05 22:08:34 +00:00
Lance Johnson
6b310ec2a3
Fix feed parsing issue when user has no feeds
2013-04-05 01:38:48 -05:00
Lance Johnson
1957583767
Fix crash when new user registers. For some unknown reason the code was
...
doing a feed pull and then always expecting folders when there obviously
wouldn't be any if the user just registered.
2013-04-05 01:20:47 -05:00
Lance Johnson
d71b0a1dc9
Merge branch 'master' of https://github.com/samuelclay/NewsBlur
2013-04-05 00:47:10 -05:00
Lance Johnson
0880486533
When login fails go back to login activity rather than previous view
2013-04-05 00:37:16 -05:00
Lance Johnson
b562f54c49
Handle new user registration error reply by informing user of issue with regiration attempt
2013-04-05 00:22:10 -05:00
Samuel Clay
92c4cc7d1a
Merge pull request #129 from manderson23/master
...
Android: Issues with SetupCommentSectionTask
2013-04-04 11:40:20 -07:00