Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,343 Commits 23 Branches 550 Tags
Commit Graph

6343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Maguire
f103bedf5b Remove Amazon support from Changelog for now. 2016-01-14 15:28:28 +00:00
Arnaud Bienner
8579cce85c SoundCloud: add configure action to context menu 2016-01-14 00:04:36 +01:00
David Sansome
48ff15d29c Merge pull request #5200 from Chocobozzz/difm2 
show settings dialog for difm when populate streams without a premium account
 2016-01-14 07:10:13 +11:00
Chocobozzz
ef58ce27e5 show settings dialog for difm when populate streams without a premium account 2016-01-13 19:29:36 +01:00
Clementine Buildbot
3463b720c9 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2016-01-13 12:28:57 +00:00
John Maguire
ce77a0acb8 Merge pull request #5204 from paperbagcorner/mp4muxer 
Use mp4mux instead of ffmux_mp4 when transcoding to aac
 2016-01-12 16:15:31 +00:00
Mattias Andersson
d9c4e0844d Use mp4mux instead of ffmux_mp4 when transcoding to aac 2016-01-12 15:59:23 +01:00
John Maguire
c4c094aa71 Merge pull request #5193 from Chocobozzz/difm 
Disable digitally imported for free user (premium account required)
 2016-01-11 15:10:48 +00:00
Chocobozzz
3ab20defce Disable digitally imported for free user (premium account required) 2016-01-09 16:45:10 +01:00
Andreas
bca2607850 Execute global search always in main thread 
Otherwise the timer doesn't work and the invoke of the closure fails (BlockingSearchProvider::SearchAsync).
This is because Q_ARG doesn't work well with templates and "QMetaMethod::invoke: Unable to handle unregistered datatype 'Arg'" is logged.
See closure.h "void Unpack(QList<QGenericArgument>* list, const Arg& arg)" and "Closure::Call".

This change was made because global search with the network remote didn't work anymore (network remote runs in a separete thread).
 2016-01-09 15:45:11 +01:00
John Maguire
f6e7b02b7a Merge pull request #5190 from clementine-player/revert-5150-master 
Revert "Add an option to inhibit suspend while playing"
 2016-01-08 15:09:18 +00:00
John Maguire
c9b0bb2044 Revert "Add an option to inhibit suspend while playing" 2016-01-08 15:09:07 +00:00
John Maguire
70070ee0bf Geolocate over ssl. 2016-01-08 12:09:13 +00:00
John Maguire
5d868573bc Merge pull request #5153 from nicklan/savedmanager 
Add dialog for managing saved files
 2016-01-08 11:56:01 +00:00
John Maguire
d7df6263cc Merge pull request #5171 from TheUbuntuGuy/master 
Fix incorrect highlight colour in playlist when the window is inactive
 2016-01-08 11:55:07 +00:00
John Maguire
2f7626e9d3 Merge pull request #5175 from ivan-leontiev/fix-vk-dupitems 
Fix duplicate items under vk.com after login.
 2016-01-08 11:54:38 +00:00
John Maguire
36c0e6645e Merge pull request #5180 from santigl/master 
Enable Enter key shortcut in file view
 2016-01-08 11:54:07 +00:00
John Maguire
a9b5947fb0 Merge pull request #5150 from narunlifescience/master 
Add an option to inhibit suspend while playing
 2016-01-07 18:32:29 +00:00
Andreas
ab000b1ba5 Fix transcoder settings not applied for network remote 
The format was supplied, but the settings for the format was not applied when transcoding files for the network remote.
 2016-01-06 13:17:55 +01:00
