Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: lfranchi/tomahawk
...
head fork: lfranchi/tomahawk
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jan 16, 2013
Tomahawk CI Automatic merge of Transifex translations 2d94ece
@muesli muesli * Fixed memleak in drag & drop operations. dffd614
@muesli muesli * Added Tomahawk::toggleFullscreen on OSX. 18ebcc1
@muesli muesli * TomahawkSettings can now store fullscreen mode. 6736c69
@muesli muesli * Added fullscreen action to ActionCollection. 6e0fb0d
@muesli muesli * Restore last fullscreen state on OSX. fbeee55
@muesli muesli * Don't use tDebug in installTranslator. c07ac1c
@muesli muesli * Fixed using tLog before Logger is initialized. dcd253f
@lfranchi Slight clean up by adding a MOUNTAIN_LION define 3c5edea
@lfranchi Add CMakeDefine, thanks domme :) e20e29c
@muesli muesli * Disable BreakPad for testing. a808037
@dschmidt dschmidt Forward declare structs as structs 7d94df1
@teo teo Hide the share action from AudioControls if there's no InfoPlugin that
can be used to share a track.
acf3242
@lfranchi Blind try to fix mystery osx crash c1ea6d7
@jefferai jefferai Safer thread stopping, should fix an assert 0c68f55
Commits on Jan 17, 2013
Tomahawk CI Automatic merge of Transifex translations e20d8c9
@muesli muesli * Don't crash in StreamConnection without m_iodev. 09a177e
@muesli muesli * Only check iodev when available. 8521f88
@dschmidt dschmidt Fix in-source build 3d94dc1
@teo teo Fix jumpy scrolling in Account Settings. e7014ca
@teo teo Not just on X11 b0d1e38
@muesli muesli Don't change scroll steps on OSX. d8a47f7
@muesli muesli Revert "* Disable BreakPad for testing."
This reverts commit a808037.
3bf1447
@muesli muesli * Update version to 0.6.99. a7f6a6e
@jefferai jefferai Finish the work begun in 0c68f55 to make scanning more thread-safe 8ea6d2d
@jefferai jefferai Add area to gitignore b24d5e1
@jefferai jefferai Find TH account dir if available, and compile websocketpp 6314436
@dschmidt dschmidt Add testing framework fe4c754
@jefferai jefferai Update in-tree-building TH account stuff bfe59af
@jefferai jefferai Remove external TH account info 83e3ed2
Commits on Jan 18, 2013
@dschmidt dschmidt Create hopefully rather sane TomahawkConfig.cmake 22c3051
Tomahawk CI Automatic merge of Transifex translations a30f1f9
@dschmidt dschmidt Set SOVERSION of libtomahawk to current Tomahawk version, we won't gi…
…ve any ABI guarantee in the foreseeable future
79fff5c
@dschmidt dschmidt Revert searching for specific Boost components 7e7ee84
@muesli muesli * Fixed comment typo. I can't get more pedantic than that, promised. 62f540f
@muesli muesli * Don't crash after d&d operation. f56c9d7
Commits on Jan 19, 2013
Tomahawk CI Automatic merge of Transifex translations bf9701e
@muesli muesli * Style fixes for AccountManager. 8ef825a
@muesli muesli * Try to fix search field behaviour on OSX. c3fb3df
@muesli muesli * Fixed compiling on OSX. 3737c25
@muesli muesli * Don't let NSSearchField grab Cmd + A. 13bee7f
Commits on Jan 20, 2013
Tomahawk CI Automatic merge of Transifex translations 2f9b607
@muesli muesli * Always set the correct foreground / background colors for QueryLabel. bce56f2
@muesli muesli * QueryLabel doesn't support setTextPen any longer. da0664d
@muesli muesli * Always set a black foreground color for QueryLabels in AudioControls. 994f594
@muesli muesli * No need to check for HEADLESS in a widget. 6023966
@muesli muesli * Fixed now playing icon being squeezed in Charts delegate. e0b31b0
@teo teo PlayableModel has icon(), let's use it. e724b14
Commits on Jan 21, 2013
Tomahawk CI Automatic merge of Transifex translations 73977f5
@muesli muesli * Fixed track hover rect in sidebar. e6b3884
@muesli muesli * Updated ChangeLog. 28de1cd
@muesli muesli * Remove code which seems to cause painting issues with some styles. 391f995
Commits on Jan 22, 2013
Tomahawk CI Automatic merge of Transifex translations 563daab
Commits on Jan 23, 2013
Tomahawk CI Automatic merge of Transifex translations 5599c9b
Commits on Jan 24, 2013
@dschmidt dschmidt Fix the gazillion of JABBER error: messages 712561a
Tomahawk CI Automatic merge of Transifex translations 362bf64
@dschmidt dschmidt Automatically fill in server name b5d1f8a
@dschmidt dschmidt Be more responsive about adding contacts d3bd359
@dschmidt dschmidt Show connection erros in JobStatusView as well 61e83c8
@dschmidt dschmidt Fix more duplicated signal/slot connections that lead to gazillions o…
…f error messages
05ffd9c
@dschmidt dschmidt Fix runtime warnings b01544c
@dschmidt dschmidt Introduce AccountConfigWidget type for handling errors later on 724f92e
@dschmidt dschmidt Refuse to close config dialogs with OK if settings are invalid e750ea4
@dschmidt dschmidt Check for a valid xmpp id in the config widget 809330c
@dschmidt dschmidt I am an idiot hahahahaha (Correct cherry-pick fail) e345a42
@hugolm84 hugolm84 Charts: Add DjShop.de 96c5e7e
@hugolm84 hugolm84 Remove extra debug 859a398
@hugolm84 hugolm84 Set correct name 6ba5c3c
@hugolm84 hugolm84 Keep the correct url. 0fea002
@hugolm84 hugolm84 Ouch, a typo! 2853e05
Commits on Jan 25, 2013
Tomahawk CI Automatic merge of Transifex translations be2e147
@dschmidt dschmidt Comment out (hopefully) unneccessary assert cfe88c1
Commits on Jan 26, 2013
Tomahawk CI Automatic merge of Transifex translations 639ea4c
@teo teo Add license header to Tomahawk.js, attribution from git blame and log. 1ab26bb
@zizzfizzix zizzfizzix Update liblastfm URL in CMake output c5d8ca0
@muesli muesli Merge pull request #154 from zizzfizzix/patch-1
Update liblastfm URL in CMake output
3941a61
Commits on Jan 27, 2013
@dschmidt dschmidt Fix crash in claimOffer() 9e94594
@muesli muesli * Turned ugly if/else into a switch. 835e64f
@Horrendus Horrendus Implement genreradio (still buggy & needs https://github.com/Horrendu… 6635b08
@Horrendus Horrendus fix strange Bug with QComboBox d4c7e8c
@Horrendus Horrendus stylefix 5389a4c
@Horrendus Horrendus port Genre, Styles & Moods data in EchonestGenerator from data file t…
…o TomahawkCache
f3df501
@Horrendus Horrendus style fixes in EchonestControl & EchonestGenerator 3c8f3b1
@Horrendus Horrendus bump TOMAHAWK_SETTINGS_VERSION & write upgrade code (to remove file e…
…chonest_stylesandmoods.dat)
643d71f
@muesli muesli * Re-introduce the asserts in Servent. They must not happen. 168c4f7
@muesli muesli * This should fix crashes / asserts in Servent. 1fad16f
@muesli muesli * Added swedish desktop file translation. c6b4287
@rockymontana rockymontana * Continued swedish desktop file translation. 6e88551
@muesli muesli Merge pull request #155 from rockymontana/patch-2
* Continued swedish desktop file translation.
c706d7b
@dschmidt dschmidt Fix setting of own avatar in sip plugins ca01627
@dschmidt dschmidt Make source->username() always return a dbid (also for LocalSource) 3b65d7b
@dschmidt dschmidt Easier API is easier 1032cb5
@dschmidt dschmidt Streamline API: source->userName() -> source->nodeId() d8f6378
@dschmidt dschmidt Streamline API: SipInfo::uniqname() -> SipInfo::nodeId() 9046079
Commits on Jan 28, 2013
Tomahawk CI Automatic merge of Transifex translations 78c2a2e
@dschmidt dschmidt Add dbFriendlyName to Source as fallback if the normal friendlyname i…
…s not available
76b21e3
@dschmidt dschmidt Add contactId to PeerInfo and use it as connection name/dbfriendlyname 537336a
@dschmidt dschmidt Fallback from Source::friendlyName() to dbFriendlyName() to nodeId() 009c06f
@dschmidt dschmidt Move Source::nodeId() implementation into cpp file 6dc053a
@dschmidt dschmidt Don't set dbFriendlyName if it's empty 7cfce98
Commits on Jan 29, 2013
Tomahawk CI Automatic merge of Transifex translations 9a1656b
@lfranchi Add debug for version checks 9c1673b
@lfranchi Sync server data and do upgrade checks on either completion 54d5207
@lfranchi Remove debug again, bug squashed c0e77ac
@muesli muesli * Some more Servent cleanup. 03fd8cc
@muesli muesli * Some XmppSip cleanup. fb4a22d
@muesli muesli * Support WavPack files. To be tested. 6b83da4
@lfranchi Add debug for version checks 3342997
@lfranchi More debug 22985a1
Commits on Jan 30, 2013
Tomahawk CI Automatic merge of Transifex translations e2ef8e5
@dschmidt dschmidt Show nicknames from roster instead of xmpp ids 6b7e0e8
@dschmidt dschmidt Mooaar debug output in the source tooltip a20ad44
Commits on Jan 31, 2013
Tomahawk CI Automatic merge of Transifex translations c2aea47
Commits on Feb 01, 2013
Tomahawk CI Automatic merge of Transifex translations 279c885
@teo teo Fix scrolling in grid view. 4ad22a8
Commits on Feb 02, 2013
@xhochy xhochy Urlencode Spotify URLs to open playlist encoded in Apps links c4b734f
@xhochy xhochy Fix coding style 23fe2de
@hugolm84 hugolm84 Merge pull request #157 from xhochy/feature/support-sharemyplaylist-s…
…potify-urls2

Urlencode Spotify URLs to open playlist encoded in Apps links
cc05ece
Commits on Feb 03, 2013
Tomahawk CI Automatic merge of Transifex translations 1c5671d
Commits on Feb 04, 2013
@teo teo Initial commit for scriptable collection. Just a stub. 9b4eef0
@teo teo Remove cruft and fix includes. 6138ea1
@teo teo Add capabilities support to ScriptResolver and QtScriptResolver. 43ae736
@teo teo Have browsable resolvers return a collection. c705676
@teo teo Note to self. e36d929
@teo teo Saner check for db collection. 28e6813
@teo teo Rename Source::collection() to Source::dbCollection(). a767b7a
@teo teo Added debug UI. 3500195
@teo teo Added support for showing multiple collections in a SourceItem. 32780f7
@teo teo Have SourceList populate the local source with ScriptCollections. df5fa2c
@teo teo Use resolver's icon in ScriptCollections. 3ee8555
@teo teo How about these? db60026
@teo teo Remove debug button. fb0de1d
@teo teo Route (almost) all artists/albums/tracks requests through Collections. 65741c3
@teo teo Have collections provide some strings of their own. 3a805cb
@teo teo Added artists/albums/tracks support in tomahawk.js cb7c646
@teo teo Artists fetching support in scriptcollection. ad1e057
@teo teo Fix collection page icons. 7f73c07
@teo teo Support albums in scriptcollection. 29cdcec
@teo teo Add tracks to ScriptCollection. 9c5118c
@teo teo Fix after borked rebase. 4a2fd14
@teo teo Fixed duplicate tracks. But why do they happen? 4777a64
@teo teo Replace stupid fix for track dupes in ScriptCollection with a real one. c6cb208
@teo teo We're pretty sure the results from Subsonic are good. 1e8767f
@teo teo Move all resolver-related classes to libtomahawk/resolvers 606ecb5
@teo teo Move Collection.{h,cpp} to its own directory. 0e566bc
@teo teo Experimenting with ScriptCommands, added ScriptCommand_AllArtists. 1c3941c
@teo teo Added timeout support to ScriptCommandQueue. 3da3969
@teo teo Added ScriptCommand_AllAlbums. 48c56e8
@teo teo Added ScriptCommand_AllTracks. 6c5ad05
@teo teo Do not report the same tracks multiple times. 05c04d0
@teo teo Fix typo. 7ad402b
@teo teo Make sure we eliminate all references to finished ScriptCommands. c9e7730
@teo teo Obsolete comment is obsolete. 4aa8436
@jherskowitz jherskowitz Cleanup Dock icons 63d18ce
@teo teo Make thread safe (I think). 90774b4
@teo teo Don't fail on timeout. ec4fe9b
Commits on Feb 05, 2013
Tomahawk CI Automatic merge of Transifex translations 1359ceb
@teo teo Type enum in Collection.h to make domme happy :) cc577f9
@teo teo Remove unused code. 91c866c
@teo teo Remove commented-out code. 9a8f2e3
Commits on Feb 06, 2013
@teo teo Allow some more time for slow slow Ampache. fffb006
@teo teo Synchronous responses are for n00bs, only allow async. 68d3dd6
@teo teo Style fix. 81af9b0
@teo teo No implementations in headers. a4a0cb7
Commits on Feb 07, 2013
@xhochy xhochy As stated in --help the URL should always be the last argument 615e2e4
@teo teo Instead of getting statically defined capabilities at resolver startup,
have resolvers report their actual capabilities as soon as they know
for sure they have them.
0077ca5
Commits on Feb 08, 2013
@teo teo Merge pull request #158 from tomahawk-player/scriptcollection-ng
ScriptCollection support. Please test.
cd6bdc9
@teo teo Make compile. caa1b65
@muesli muesli Merge pull request #160 from xhochy/fix/url-argument-position
As stated in --help the URL should always be the last argument
df4e919
Commits on Feb 09, 2013
Tomahawk CI Automatic merge of Transifex translations b328033
@jherskowitz jherskowitz Inbox icon for Teo 6bc1e3c
Commits on Feb 10, 2013
Tomahawk CI Automatic merge of Transifex translations 115c883
Commits on Feb 11, 2013
@xhochy xhochy Remove unused bundled quazip from thirdparty 8bf7534
@lfranchi Merge pull request #161 from xhochy/fix/twk-563
Remove unused bundled quazip from thirdparty
4e5343a
@Horrendus Horrendus Merge pull request #153 from tomahawk-player/genreradio
Implement genreradio
f24e593
Commits on Feb 12, 2013
Tomahawk CI Automatic merge of Transifex translations 9f2149f
Commits on Feb 13, 2013
Tomahawk CI Automatic merge of Transifex translations 461f650
@xhochy xhochy Make D-Bus call in fdonotify asynchronous 6759f6c
@zizzfizzix zizzfizzix Change hyphens to dashes in desktop file f236dc4
@zizzfizzix zizzfizzix Add Polish description entries to desktop file 5565845
@muesli muesli Merge pull request #164 from zizzfizzix/desktop
Desktop file changes
6a10b5e
@xhochy xhochy Determine the notification icon size on the default font height. 93b06e5
@xhochy xhochy Remove unused includes f25608f
@muesli muesli Merge pull request #165 from xhochy/feature/dynamic-notification-icon…
…-sizes

