John Maguire
3a5aee5047
Merge pull request #4172 from pejakm/langcont2
...
Fix for pull request #4170
2014-02-04 12:01:30 -08:00
Mattias Andersson
1b00e91fdf
Add the ability to cancel a running CD rip.
2014-02-04 16:25:58 +01:00
Mladen Pejaković
657bbcf00f
Fix for pull request #4170
2014-02-04 15:04:19 +01:00
John Maguire
69809d356b
Update DLL list for new version of protobuf
...
(cherry picked from commit 054686226e
)
2014-02-04 14:39:00 +01:00
John Maguire
f246eda5a8
u_int8_t is missing on mingw
...
(cherry picked from commit ddda13ceb7
)
2014-02-04 14:11:42 +01:00
John Maguire
ddda13ceb7
u_int8_t is missing on mingw
2014-02-04 14:10:59 +01:00
John Maguire
46565bdf8c
Remove TIFF plugin support from Mac at least for now.
...
(cherry picked from commit 03e2fc4282
)
2014-02-04 13:41:53 +01:00
John Maguire
d36f0536e8
Fix tautological comparison.
...
(cherry picked from commit 09eeeaab4e
)
2014-02-04 13:37:50 +01:00
John Maguire
b87cd1641b
Compile fixes for 10.9
...
(cherry picked from commit b17b075361
)
2014-02-04 13:26:17 +01:00
John Maguire
bf88730510
Try building on OS X with libc++
...
(cherry picked from commit 327181ef18
)
(cherry picked from commit 3e46b6134e
)
2014-02-04 12:31:50 +01:00
David Sansome
6a7a3a7f5b
Update the changelog for 1.2.2
2014-02-04 22:14:13 +11: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
9acd2e59c2
Do not log IP address from network remote settings.
...
(cherry picked from commit 0a778e2901
)
2014-02-04 12:01:31 +01:00
Andreas
d88d0d420e
Androids like kittens, too
...
(cherry picked from commit 00fd9b4724
)
2014-02-04 12:00:16 +01:00
John Maguire
7983343e50
Update Skydrive client id & secret for redirect url change.
...
Fixes #4013
(cherry picked from commit f583c40ffa
)
2014-02-04 11:59:53 +01:00
John Maguire
ce0eb1b50f
D'oh
...
(cherry picked from commit 981bbdce72
)
2014-02-04 11:58:11 +01:00
John Maguire
b40d834c8c
Rename SkyDrive to OneDrive.
...
http://blog.onedrive.com/onedrive-for-everything-your-life/
(cherry picked from commit 977a6769b2
)
2014-02-04 11:53:26 +01:00
John Maguire
29da035139
Set version number for 1.2.2
2014-02-04 11:48:07 +01:00
asiviero
d88c1fad04
Reset progress bar after cancel is pressed
2014-02-03 23:59:23 -02:00
asiviero
4251fd4331
Checks for CD before opening window (addresses #4165 )
2014-02-03 22:40:56 -02:00
asiviero
fc728f9bfc
Merge branch 'master' of https://github.com/clementine-player/Clementine
2014-02-03 21:48:55 -02:00
John Maguire
f78ba77169
Merge pull request #4170 from pejakm/langcont
...
Add contexts to some translation strings, v2. Closes #4163
2014-02-03 14:20:03 -08:00
Mladen Pejaković
033d266fe9
Add contexts to some translation strings
2014-02-03 21:54:02 +01:00
David Sansome
bdced17a57
Namespace clementine's 3rdparty implementation of sha2 to prevent its symbols
...
conflicting with the system's openssl symbols with the same names.
This was causing SSL connections to fail in weird ways on Debian.
Fixes #4130 .
(cherry picked from commit 96075faf88
)
2014-02-03 18:48:05 +01:00
John Maguire
f45f93fd2e
Merge pull request #4168 from paperbagcorner/ripcd-clean-tmpfiles
...
Make the CD ripper clean up after itself
2014-02-03 08:14:11 -08:00
Mattias Andersson
3bf44c78d4
Only remove the temporary directory if it has a non-empty name.
2014-02-03 15:14:08 +01:00
Mattias Andersson
4676e2839d
Make the CD ripper clean up after itself.
2014-02-03 13:38:38 +01:00
Clementine Buildbot
efd4e8666e
Automatic merge of translations from Transifex ( https://www.transifex.net/projects/p/clementine/resource/clementineplayer )
2014-02-03 10:01:44 +01:00
Arnaud Bienner
a349a96f5a
Avoid having similar filenames when organising songs (number them instead)
2014-02-02 19:28:45 +01:00
David Sansome
96075faf88
Namespace clementine's 3rdparty implementation of sha2 to prevent its symbols
...
conflicting with the system's openssl symbols with the same names.
This was causing SSL connections to fail in weird ways on Debian.
Fixes #4130 .
2014-02-02 20:25:11 +11:00
Gregor Tätzner
7317b6792e
don't rescan unchanged files if library has been unavailable
2014-02-01 20:21:28 +01:00
Arnaud Bienner
ee20103510
Set overwrite to false by default in organise dialog.
...
Too dangerous to be activated by default IMO.
2014-02-01 03:35:34 +01:00
Arnaud Bienner
06184cc5fb
Avoid having empty filenames, or filenames with extension only.
...
In this case, keep the original filename.
2014-02-01 03:22:41 +01:00
Arnaud Bienner
dac137cf11
Remove useless check.
...
No need to check isNull if you're checking isEmpty (see http://qt-project.org/doc/qt-4.8/qstring.html#distinction-between-null-and-empty-strings "A null string is always empty").
2014-01-31 20:17:26 +01:00
John Maguire
7ddf3aab45
Merge pull request #4145 from sobkas/master
...
Initial support for "Copy to device" in a podcast section
2014-01-31 04:31:43 -08:00
John Maguire
80d4ef2c87
Merge pull request #4157 from pejakm/desktopfile
...
[Desktop file] Add Audio category
2014-01-30 08:11:29 -08:00
John Maguire
763c9857fe
Merge pull request #4156 from pejakm/srtrans
...
[Desktop file] Serbian translations
2014-01-30 08:05:54 -08:00
Mladen Pejaković
e3e03bcc18
[Desktop file] Add Audio group
2014-01-30 17:04:55 +01:00
Mladen Pejaković
d58686e94a
[Desktop file] Serbian translations
2014-01-30 17:02:11 +01:00
Krzysztof A. Sobiecki
e244c9cfb2
My fault, was testing something and forgoten to replace song.basefilename()
2014-01-30 15:08:53 +01:00
John Maguire
b96ec7555a
Reformat all Objective-C++ files with clang-format.
...
clang-format -style=Google -i src/*/*.mm
2014-01-30 14:54:51 +01:00
John Maguire
0a778e2901
Do not log IP address from network remote settings.
2014-01-30 11:50:52 +01:00
John Maguire
7ce75258b8
Merge pull request #4155 from paperbagcorner/underscore
...
Add trailing underscore to class member variable.
2014-01-29 12:04:35 -08:00
Mattias Andersson
c36e073921
Add trailing underscore to class member variable.
2014-01-29 20:35:03 +01:00
Krzysztof A. Sobiecki
361cca83cb
Cpplint.py fixes
2014-01-29 17:30:58 +01:00
John Maguire
1fad6db52a
Use std::unique_ptr instead of boost:scoped_ptr in one place.
2014-01-28 18:45:13 +01:00
Krzysztof A. Sobiecki
09d68bf415
Scrub the auto usage, use unique_ptr, use correct types instead of QList
2014-01-28 17:01:14 +01:00
John Maguire
9858a9d506
Print out the Clementine display version in the cmake summary.
2014-01-28 14:54:52 +01:00
John Maguire
59cb17c08d
Change some API URLs to use https.
2014-01-28 12:57:27 +01:00
Krzysztof A. Sobiecki
3a72faba97
Fix errors reported by Cpplint.py
2014-01-28 04:50:00 +01:00