Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity
5,328 Commits 23 Branches 538 Tags 240 MiB
Commit Graph

115 Commits

Author SHA1 Message Date
John Maguire 2e3cd61c66 Bump 1.2 release version 
(cherry picked from commit 22e422296a)
 2014-05-10 18:26:51 +10:00
John Maguire 6fb4b8e97d Merge branch 'release-1.2' 
Conflicts:
	cmake/Version.cmake
	ext/libclementine-common/core/closure.cpp
	ext/libclementine-common/core/closure.h
	ext/libclementine-common/core/concurrentrun.h
	ext/libclementine-remote/remotecontrolmessages.proto
	ext/libclementine-tagreader/tagreader.cpp
	src/core/deletefiles.cpp
	src/core/deletefiles.h
	src/core/mac_utilities.h
	src/core/mergedproxymodel.h
	src/core/musicstorage.h
	src/core/organise.cpp
	src/core/organise.h
	src/core/player.cpp
	src/core/songloader.cpp
	src/core/utilities.cpp
	src/devices/connecteddevice.h
	src/devices/devicekitlister.h
	src/devices/devicemanager.cpp
	src/devices/devicemanager.h
	src/devices/deviceproperties.cpp
	src/devices/deviceview.cpp
	src/devices/giolister.cpp
	src/devices/gpodloader.cpp
	src/devices/gpodloader.h
	src/devices/mtploader.cpp
	src/devices/mtploader.h
	src/engines/gstengine.cpp
	src/engines/gstengine.h
	src/engines/gstenginepipeline.cpp
	src/globalsearch/globalsearchview.cpp
	src/internet/groovesharkservice.cpp
	src/internet/magnatunedownloaddialog.cpp
	src/library/groupbydialog.h
	src/library/librarydirectorymodel.cpp
	src/library/librarymodel.cpp
	src/library/libraryview.cpp
	src/main.cpp
	src/networkremote/networkremote.cpp
	src/networkremote/networkremote.h
	src/networkremote/outgoingdatacreator.cpp
	src/networkremote/outgoingdatacreator.h
	src/playlist/playlist.cpp
	src/playlist/playlistbackend.cpp
	src/playlist/playlistbackend.h
	src/playlist/playlistdelegates.cpp
	src/playlist/playlistview.h
	src/playlistparsers/plsparser.cpp
	src/smartplaylists/generator.h
	src/smartplaylists/querywizardplugin.cpp
	src/smartplaylists/searchpreview.cpp
	src/songinfo/songinfoview.h
	src/transcoder/transcoder.cpp
	src/ui/albumcovermanagerlist.cpp
	src/ui/mainwindow.cpp
	src/ui/organisedialog.cpp
	src/visualisations/projectmvisualisation.cpp
	src/visualisations/projectmvisualisation.h
	src/widgets/nowplayingwidget.cpp
	src/widgets/nowplayingwidget.h
	src/widgets/osd.h
	src/widgets/osd_x11.cpp
	src/wiimotedev/shortcuts.cpp
 2014-02-19 18:19:54 +01:00
David Sansome c36f4e46db Add "make format-diff" and "make format" commands that use clang-format to reformat source. 2014-02-12 01:20:49 +11:00
Mladen Pejaković 2114494375 Fix extraction of context messages from Qt ui files 2014-02-08 15:08:37 +01:00
Mladen Pejaković 39147b9cd0 Allow context creation in po files. Brings #4163 to effect 2014-02-07 17:20:59 +01:00
John Maguire 73ac5bc1ee Print out the Clementine display version in the cmake summary. 
(cherry picked from commit 9858a9d506)
 2014-02-04 12:01:46 +01:00
John Maguire 29da035139 Set version number for 1.2.2 2014-02-04 11:48:07 +01:00
John Maguire 9858a9d506 Print out the Clementine display version in the cmake summary. 2014-01-28 14:54:52 +01:00
David Sansome c2ff72deba Merge branch 'release-1.2' 
Conflicts:
	cmake/Version.cmake
	src/main.cpp
 2013-11-26 10:10:04 +11:00
