lp:~cmiller/ubuntuone-android-music/last-fm-scrobbling

Branch merges

Merged into lp:ubuntuone-android-music at revision 452

Ubuntu One hackers: Pending requested 2010-10-06

Diff: 202 lines (+80/-2)

6 files modified

assets/html/en/index.html (+12/-0)
res/values/strings.xml (+3/-0)
res/xml/settings.xml (+10/-0)
src/net/sourceforge/subsonic/androidapp/activity/SettingsActivity.java (+4/-1)
src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java (+31/-0)
src/net/sourceforge/subsonic/androidapp/util/Constants.java (+20/-1)

api

Merged into lp:~scottwferg/ubuntuone-android-music/last-fm-scrobbling at revision 448

Scott Ferguson: Approve on 2010-10-07

Ubuntu One hackers: Pending requested 2010-10-06

Diff: 47 lines (+14/-2)

3 files modified

assets/html/en/index.html (+12/-0)
res/values/strings.xml (+1/-1)
src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java (+1/-1)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

448. By Chad Miller on 2010-10-06

Fix a possible null dereference.

Add help text and clarify the setting description.

447. By Scott Ferguson <scott@scott-laptop> on 2010-10-06

Only set song information if it's available, otherwise just mark the scrobble as complete

446. By Scott Ferguson <scott@scott-laptop> on 2010-10-06

Add client preference to enable/disable scrobbling

445. By Scott Ferguson <scott@scott-laptop> on 2010-10-06

Refactor and work with all play states

444. By Scott Ferguson <scott@scott-laptop> on 2010-10-06

Initial rough hack using Simple Last.fm Scrobbler API

443. By Chad Miller on 2010-10-01

merge trunk and 1.0-1 branch.

442. By Chad Miller on 2010-09-30

Bump version for official release.

441. By Chad Miller on 2010-09-29

Totally foolhardy attempt at mechanical translation of Chinese. I know
I have the right sentences replaced, and I suspect that the "Try again later."
will be close, but there's probably some politeness level I neglect that means
I insult every reader's ancestors from Confucious to Great Teacher to Kwai
Chang Caine.

For this transgression, I offer this heartfelt apology: Yeah, sorry, mmkay?

440. By Chad Miller on 2010-09-29

Don't ask to check server settings, because they may be hidden.

THIS NEEDS TRANSLATION.

439. By Chad Miller on 2010-09-29

Unset debug configuration.