Commit Graph

1936 Commits

Author SHA1 Message Date
Martin Fietz 8c148b738e Merge pull request #757 from mfietz/AntennaPod/version_1.1.1
Merge v1.1.1 -> develop (v2)
2015-04-18 21:40:18 +02:00
Martin Fietz 78cb1ad137 Merge branch 'develop' into AntennaPod/version_1.1.1 2015-04-18 21:37:20 +02:00
Martin Fietz f858844644 Merge branch 'version_1.1.1' of https://github.com/AntennaPod/AntennaPod into AntennaPod/version_1.1.1 2015-04-18 21:36:52 +02:00
Tom Hennen 4de4d3b606 Merge pull request #756 from mfietz/AntennaPod/version_1.1.1
Merge v1.1.1 and develop
2015-04-18 12:39:56 -04:00
Martin Fietz 512ce6ad51 Small fix 2015-04-18 16:16:45 +02:00
Martin Fietz 1bb1f0990f Prepare merge. 2015-04-18 12:44:43 +02:00
Tom Hennen 5203808f5d Merge branch 'version_1.1.1' of https://github.com/danieloeh/AntennaPod into version_1.1.1 2015-04-17 17:37:49 -04:00
Tom Hennen 6142ed7280 updated build number for new release candidate 2015-04-17 17:37:10 -04:00
Tom Hennen 4b427423b4 Merge pull request #755 from TomHennen/fix_random_crashes
Fixed some NullPointerExceptions
2015-04-17 17:36:15 -04:00
Tom Hennen 91fb7e6c2a Fixed some NullPointerExceptions
These were happening on some handsets when onPrepareOptionsMenu was getting called.

It is sometimes called before the menu is actually loaded, causing us to not find the
MenuItem we're looking for.

This solves the symptom, if not the cause.