Determine the notification icon size on the default font height.
006ae8b
Commits on Feb 14, 2013
Tomahawk CI Automatic merge of Transifex translations 862f684
@muesli muesli * Support https urls in Servent. b6361ab
@muesli muesli * Properly detect the correct UPnP InternetGateway device. 78e0475
@muesli muesli * Style cleanups. 176a9c8
Commits on Feb 15, 2013
@teo teo Move ScriptCollection items to their own top-level category. 1bf5787
@teo teo Don't crash when readding a resolver with ScriptCollection. 6f1a5d3
Commits on Feb 16, 2013
Tomahawk CI Automatic merge of Transifex translations 684aa65
@muesli muesli * Bumped libechonest requirement to 2.0.3. 677bf09
@muesli muesli Revert "* Bumped libechonest requirement to 2.0.3."
This reverts commit 677bf09.
b2b1ff1
Commits on Feb 17, 2013
@teo teo Added proper ScriptCollection items, with delegate.
Showing collection info.
13b5a3c
@teo teo Fix description elision. d97a530
@teo teo Fix delegate to paint ScriptCollections nicely when selected. 74432a8
@teo teo Added description support to Collection, and fixed header text. 55d8896
Commits on Feb 18, 2013
Tomahawk CI Automatic merge of Transifex translations 1002b5f
@jherskowitz jherskowitz Refresh icon 3c95d57
@hugolm84 hugolm84 Update headers in QtScriptResolver a5f2b0e
@teo teo Separate filter from FlexibleHeader, give collections their own header. 76044bd
@teo teo Added ScriptCollection refresh support. Also new header. d7d15ed
Commits on Feb 19, 2013
Tomahawk CI Automatic merge of Transifex translations 7bfa6cc
@teo teo Added tooltip. 10b84c8
@Horrendus Horrendus only load genre/style/mood from cache if it is empty 6e3b374
Commits on Feb 20, 2013
Tomahawk CI Automatic merge of Transifex translations 75537b9
@hugolm84 hugolm84 SpotifyParse fix 35a3511
@jefferai jefferai Namespace the other account resource files as well 6883787
@jefferai jefferai Update CMakeLists.txt text 221a038
Commits on Feb 21, 2013
@xhochy xhochy Remove qt-module from include path and add more distinctive name for …
…callback
0a0b371
@jefferai jefferai Add some variables in preparation for eventual per-source weighting 4c300f2
Commits on Feb 22, 2013
Tomahawk CI Automatic merge of Transifex translations 4708c61
@jefferai jefferai Merge pull request #162 from xhochy/feature/fdonotify-dbus-async-reply
Make D-Bus call in fdonotify asynchronous
7ef99d3
Commits on Feb 23, 2013
Tomahawk CI Automatic merge of Transifex translations 50376bc
@teo teo Fix what I assume is a typo. 2ec2e65
Commits on Feb 24, 2013
Tomahawk CI Automatic merge of Transifex translations 6d788a0
@xhochy xhochy Style notifications if the window manager supports it. 73e00e2
@xhochy xhochy Style album message 689d97d
@muesli muesli * Print out a warning and abort when trying to enqueue a DatabaseComm…
…and before Database is ready.
3142e85
@muesli muesli * Make sure our private markAsReady method is connected (and hence ca…
…lled) first. Log a message when db is ready.
400f52d
@muesli muesli * Don't let RecentPlaylistsModel try to load stuff before we're ready. 1f4e010
@muesli muesli * Log database commands in verbose mode. 05e89b0
@xhochy xhochy More translator friendly string formatting
* Add escaping of supplied strings since they may interfere with the
  xml-based markup.
