Samuel Clay
86afe923ca
Merge pull request #260 from ojiikun/master
...
Android: UI Redesign Cleanup
2013-05-23 15:18:45 -07:00
Mark Anderson
604954dd59
Add story order menu item and dialog for feed and folder views
2013-05-23 23:07:30 +01:00
Mark Anderson
4b0f926b89
More changes for using story order/read filter from preferences
2013-05-23 22:01:51 +01:00
Mark Anderson
5a7a74f56a
Merge remote-tracking branch 'upstream/master' into storyorder
2013-05-23 20:26:18 +01:00
ojiikun
a7ee2afd01
Cleanup more orphaned files and resources from redesign.
2013-05-23 07:05:45 +00:00
ojiikun
1185b37790
Remove corner radius on favicons on the feed list.
2013-05-23 06:20:05 +00:00
ojiikun
e20dc57c06
Make share/save buttons horizontal on reading pane.
2013-05-23 06:04:06 +00:00
ojiikun
a1973b4035
Proper gradient for selection background.
2013-05-23 04:06:12 +00:00
ojiikun
a80a426d8d
Remove orphaned file.
2013-05-23 01:09:18 +00:00
Samuel Clay
1f349779a2
Android update.
2013-05-22 16:41:13 -07:00
Mark Anderson
b71c7066e5
Merge remote-tracking branch 'upstream/master' into storyorder
2013-05-21 22:35:51 +01:00
Mark Anderson
c9bd7b7a66
Update activities to use StoryOrder/ReadFilter values from preferences
2013-05-21 22:34:14 +01:00
ojiikun
5c3114b18e
Add a border b/t the intel selector and feed/folder list.
2013-05-21 07:21:20 +00:00
ojiikun
4eef94fcea
Change activation colour for rows to yellow.
2013-05-21 06:45:30 +00:00
ojiikun
0d99487c8d
Switch to new dot icons, fix overlap in list view.
2013-05-21 06:29:29 +00:00
ojiikun
a2c82a6853
Remove orphaned drawables.
2013-05-21 03:50:42 +00:00
ojiikun
36a61a1675
Merge remote-tracking branch 'upstream/circular' into circular
2013-05-21 02:46:04 +00:00
ojiikun
31953cb984
Fix button size and styles on reading view and profile view.
2013-05-21 02:28:55 +00:00
Samuel Clay
f0b0c0c71a
Merge pull request #254 from ojiikun/circular
...
Android: More Progress To New UI Style
2013-05-20 17:54:11 -07:00
ojiikun
d5d6ad224e
Remove most of old blue/orange colour scheme.
2013-05-21 00:47:13 +00:00
Mark Anderson
e161b3a6a7
Add ReadFilter enum to be used in API calls for all/unread
2013-05-20 23:46:43 +01:00
Mark Anderson
cb3c206adc
Fix #191 - mark folder/feed/all stories read via action bar
2013-05-20 22:44:05 +01:00
ojiikun
ddf842bb40
Remove orange-themed borders.
2013-05-20 02:42:34 +00:00
ojiikun
2b27555816
Change top/bottom bars to new theme.
2013-05-20 02:11:30 +00:00
Mark Anderson
22852dddcf
Merge remote-tracking branch 'upstream/master' into storyorder
2013-05-18 16:21:46 +01:00
ojiikun
9f422f9e3e
Reverse gradient colours for folder bars.
2013-05-17 23:35:45 +00:00
ojiikun
0ebb770f17
Fix BG colour of feed rows in Main act.
2013-05-17 22:36:52 +00:00
ojiikun
4e1008a6b5
New group icons and row bg colors.
2013-05-17 20:45:34 +00:00
ojiikun
f1061b2cc1
New folder icons.
2013-05-17 18:59:39 +00:00
ojiikun
a9d97ce734
Remove intel select on story list.
2013-05-17 17:35:42 +00:00
Samuel Clay
dd6e33ac33
Merge branch 'master' into circular
...
# By Samuel Clay (2) and ojiikun (2)
* master:
Adding node group to fabfile.
Fix crash on empty use pictures.
Correcting for feedburner stupidity.
Auto-sync the feed/folder list if it has been more than 10 minutes since the last refresh.
2013-05-14 16:01:34 -07:00
ojiikun
0b0cdc1666
Fix crash on empty use pictures.
2013-05-14 17:34:09 +00:00
ojiikun
eae68d0005
Auto-sync the feed/folder list if it has been more than 10 minutes since the last refresh.
2013-05-13 22:12:31 +00:00
Samuel Clay
cd83589fca
Merge branch 'master' into circular
...
# By ojiikun (3) and Samuel Clay (2)
* master:
Fixing hashes only call on folders.
Handling another unicode decode issue in uploaded OPMLs.
Make Story.read a boolean rather than an int.
Upper limit on mark-read batch size auto-flushes.
Remove forced sleep suspected of causing null activity access in fragments.
2013-05-13 13:00:04 -07:00
ojiikun
c6e9836656
Upper limit on mark-read batch size auto-flushes.
2013-05-12 12:53:00 -07:00
ojiikun
16c842550b
Remove forced sleep suspected of causing null activity access in fragments.
2013-05-12 12:53:00 -07:00
ojiikun
19cf0ac2e2
Make Story.read a boolean rather than an int.
2013-05-12 01:33:57 +00:00
Samuel Clay
3051836cd6
Merge pull request #239 from ojiikun/master
...
Android: Auto-Flush Mark-as-Read Batches at Max Size
2013-05-10 14:09:22 -07:00
ojiikun
84be7ea490
Upper limit on mark-read batch size auto-flushes.
2013-05-10 21:06:41 +00:00
Samuel Clay
8708f21027
Merge pull request #238 from ojiikun/master
...
Android: Remove Cosmetic sleep() on Login
2013-05-10 13:56:00 -07:00
Mark Anderson
a06f851740
Merge remote-tracking branch 'upstream/master' into storyorder
...
Conflicts:
media/android/NewsBlur/src/com/newsblur/activity/FeedReading.java
media/android/NewsBlur/src/com/newsblur/activity/FolderReading.java
media/android/NewsBlur/src/com/newsblur/activity/Reading.java
2013-05-10 21:34:36 +01:00
ojiikun
b12a83465e
Remove forced sleep suspected of causing null activity access in fragments.
2013-05-10 20:04:40 +00:00
Samuel Clay
769c88b7fb
Merge branch 'master' into circular
...
* master:
Android 1.3.2.
2013-05-09 17:35:41 -07:00
Samuel Clay
6a8e8e309b
Android 1.3.2.
2013-05-09 17:35:35 -07:00
Samuel Clay
a6bc5e68f4
Merge branch 'master' into circular
...
# By Samuel Clay (4) and ojiikun (1)
* master:
ES requires valid url.
Overriding haystack elasticsearch url.
Removing Redis autocomplete. Upgrading elasticsearch.
Using haystack and elasticsearch for a third autocomplete feature.
Refactor/fix mark-as-read-while-reading workflow.
2013-05-08 12:23:14 -07:00
ojiikun
35b680c0d9
Refactor/fix mark-as-read-while-reading workflow.
2013-05-08 10:09:36 +00:00
Mark Anderson
d1aa518331
More chages to use StoryOrder for sort order when calling FeedProvider
2013-05-04 21:41:56 +01:00
Mark Anderson
e5ae262f9f
Merge remote-tracking branch 'upstream/master' into storyorder
2013-05-04 21:41:08 +01:00
Samuel Clay
f3e43c3f38
Merge branch 'master' into circular
...
* master:
Another bug found by @kyleniemeyer's story. a - b was supposed to be b - a.
Fixing Global shared stories by checking for missing story hashes properly.
Using index in msharedstory search.
Using new story_hashes instead of story object ids.
Updating Android from v1.3 to v1.3.1, fixing duplicate All Site Stories bug.
Conflicts:
apps/social/models.py
2013-05-01 14:37:14 -07:00
Samuel Clay
7a5dfc9a47
Updating Android from v1.3 to v1.3.1, fixing duplicate All Site Stories bug.
2013-05-01 14:32:54 -07:00