After making this change the number of failures reported on Apkudo dropped from 20 devices to just 6.
2015-04-17 17:29:00 -04:00
Tom Hennen bf7e7d897b Merge pull request #751 from TomHennen/version_1.1.1
updating build number for 1.1.1 alpha test
2015-04-16 21:38:07 -04:00
Tom Hennen c712fcf4e2 updating build number for 1.1.1 alpha test 2015-04-16 21:18:28 -04:00
Tom Hennen beabcf4302 Merge pull request #748 from TomHennen/new_and_all_episodes
New and all episodes fixes AntennaPod/AntennaPod#741 and fixes AntennaPod/AntennaPod#742
2015-04-16 21:08:41 -04:00
Tom Hennen ffc358ee67 Merge pull request #747 from TomHennen/remember_fragment
now saving the last navigation fragment the user had loaded
2015-04-16 21:06:14 -04:00
Tom Hennen 4e9597a950 now actually using the date to figure out what is omst recent rather than just assuming it's the first 2015-04-16 20:17:09 -04:00
Tom Hennen 0420bf47f4 the most recent episode in new feeds is marked unplayed 2015-04-16 20:09:11 -04:00
Tom Hennen b0b228303c reuse listView from AllEpisodesFragment 2015-04-16 19:11:36 -04:00
Tom Hennen b721a5d35f renamed EpisodesFragment to AllEpisodesFragment 2015-04-16 19:09:26 -04:00
Tom Hennen 6d3fe6dd3e using different icon for the 'All Episodes' fragment 2015-04-16 19:04:59 -04:00
Tom Hennen 0172951d4e now properly setting the title and changed the icon for 'All Episodes' 2015-04-15 21:26:08 -04:00
Tom Hennen 78768ae9d9 now we have 'All Episodes' and 'New Episodes' 2015-04-15 21:12:19 -04:00
Tom Hennen d568150b4a now saving the last navigation fragment the user had loaded 2015-04-15 20:05:59 -04:00
Tom Hennen 6a1a9afa6b Merge pull request #735 from AntennaPod/version_1.1
Version 1.1
2015-04-12 18:11:00 -04:00
Tom Hennen 09bd600f5c Merge pull request #734 from TomHennen/gpodder_not_syncing
gpodder now properly sets the initial date for feeds
2015-04-12 15:43:47 -04:00
Tom Hennen 5a08e84913 Merge pull request #733 from TomHennen/version_1.1_strings
update strings for release 1.1
2015-04-12 15:16:53 -04:00
Tom Hennen 00e37ab582 gpodder now properly sets the initial data for feeds 2015-04-12 15:12:56 -04:00
Tom Hennen 06fff4bb16 update strings for release 1.1 closes AntennaPod/AntennaPod#708 2015-04-12 15:03:08 -04:00
Tom Hennen 001013ae9e Merge pull request #718 from mfietz/feature/forward-backward
Separate fast forward and rewind times
2015-04-10 18:15:19 -04:00
Martin Fietz 78a5700ded Some additional logging 2015-04-10 14:30:42 +02:00
Martin Fietz fd30ec8189 Set fast forward and rewind time 2015-04-10 11:10:25 +02:00
Martin Fietz 76b6ae654b Refactorings 2015-04-10 11:05:04 +02:00
Tom Hennen b44e0dde58 Merge pull request #706 from mfietz/feature/gpodder_episode_actions
Sync episode actions with gpodder, smart mark as played.
2015-04-09 19:34:23 -04:00
Tom Hennen 768f4b169b Merge pull request #720 from TomHennen/update_version
Update strings and version
2015-04-07 19:07:06 -04:00
Tom Hennen 89691019e3 updated version info 2015-04-07 19:03:57 -04:00
Tom Hennen 947657a6c9 updated translateions #708 2015-04-07 18:55:53 -04:00
Tom Hennen 94cf98dbc0 Merge pull request #719 from TomHennen/description_update
Updated market description
2015-04-07 18:52:22 -04:00
Tom Hennen 97cb4e68b5 Updated market description 2015-04-07 18:49:52 -04:00
Martin Fietz 0b4b328324 EventBus license, fixed NPE with undobar onHide(), no smarking on closing of audio player activity 2015-04-06 00:26:08 +02:00
Tom Hennen 976f308dbd Merge pull request #717 from TomHennen/persist_scroll_pos_in_new_ep_628
now persisting the scroll position for New Episodes
2015-04-05 17:52:16 -04:00
Martin Fietz e8a4bd7c11 ProGuard config, small fix 2015-04-05 23:45:28 +02:00
Tom Hennen 2a5c7e0454 now persisting the scroll position for New Episodes 2015-04-05 16:52:51 -04:00
Tom Hennen 4013707f96 Merge pull request #714 from TomHennen/fix_nav_list_icon_for_queuea
show the correct icon for queue and new episodes
2015-04-05 16:45:19 -04:00
Tom Hennen 7888ce9aae Merge pull request #716 from TomHennen/merge_master_changes
Merge master changes. There were some conflicts from master/develop that needed to be fixed. I believe this resolves them.
2015-04-05 16:45:03 -04:00
Tom Hennen f8ffc2a146 merged in changes that occured on master 2015-04-05 16:41:11 -04:00
Martin Fietz 8850c09920 QueueEvents, Queue shows undobar on removal of an item 2015-04-05 22:37:35 +02:00
Tom Hennen 7eee089bb8 Merge pull request #715 from TomHennen/update_readme_for_alpha
added information on alpha testing
2015-04-05 16:28:45 -04:00
Tom Hennen 5e38060629 added information on alpha testing 2015-04-05 16:27:43 -04:00
Martin Fietz b2a50983ef smart mark as played: media player activity, player widget, when media is changed 2015-04-05 22:12:29 +02:00
Martin Fietz fbf1d8373c Minor changes: Log, import order, small refactorings 2015-04-05 22:12:29 +02:00
Martin Fietz 3d19b939b1 Dismiss remote play actions if queued play actions for that episode are more recent 2015-04-05 22:11:19 +02:00