Commit Graph

2780 Commits

Author SHA1 Message Date
Tom Hennen e9b655b92e Merge branch 'master' into develop
Using the 'ours' strategy.
2015-11-22 11:42:20 -05:00
Tom Hennen 6dc9ca4608 Merge pull request #1402 from TomHennen/1.4.0.11
1.4.0.11
2015-11-21 08:38:45 -05:00
Tom Hennen efc11905e7 1.4.0.11 2015-11-21 08:31:44 -05:00
Tom Hennen 79f47743f9 Merge pull request #1401 from TomHennen/update_strings_2015_11_21
Update strings 2015 11 21
2015-11-21 08:30:56 -05:00
Tom Hennen 5d16e10366 add new language 2015-11-21 08:24:40 -05:00
Tom Hennen 183699e2ff added nb_NO 2015-11-21 08:12:09 -05:00
Tom Hennen 113b8df3d1 updated translations 2015-11-21 08:08:10 -05:00
Tom Hennen 2565dfc01a Merge pull request #1395 from mfietz/issue/1207-sd-card
Replace DirectoryChooser with simple dialog listing all external directories
2015-11-21 08:02:17 -05:00
Martin Fietz 87f710d381 Replace tabs 2015-11-19 18:11:11 +01:00
Martin Fietz 06cdd987e0 Replace DirectoryChooser with simple dialog listing all external directories 2015-11-19 18:03:13 +01:00
Martin Fietz 40eeb5477d Update feed download_url when redirected 2015-11-18 21:43:30 +01:00
Tobias Preuss c92e846a79 Convert line endings from CRLF to LF. 2015-11-18 11:55:30 +01:00
Tom Hennen cc326c33df Merge pull request #1389 from TomHennen/1.4.0.10
1.4.0.10
2015-11-17 18:22:34 -05:00
Tom Hennen 72cd584708 Merge pull request #1388 from TomHennen/update_translations_2015_11_17
updated translations
2015-11-17 18:20:43 -05:00
Tom Hennen dcbbdef30f 1.4.0.10 2015-11-17 17:56:30 -05:00
Tom Hennen 81617c079c updated translations 2015-11-17 17:55:26 -05:00
Tom Hennen 1ae2e822e0 Merge pull request #1387 from mfietz/issue/1386-cached-queue
Play episodes in correct order after reordering
2015-11-17 17:51:46 -05:00
Tom Hennen 645f2d4ad1 Merge pull request #1384 from TomHennen/1.4.0.9
1.4.0.9
2015-11-17 17:43:45 -05:00
Martin Fietz 0d8d804aaa Make sure the PlaybackService task manager reloads the queue 2015-11-17 21:01:23 +01:00
Tom Hennen d24e49b96b 1.4.0.9 2015-11-16 18:52:18 -05:00
Tom Hennen 4800cba021 Merge pull request #1383 from mfietz/issue/1374-1382-tlsv1
Allow TLSv1
2015-11-16 18:30:35 -05:00
Martin Fietz b970d4fb0e Allow TLSv1 2015-11-17 00:21:47 +01:00
Tobias Preuss fb48b36cf3 Removed references to former "app/dslv" submodule.
+ Follow up to commit e63e0a4f1c.
2015-11-15 16:47:46 +01:00
Martin Fietz 3768198a4b Merge pull request #1363 from mfietz/issue/1256-dark-dialogs
Dialogs: Sleep timer, Material dialogs
2015-11-14 17:36:44 +01:00
Tom Hennen fc1ac0c175 Merge pull request #1377 from mfietz/issue/1375-queue-duplicates
Fix queue ordering/duplicate issues
2015-11-12 17:45:24 -05:00
Martin Fietz 098d82da05 Don't swap, move 2015-11-12 13:22:02 +01:00
Martin Fietz 166c067194 Positions change: remember item 2015-11-12 13:21:45 +01:00
Tom Hennen 63020ec4ce Merge pull request #1371 from mfietz/issue/1370-gpodnettag
Provide Parcelable.Creator object called CREATOR
2015-11-10 19:51:22 -05:00
Martin Fietz cdd0d968cf Provide Parcelable.Creator object called CREATOR 2015-11-10 18:32:43 +01:00
Martin Fietz cea5fe708d Rating dialog 2015-11-09 22:54:30 +01:00
Martin Fietz 059ef16dc2 Fix dialog colors 2015-11-08 20:49:59 +01:00
Tom Hennen 39fc94c6f2 Merge pull request #1365 from TomHennen/1.4.0rc8
1.4.0rc8
2015-11-08 14:48:35 -05:00
Tom Hennen 8f63296fa2 1.4.0rc8 2015-11-08 14:14:52 -05:00
Tom Hennen 12f1348b15 Merge pull request #1364 from TomHennen/update_translations_2015_11_08
updated strings
2015-11-08 14:14:10 -05:00
Tom Hennen 27aab0b0a0 updated strings 2015-11-08 14:13:18 -05:00
Martin Fietz 6184b7f306 Material dialogs in preferences 2015-11-08 18:11:28 +01:00
Martin Fietz 8de90b7948 AlertDialog -> v7 AlertDialog 2015-11-08 18:05:19 +01:00
Martin Fietz 48eac2f4bc Sleep timer dialog 2015-11-08 17:52:12 +01:00
Tom Hennen c16cd623e3 Merge pull request #1362 from mfietz/issue/1360-about
About
2015-11-08 08:22:00 -05:00
Tom Hennen 02a7bf1d8a Merge pull request #1359 from mfietz/issue/1358-itemlistfragment-delete-feed
ItemFragmentList: Exception when deleting current feed
2015-11-08 08:10:40 -05:00
Martin Fietz f4d1fea87e Fix back button issue, add action bar 2015-11-08 13:44:20 +01:00
Martin Fietz 55df46ff6a Use local license and contributers files 2015-11-08 13:44:15 +01:00
Martin Fietz 3f3484b0fe What Tom said 2015-11-08 00:22:59 +01:00
Martin Fietz ff224c8852 Don't load a fragment not reachable from the drawer 2015-11-07 23:39:37 +01:00
Tom Hennen ed9387e420 Merge pull request #1357 from TomHennen/1.4.0rc7
1.4.0rc7
2015-11-07 15:50:23 -05:00
Tom Hennen 6a50149680 1.4.0rc7 2015-11-07 15:36:22 -05:00
Tom Hennen aea68acc20 Merge pull request #1356 from TomHennen/more_notification_controls
put ff and rewind buttons on the large notification.
2015-11-07 15:35:45 -05:00
Tom Hennen 3b13ff1faa missed a SuppressLint 2015-11-07 15:32:21 -05:00
Tom Hennen 42e6dffc82 also check in register and unregister. make receivers final 2015-11-07 15:28:24 -05:00
Tom Hennen 32e870aeb5 get rid of whitespace. :( 2015-11-07 15:16:37 -05:00