971e843
@muesli muesli * Fixed missing copyright header. dacd294
Commits on Feb 25, 2013
Tomahawk CI Automatic merge of Transifex translations b4eee71
@teo teo Add stylesheet to refresh scriptcollection button. 45f268e
@teo teo Basic ScriptCollection filtering support. 781a014
Commits on Feb 26, 2013
Tomahawk CI Automatic merge of Transifex translations d046077
@teo teo Implement track count for ScriptCollections. 232c667
Commits on Feb 27, 2013
Tomahawk CI Automatic merge of Transifex translations b947c25
Commits on Mar 02, 2013
@muesli muesli * Nicer cmake output. b714481
@muesli muesli * Style cleanup. 7d0589e
@muesli muesli * Building with BUILD_WITH_QT4 forces building with Qt4. b18fac9
@teo teo Properly remove ScriptCollection ViewPages to prevent crash. c4fbcdf
Commits on Mar 05, 2013
@jefferai jefferai Add necessary hooks for hatchet dbcmd syncing 9d82781
@teo teo Allow resolvers to set a prettyName for their ScriptCollections. 7f82799
@teo teo Allow script resolvers to choose icons for their scriptcollections. 5364dfa
@teo teo Fix ghost ScriptCollections on config change and potential crashes. dbf340f
Commits on Mar 06, 2013
Tomahawk CI Automatic merge of Transifex translations 372ab89
@jefferai jefferai Remove change from yesterday, as apparently m_lastCmdGuid doesn't do …
…what I thought it does for local sources
2b63e6e
@teo teo Fix typo. 3dd1db1
Commits on Mar 13, 2013
Tomahawk CI Automatic merge of Transifex translations 20bfb48
Commits on Mar 18, 2013
Tomahawk CI Automatic merge of Transifex translations 9f96902
@muesli muesli * Fixed typo in error message. 11c0fd6
Commits on Mar 19, 2013
Tomahawk CI Automatic merge of Transifex translations 1434cee
@muesli muesli Merge pull request #166 from xhochy/feature/fdonotify-use-capabilities
Style notifications if the window manager supports it.
cb0abd9
@muesli muesli * Some FdoNotifyPlugin cleanups. 796df66
@lliehu lliehu Add context for placeholders in 3 UI messages added recently 7980118
@muesli muesli Merge pull request #171 from lliehu/add-context
Add context for placeholders in 3 UI messages added recently
f3b04a0
Commits on Mar 20, 2013
Tomahawk CI Automatic merge of Transifex translations 25b0756