Santiago Gil
3ed298a73d Enable Enter key shortcut in file view 2016-01-04 18:17:58 -03:00
Clementine Buildbot
3271c06d10 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2016-01-04 10:00:40 +00:00
David Sansome
1f864f3522 Use %{?dist} to get the rpm distro name, and remove the old Rpm.cmake 2015-12-31 16:02:19 +11:00
David Sansome
e869086530 Build with -fPIC on fedora, as is now required (https://fedoraproject.org/wiki/Changes/Harden_All_Packages) 2015-12-31 13:07:08 +11:00
David Sansome
3f8a6f9049 Update changelog for 1.3 2015-12-31 11:16:49 +11:00
David Sansome
a168b618d3 Rename "Import" to "Add directory" in the transcode dialog 2015-12-31 11:02:45 +11:00
Mark Furneaux
f90ca49340 Merge branch 'master' of https://github.com/clementine-player/Clementine 2015-12-29 12:00:30 -05:00
Clementine Buildbot
ef8787e461 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2015-12-28 10:00:38 +00:00
Ivan Leontiev
71247781eb Fix duplicate items under vk.com after login. 2015-12-26 01:06:17 +03:00
Mark Furneaux
041be5b4ce Fix incorrect highlight colour in playlist when the window is inactive 2015-12-24 13:42:47 -05:00
John Maguire
0a5334a52a Merge pull request #5170 from narunlifescience/patch-1 
remove sites.js.diff (this patch is already applied to site.js)
 2015-12-23 23:34:30 +00:00
Arun Narayanankutty
b15ebcd5d6 remove sites.js.diff (this patch is already applied) to site.js 
Delete sites.js.diff
 2015-12-23 13:56:51 -06:00
John Maguire
e15dec17a1 Merge pull request #5169 from santigl/master 
Disable translation of shortcuts
 2015-12-22 21:42:11 +00:00
Santi
98b042d29c Disable translation of shortcuts 2015-12-22 18:33:07 -03:00
Santiago
695dff867b Merge pull request #2 from clementine-player/master 
Update from original
 2015-12-22 17:54:46 -03:00
narunlifescience
16707f0934 move member variables only used by dbusidlehandler.cpp to anonymous namespace 2015-12-22 10:03:57 -06:00
John Maguire
0c97803f11 Merge pull request #5163 from Ede123/star_icon 
Improve the star icon of `favoritewidget`
 2015-12-22 14:28:23 +00:00
Eduard Braun
f68e4c8c87 Improve the star icon of favoritewidget 
* Use the star icon in its native size (16 px × 16 px) instead of unnecessarily scaling it down by 1 px
* Center the star icon vertically
 2015-12-21 22:25:32 +01:00
John Maguire
b3e2525170 Merge pull request #5160 from v-fox/moodbar-regression-fix 
Avoiding usage of pixelMetric because it breaks on non-Oxygen styling
 2015-12-21 18:59:41 +00:00
John Maguire
7555913b0c Merge pull request #5161 from Chocobozzz/master 
Reload playcount from tagreader only if it is set
 2015-12-21 18:48:32 +00:00
John Maguire
903a0ba8c3 Merge pull request #5162 from Ede123/start_icon 
Synchronize width of start/pause icons on playlist tabs to prevent "jumping" content
 2015-12-21 18:48:24 +00:00
John Maguire
c15a6c8ee9 Merge pull request #5166 from Chocobozzz/edit_tag_main_window 
Add error message if editing tag from playlist fails
 2015-12-21 18:47:57 +00:00
Clementine Buildbot
0f46967c00 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2015-12-21 10:00:48 +00:00
Chocobozzz
5675091816 Add error message if editing tag from playlist fails 2015-12-20 19:07:15 +01:00
Eduard Braun
1b4f2dacb6 Synchronize width of start/pause icons on playlist tabs to prevent "jumping" content 2015-12-19 19:44:22 +01:00
Chocobozzz
dfdb21cd61 Reload playcount from tagreader only if it is set 2015-12-19 19:42:52 +01:00
John Maguire
4db358aabb Merge pull request #5158 from Chocobozzz/master 
Update Changelog
 2015-12-15 11:58:11 +00:00
Chocobozzz
67a50436f4 Update Changelog 2015-12-14 19:20:46 +01:00
Clementine Buildbot
6205166823 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2015-12-14 10:00:40 +00:00
v-fox
a9f9b0ef72 Avoiding usage of pixelMetric because it breaks on non-Oxygen styling 
Partial revertion for commit "3f79fa5c651f23e48faf1af6ca56dbff9e5660ab" because of
https://github.com/clementine-player/Clementine/issues/4770
 2015-12-14 07:16:30 +05:00
David Sansome
170c64cd8b Link statically to libprotobuf from the spotifyblob 2015-12-14 00:02:07 +11:00