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

6613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vavooon
7ef095d0cb Add Favorites support to SoundCloud (#5345) 2016-04-20 13:03:48 +01:00
John Maguire
1dfd71ea7f Merge branch 'release-1.3' 2016-04-19 18:00:00 +01:00
Marko Hauptvogel
2418b559a8 Fix rating preservation 
This is a bugfix for commit bb5a952e to prevent deletion of database-only ratings.

(cherry picked from commit c0e08d42ed0b69f8ffb0809c2735f3ff7dfebce9)
1.3.1 		2016-04-19 16:08:35 +01:00
John Maguire
44d6b930ac 1.3.1 2016-04-19 16:08:19 +01:00
John Maguire
363fde44dd Turn git revisions back on 2016-04-19 16:07:16 +01:00
John Maguire
22b7101023 Merge branch 'release-1.3' 2016-04-19 16:04:46 +01:00
Santiago Gil
0451240df8 Display a stream's URL if it lacks a title (#5333) 2016-04-18 15:20:07 +01:00
Clementine Buildbot
1ade25e9f3 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2016-04-18 10:00:58 +00:00
Arnaud Bienner
f2228de5c9 Add some tests for MergeUserSetData 2016-04-17 19:33:52 -07:00
Marko Hauptvogel
c0e08d42ed Fix rating preservation 
This is a bugfix for commit bb5a952e to prevent deletion of database-only ratings.
 2016-04-17 19:23:36 -07:00
John Maguire
97ee6d3202 1.3 release 1.3 2016-04-15 14:26:04 +01:00
Clementine Buildbot
205a77bfd3 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 
(cherry picked from commit 003b258aabee3fd66cc4daa178a6cbb463d115c5)
 2016-04-15 14:19:38 +01:00
Clementine Buildbot
72785a8f64 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 
(cherry picked from commit 2e66eeb61f14595a357feeff20b774a70285ab2d)
 2016-04-15 14:19:31 +01:00
Clementine Buildbot
4eaef4c004 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 
(cherry picked from commit 23c0fe9f12147731fec3cb1a133045490c96659f)
 2016-04-15 14:19:24 +01:00
Clementine Buildbot
d613258c98 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 
(cherry picked from commit e2fbb8e966acaaad6c2517019a2a21ffe8a46e68)
 2016-04-15 14:19:16 +01:00
Clementine Buildbot
4d48907fbb Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 
(cherry picked from commit 357af2263b9efbbbfe3816b84c8a128f926e89ec)
 2016-04-15 14:19:09 +01:00
Mildred Ki'Lya
3afa80bef0 Don't scan directories with .nomedia or .nomusic files (#5327) 2016-04-15 10:44:44 +01:00
Alex
11670e1760 Fix playlist behaviour (#5330) 
* Do not restore playback state on application start if overwritten by command line options

This also fixes unwanted pausing if a new instance is started with commandline URL combined with playback restore.
Note that the actual buggy code (MainWindow::ResumePlayback()) is not fixed here.

* Fix for commandline URLs for new instances are always appended to playlist.
 2016-04-12 15:53:43 +01:00
Clementine Buildbot
75d7179dd7 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2016-04-11 10:00:58 +00:00
Dmitriy Bogdanov
7e9f9802b0 Update AZLyrics parsing rule 2016-04-09 13:55:44 +01:00
John Maguire
ccfce616b8 Merge branch 'PanderMusubi-master' 2016-04-06 15:45:48 +01:00
John Maguire
6693a870ad Reformat intergalacticfm service 2016-04-06 15:45:25 +01:00
John Maguire
9291f09b1b Merge branch 'master' into PanderMusubi-master 2016-04-06 15:43:32 +01:00
John Maguire
b2c506656c Avoid redirects from IntergalacticFM 2016-04-06 15:42:25 +01:00
John Maguire
be958495fe Merge branch 'master' of https://github.com/PanderMusubi/Clementine into PanderMusubi-master 2016-04-06 15:30:28 +01:00
Clementine Buildbot
003b258aab Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2016-04-04 10:00:54 +00:00
John Maguire
9cb1ed5126 Require qt 4.8.1 
This is the version present in Ubuntu Precise (LTS).
 2016-03-31 15:06:59 +01:00
John Maguire
1489191794 Revert "Require Qt4.8.1 and CMake deprecate warnings ..." 
This reverts commit e1124403fd7bf3d71e4fc0dcd87574e01c0f4846.

qdbusxml2cpp did not support new annotation names until 4.8.2
 2016-03-31 15:06:14 +01:00
John Maguire
ed13d02231 Remove support for mpris1 2016-03-30 17:14:58 +01:00
John Maguire
807e4552e1 Merge pull request #5314 from ivan-leontiev/fix-globalsearch-sources 
Move global search settings loading later in "MainWindow" initialisation
 2016-03-30 16:44:34 +01:00
John Maguire
1d07be584e Fix annotations on mpris1 args. 2016-03-30 15:50:08 +01:00
John Maguire
9c33369fcc Merge pull request #5292 from printesoi/fix-mpris-signals 
Fix mpris dbus notifications
 2016-03-30 15:36:04 +01:00
Victor Dodon
3dd55e1c86 mpris2: fix format 
Minor code refactoring:
- Use ternary operator in Mpri2::CanSeek
- Run make format
 2016-03-29 21:29:47 -07:00
Ivan Leontiev
75d4731534 Move global search settings loading later in "MainWindow" initialisation 
Fixes #5312.
 2016-03-30 04:58:47 +03:00
David Sansome
2257dcd278 Merge pull request #5318 from goggle/master 
Fixed compile error for the subsonic module.
 2016-03-30 10:01:07 +11:00
John Maguire
d3285372e0 Merge pull request #5319 from clementine-player/revert-5270-master 
Revert "Adding support for subsonic cover art download"
 2016-03-29 21:13:02 +01:00
John Maguire
b20d0d87fd Revert "Adding support for subsonic cover art download" 2016-03-29 21:12:54 +01:00
Alex Seiler
6cc60d0cf8 Fixed compile error for the subsonic module. 2016-03-29 21:23:53 +02:00
John Maguire
ca487a5166 Merge pull request #5270 from davidgfnet/master 
Adding support for subsonic cover art download
 2016-03-29 16:44:21 +01:00
John Maguire
c22911815a Merge pull request #5285 from santigl/dummyBands 
Add dummy bands to avoid #695
 2016-03-29 15:35:43 +01:00
Clementine Buildbot
2e66eeb61f Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2016-03-28 10:00:51 +00:00
John Maguire
30c75f8032 Merge pull request #5313 from ivan-leontiev/fix-playlist-bs 
Fix pressing "Backspace" key on a playlist results in appending "^H" character to the filter
 2016-03-25 01:09:13 +00:00
Ivan Leontiev
9afd71c651 Fix pressing "Backspace" key on a playlist results in appending "^H" character to the filter 2016-03-25 03:45:33 +03:00
Clementine Buildbot
23c0fe9f12 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2016-03-23 16:52:38 +00:00
John Maguire
f482612127 Merge pull request #5306 from tronsgaard/master 
"Stop after current" as command-line option
 2016-03-18 19:40:45 +00:00
René Tronsgaard Rasmussen
129bf80830 Add option "Stop after this track" to the Unity launcher icon. 2016-03-18 20:22:13 +01:00
René Tronsgaard Rasmussen
8e70046e4b Add -q,--stop-after-current commandline flag 2016-03-18 20:21:34 +01:00
David Guillen Fandos
10bac1cd2d Fixing issues in the pull request. 2016-03-12 19:44:32 +00:00
John Maguire
25326b4f4a Merge pull request #5294 from pavelvat/fix_mxe_linking 
Fix mxe linking
 2016-03-12 15:42:18 +00:00
Pavel Vatagin
b2db55e772 fix "undefined reference to" for clementine when build in MXE 2016-03-12 18:14:40 +03:00