David Sansome fe34d4d028 Set the version to 1.2.1 2013-11-16 13:57:32 +11:00
Andreas cee800cba5 1.2 with git revision 2013-10-26 09:37:02 +02:00
Andreas 526dd25c01 Add preversion "p" so the stable 1.2 binaries won't be overridden. 2013-10-05 12:27:25 +02:00
David Sansome 06e8160fd2 Set the version to 1.2 final 2013-09-26 21:08:30 +10:00
John Maguire fba825bd92 Clementine 1.2 RC4 2013-09-18 01:25:21 +02:00
John Maguire 46773cb465 Clementine 1.2 RC3 2013-09-12 11:34:50 +02:00
John Maguire 3cd430af35 Clementine 1.2 RC2 2013-09-10 13:15:20 +02:00
David Sansome fdd22b4bb5 Oops :( 2013-08-18 19:30:40 +10:00
David Sansome bd03196ba3 Create a release branch for 1.2 and update the version 2013-08-18 14:12:24 +10:00
David Sansome 40f0994da4 Merge branch 'release-1.1' 2012-11-18 20:49:01 +11:00
David Sansome d766735141 Bump the version to 1.1.1 2012-11-18 09:55:05 +11:00
David Sansome 9c7526ccbb Include git revisions in the master branch version numbers 2012-10-25 08:36:56 +02:00
David Sansome c8312b7cdf Bump the version of the 1.1 branch from 1.1 RC1 to 1.1. 2012-10-16 22:58:54 +11:00
David Sansome 65503f63fc Create a 1.1 branch and bump the version number. 2012-09-24 20:17:37 +01:00
David Sansome b63d1cf9f1 Show which packages are required to satisfy failed dependencies when running CMake. 2012-08-28 19:20:25 +01:00
John Maguire 215595bfdb Support toplist browsing in spotify blob. 2012-06-12 15:34:23 +02:00
John Maguire 9dd4f31795 Use libspotify 12.1.45. 
Fixes issue #2972
 2012-06-07 12:35:24 +02:00
David Sansome 638a4b9739 Bundle the gstreamer moodbar plugin, with a patch that protects calls to fftwf_plan from multiple threads. 2012-05-27 17:30:58 +01:00
David Sansome 5f0f50435c Bump the spotify blob version so we can create a new one linked against libspotify.so.11.1.56 2012-04-04 17:11:38 +01:00
David Sansome 50c0cd78a3 Oops - add the git revision information even when forced 2012-02-28 19:34:37 +00:00
David Sansome d21cd0edd7 Maybe fix git revision numbers in PPA debs 2012-02-28 17:49:32 +00:00
David Sansome bc0623bc0d Merge commit '1.0.1' 2012-01-22 13:33:34 +00:00
David Sansome 8e3ce51304 Bump version to 1.0.1 2012-01-11 21:26:09 +00:00
David Sansome 5abfdf4eb0 Fix a cmake error when getting the git revision number of an exact tag checkout 
(cherry picked from commit 9e2e035ae1)
 2012-01-11 21:04:48 +00:00
David Sansome 9e2e035ae1 Fix a cmake error when getting the git revision number of an exact tag checkout 2011-12-28 14:13:12 +01:00
David Sansome b0e8f43dd6 Set master branch back to including git revision numbers in commits 2011-12-28 00:01:12 +00:00
David Sansome d5254cb02c Change version from 1.0rc1 to 1.0 2011-12-12 20:53:23 +00:00
David Sansome ec8416443f Use the sparkle version for the tarball and source directory, tell the rpm spec to use that instead of the default 2011-12-02 19:08:34 +00:00
David Sansome 08d7d0ce8c Fix the version numbers in rpm filenames 2011-12-02 18:08:12 +00:00
David Sansome 7bc2de39b5 Prepend a big number to the mac version strings because we have to be bigger than the svn revision numbers that were there before 2011-12-02 14:56:26 +00:00
David Sansome c0ac798a71 Create a 1.0 release branch, and rework the way version numbers are done everywhere. 2011-12-02 14:48:19 +00:00
David Sansome ed154b463c Add a MOCK_COMMAND cmake option to change the "mock" command, and use a --resultdir inside CMAKE_BINARY_DIR 2011-11-30 18:53:16 +00:00
David Sansome 332aeadec0 Keep the appsrc half full to prevent tiny stalls when libspotify is waiting to send us audio data 2011-11-29 11:10:31 +00:00
David Sansome eb719fad77 Bump the spotify blob version again 2011-11-28 21:27:12 +00:00
David Sansome 6722d1cc6a Bump the spotify blob version number 2011-11-28 12:33:45 +00:00
John Maguire e71fa7d279 Bump spotify blob version. 2011-11-24 14:22:16 +01:00
David Sansome ce66bdf1e8 Always run uic on optional ui files so we can get translations out. It was supposed to do this already... 2011-11-03 17:19:37 +00:00
David Sansome a2cd7dc7e4 Use relative filenames for the source file locations in .pot files 2011-11-02 23:55:50 +00:00
Arnaud Bienner f9da363f9d Oops... 2011-11-01 19:56:56 +01:00
Arnaud Bienner bfee1be5dd Add (do not remove) location to pot/po files 2011-11-01 19:14:22 +01:00
David Sansome 3395078a90 Add the Content-Transfer-Encoding line to the pot header so it gets added every time 2011-10-30 12:24:36 +00:00