1
0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-30 11:04:57 +01:00

6330 Commits

Author SHA1 Message Date
Clementine Buildbot
641b597447 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer)
(cherry picked from commit 9ba41411d3776da420b9c046c37b497fa7b8a677)
2016-02-09 11:48:57 +00:00
Clementine Buildbot
bfca46e224 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer)
(cherry picked from commit ac0aff5e813b264a2fe4a7d6c28ff142831fa58c)
2016-02-09 11:48:53 +00:00
John Maguire
d92fe15123 Bump spotify lib & blob version.
(cherry picked from commit 8ef1d4cae2ddf8396f650046fa2d77d9041f8696)
2016-01-28 14:55:49 +00:00
Clementine Buildbot
5251801635 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer)
(cherry picked from commit e269cdc8ee103032b9178fd98ac55af4bd9f171c)
2016-01-27 15:30:34 +00:00
John Maguire
ffd09617ff Download spotify blob over ssl
(cherry picked from commit 9467babee478018eabfe480d0933dac79e9f9fb7)
2016-01-21 14:57:12 +00:00
Clementine Buildbot
7add34a784 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer)
(cherry picked from commit 8eec78671ff3c72a4f27b033909c19a334ff147f)
2016-01-19 12:30:10 +00:00
John Maguire
cdb89b7f60 Remove Amazon support from Changelog for now.
(cherry picked from commit f103bedf5b48104e97abc81f4454738a1cdfd191)
2016-01-14 15:28:45 +00:00
Arnaud Bienner
0972507ecc SoundCloud: add configure action to context menu
(cherry picked from commit 8579cce85cfe58df0d3c511287054efa021a3120)
2016-01-14 15:18:31 +00:00
Chocobozzz
bcd769c25a show settings dialog for difm when populate streams without a premium account
(cherry picked from commit ef58ce27e5dc4d1313153647a6d8a35f46d766db)
2016-01-14 15:18:03 +00:00
Clementine Buildbot
08e6b9092a Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer)
(cherry picked from commit 3463b720c9b38d27212ba4c6fce3f9739d52e0fd)
2016-01-13 12:30:57 +00:00
Clementine Buildbot
6ef7bfb450 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer)
(cherry picked from commit 3271c06d107faecc106985b6c317195b6728ed7a)
2016-01-13 12:30:50 +00:00
Mattias Andersson
a6e3b2210e Use mp4mux instead of ffmux_mp4 when transcoding to aac
(cherry picked from commit d9c4e0844de12c973b9d9730c59bda91a55210b4)
2016-01-12 16:16:20 +00:00
Andreas
cced6cfc49 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).

(cherry picked from commit bca26078505f8034af6da7ce73f54d0aed235f10)
2016-01-09 15:53:06 +01:00
John Maguire
dcadc98a5d Geolocate over ssl.
(cherry picked from commit 70070ee0bfa3075cc8454dd6681f213f7d5f71c7)
2016-01-08 12:14:15 +00:00
John Maguire
c1a6a771a8 Disable Amazon Cloud Drive for 1.3 release. 2016-01-06 18:25:33 +00:00
Andreas
1e9288e14d 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.

(cherry picked from commit ab000b1ba5492386c818a0e9d371481c8ed969b1)
2016-01-06 13:20:35 +01:00
David Sansome
eabe451bd4 Use %{?dist} to get the rpm distro name, and remove the old Rpm.cmake
(cherry picked from commit 1f864f3522f9705c274014e2af98c2b25dd23e5a)
2015-12-31 16:03:04 +11:00
David Sansome
6cec8e6e41 Build with -fPIC on fedora, as is now required (https://fedoraproject.org/wiki/Changes/Harden_All_Packages)
(cherry picked from commit e869086530572684000921f2abec6d96aaa7df1d)
2015-12-31 13:14:36 +11:00
David Sansome
c54ab370ff Set the version to 1.3.0 RC1 1.3rc1 2015-12-31 11:17:50 +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
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
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
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
David Sansome
ea0480f32c Don't create Versions/4/4 symlinks 2015-12-13 17:55:48 +11:00
David Sansome
5a49fa4ad0 Fix an old bug in the dmg rule 2015-12-13 16:23:35 +11:00
David Sansome
978d849164 Create .xz instead of .gz for source releases 2015-12-13 15:52:30 +11:00
David Sansome
d50cfd5293 Install frameworks into the app bundle properly so Mavericks considers them signed 2015-12-10 23:31:01 -06:00
John Maguire
1f416ccee1 Merge pull request #5148 from nicklan/master
Add ampache=1 to getAlbum for playcounts
2015-12-09 10:38:21 +00:00
John Maguire
eb62a38425 Merge pull request #5149 from narunlifescience/master
restore resized star on/off png from #5089
2015-12-09 10:36:29 +00:00
narunlifescience
84a52893b4 restore resized star on/off png from #5089 2015-12-09 04:12:54 -06:00
Arnaud Bienner
64c184c2f5 Revert "use same colors for tiny-pause & tiny start icons as that of star icons"
This reverts commit aa813fa372ff1a4cd14a13c77c774e036668dad9.
2015-12-09 09:44:25 +01:00