Commit Graph

5261 Commits

Author SHA1 Message Date
John Maguire 3adaa88c5b Merge pull request #4234 from Shedward/master
Translation, typos and mac build fixes for Vk.com plugin.
2014-03-08 13:29:33 +01:00
Maltsev Vlad dde8535470 Translation, typos and mac build fixes. 2014-03-08 19:11:48 +07:00
Janez Troha 000206190a Add: Slovenian translation
Added Slovenian translation for GenericName and Comment.

Signed-off-by: Andrej Mernik <andrejm@ubuntu.si>
2014-03-08 12:17:48 +01:00
John Maguire 8eabcae9dd Merge pull request #4148 from Shedward/master
Merge vk.com support.
2014-03-08 01:18:53 +01:00
Maltsev Vlad a7b0accd93 Add Vk.com plugin. 2014-03-08 00:58:50 +07:00
Andreas 20d122a31b Remove Asturian language from nsis script (is not available). 2014-03-05 18:45:52 +01:00
Andreas 95ca1372dc Revert "First try to warn user it should close Clementine before if upgrading it"
This reverts commit 80ce992c9c & ff29ea29db.

The use of MUI_INSTALLOPTIONS_DISPLAY is no longer supported in MUI2, so this solution is not possible.
2014-03-05 18:08:32 +01:00
Andreas 389b7c57f4 Added language selection to nsis installer. 2014-03-05 17:51:41 +01:00
Arnaud Bienner ff29ea29db oops, missed to git add new file 2014-03-05 16:35:05 +01:00
Arnaud Bienner 80ce992c9c First try to warn user it should close Clementine before if upgrading it 2014-03-05 16:31:11 +01:00
John Maguire 1c3cee8719 Install libffi DLL. 2014-03-05 15:12:11 +01:00
John Maguire 8c2f927bc2 Add new DLLs to windows install. 2014-03-05 13:34:55 +01:00
John Maguire 49c2fe8de1 Bump installed dependency DLL versions. 2014-03-05 12:16:10 +01:00
John Maguire d2b62334e8 Merge pull request #4225 from sobkas/master
This time it fixes the crash, I swear.
2014-03-03 17:48:41 +01:00
Krzysztof A. Sobiecki 3339aabf19 Fix crash during adding a new podcast 2014-03-03 17:45:31 +01:00
Clementine Buildbot b3766a392b Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2014-03-03 10:01:41 +01:00
David Sansome b14d2f3123 Never use the system's sha2 library - ours has a different API now. Fixes #4217 2014-02-28 19:48:58 +11:00
Clementine Buildbot ee131f07d5 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2014-02-24 10:01:39 +01:00
Andreas 95c4db25e0 Broken kittens repaired. Aww.... 2014-02-22 22:21:00 +01:00
Andreas d397f711fe Better placeing of the loading icon when automatic cover loading is activated. 2014-02-22 21:27:58 +01:00
Mattias Andersson cdf5363320 Prevent translation of the names of the available fields in the tool tip for the library search field. 2014-02-22 18:21:58 +01:00
John Maguire 5146bcdebc Some more NULL -> nullptr conversions. 2014-02-21 17:30:46 +01:00
John Maguire 0e4aff8b74 Add copyright info for breakpad. 2014-02-20 18:15:45 +01:00
John Maguire 708573f3ac Add copyright information for libechonest 2014-02-20 18:13:15 +01:00
John Maguire 3b1c9e7e5f Remove some old copyright notices. 2014-02-20 18:10:28 +01:00
John Maguire b81e5bce5e Remove google code upload scripts. 2014-02-20 18:00:26 +01:00
John Maguire 0f790796a0 Update repo in PPA upload script. 2014-02-19 18:34:22 +01: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
Clementine Buildbot 734b7b9bd7 Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2014-02-17 10:01:43 +01:00
John Maguire b46e9ff55c Seems this should be the other way around. 2014-02-14 15:51:08 +01:00
John Maguire c162a9316d Fix clang warning. 2014-02-14 14:36:47 +01:00
John Maguire fc9c983e2c Put global functions used for startup in namespace 2014-02-13 18:59:59 +01:00
David Sansome 28873605ff Merge pull request #4209 from paperbagcorner/fix-forloop
Iterate over a copy of the parents container since we are removing elements from the original
2014-02-13 21:33:46 +11:00
Mattias Andersson 3b01247df9 Iterate over a copy of the parents container since we are removing elements from the original. 2014-02-13 10:41:24 +01:00
Arnaud Bienner faaa75cb61 Few style fixes + avoid unneeded copies 2014-02-12 22:11:28 +01:00
John Maguire 858cfce9ff Merge pull request #4204 from abika/master
correct selection after removing rows in playlist
2014-02-11 15:49:42 +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
Alexander Bikadorov 3adaf5d598 fixed indentation / coding style 2014-02-11 13:18:08 +01:00
Alexander Bikadorov c7ac2012b4 correct selection after removing rows in playlist 2014-02-10 16:51:43 +01:00
John Maguire 192b60d965 Use nullptr as parent parameter default everywhere 2014-02-10 16:03:54 +01:00
John Maguire fd183a80ff Merge branch 'coding_style_fixes_and_c++11' of https://github.com/sobkas/Clementine into sobkas-coding_style_fixes_and_c++11
Conflicts:
	src/podcasts/addpodcastbyurl.cpp
	src/podcasts/gpoddersync.cpp
	src/podcasts/podcastinfowidget.cpp
	src/podcasts/podcastupdater.cpp
2014-02-10 15:55:42 +01:00
John Maguire 3323c2d094 Convert all instances of foreach() to a C++11 for
find ext src -name '*.cpp' -exec \
    sed -i -e 's/foreach(\([^,]\+\),/for (\1 :/' {} \;
2014-02-10 14:43:32 +01:00
Krzysztof A. Sobiecki f6941726f9 Use nullptr instead of 0 2014-02-10 14:20:20 +01:00
Krzysztof A. Sobiecki 1d1cc92263 Someone else 2014-02-10 13:51:03 +01:00
Clementine Buildbot 89433be9aa Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2014-02-10 10:01:46 +01:00
Krzysztof A. Sobiecki 6d2cdad286 So here list have hidden 2014-02-09 18:46:59 +01:00
Krzysztof A. Sobiecki d7ff44005e No more 'auto' :( 2014-02-09 17:53:20 +01:00
Krzysztof A. Sobiecki c71782c700 I don't know who put this damn spaces there 2014-02-09 17:07:35 +01:00
David Sansome 67f6560c04 Merge pull request #4194 from abika/master
Use double click settings as default behaviour for new files added as command line arguments.  Fixes #4183
2014-02-09 16:51:10 +11:00
David Sansome 7b93630b03 Resize the sort order combobox when its contents changes. Fixes #4173 2014-02-09 16:43:43 +11:00