Commit Graph

4878 Commits

Author SHA1 Message Date
David Sansome c2ff72deba Merge branch 'release-1.2'
Conflicts:
	cmake/Version.cmake
	src/main.cpp
2013-11-26 10:10:04 +11:00
Arnaud Bienner 4a1d3e2de6 Disable inline editing with 'SelectedClicked'. Still available using F2. Fixes 3251 (once again). 2013-11-22 21:55:46 +01:00
Arnaud Bienner 3715e5f15e Revert revision 316b5d7db4 and revision e7a5c482fe (aka re-enable inline editing) 2013-11-22 20:59:31 +01:00
Arnaud Bienner 503b8445ad Remove debug message 2013-11-22 20:52:14 +01:00
John Maguire 5b19c520d0 Use gtest's builtin tuple type again for 10.9 2013-11-22 16:31:56 +00:00
John Maguire 4c23072bef Link dynamically against sqlite3 but still use a copy of QSqlLiteDriver 2013-11-22 16:31:41 +00:00
John Maguire 331d471b51 Avoid tr1 for 10.9 2013-11-22 16:05:38 +00:00
John Maguire e7c63fdfb9 Update deprecated function call. 2013-11-22 12:08:24 +00:00
John Maguire cc43e339c1 Use boost function for compatibility 2013-11-22 11:53:47 +00:00
John Maguire b17b075361 Compile fixes for 10.9 2013-11-21 17:59:31 +00:00
Aggelos Biboudis 2647fe4bbc Emit MPRIS notification when we add or remove a playlist.
Fixes issue 3962.
2013-11-19 00:13:45 +01:00
Clementine Buildbot 6e3a456046 Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2013-11-18 10:02:12 +01:00
Arnaud Bienner 316b5d7db4 (Add a comment to explain why I removed this) 2013-11-17 19:42:06 +01:00
Arnaud Bienner e7a5c482fe Don't allow tag inline editing anymore.
This was a pretty good idea, but now we have a dedicated tag dialog editor, I'm not sure it is very useful. It was probably faster to edit tags this way, but I'm afraid lot of people may inadvertently modify their tags because of this. Still allow inline editing of score and comment, because they sound less critical to me.
Fixes issue 3251.
2013-11-17 19:00:44 +01:00
Arnaud Bienner 44a154ef56 Update issue 3962: don't try to activate a playlist which doesn't exist/isn't opened anymore (otherwise we crash on Q_ASSERT)
(cherry picked from commit 51d9080a81)
2013-11-17 16:28:59 +01:00
Arnaud Bienner 51d9080a81 Update issue 3962: don't try to activate a playlist which doesn't exist/isn't opened anymore (otherwise we crash on Q_ASSERT) 2013-11-16 19:53:02 +01:00
David Sansome fe34d4d028 Set the version to 1.2.1 2013-11-16 13:57:32 +11:00
David Sansome f103d159e4 Update the changelog for 1.2.1
(cherry picked from commit 36a263975e)
2013-11-16 13:49:44 +11:00
David Sansome 36a263975e Update the changelog for 1.2.1 2013-11-16 13:49:27 +11:00
David Sansome d25f4b4ae7 Fix a stupid typo. Fixes issue 3710
(cherry picked from commit 0497e941c7)
2013-11-16 13:45:51 +11:00
Clementine Buildbot e929b4f466 Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2013-11-11 10:02:21 +01:00
John Maguire 95330a3d7c Deal more gracefully with a device's library not having any directories on second mount.
Fixes issue #3940
2013-11-04 18:44:07 +01:00
Clementine Buildbot a6f4affc10 Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2013-11-04 10:01:55 +01:00
John Maguire 1c69dee947 Add favicon to oauth success page. 2013-11-01 15:56:57 +01:00
John Maguire d426da99b0 Redirect box login via SSL appengine page.
Apparently that's more secure than just redirecting to localhost :-S
Fixes issue #3936

(cherry picked from commit a872fa3828)
2013-11-01 12:52:43 +01:00
John Maguire d8e01157b0 Add workaround for weird font issue in 10.9.
(cherry picked from commit b08898bf2d)
2013-11-01 12:47:44 +01:00
John Maguire 92eb4fe74a Remove generated file again.
(cherry picked from commit d7aed8b260)
2013-11-01 12:47:26 +01:00
John Maguire 7218130cfd Revert "Remove file..."
This reverts commit 7f0d437d71.
2013-11-01 12:47:15 +01:00
John Maguire d7aed8b260 Remove generated file again. 2013-11-01 12:46:51 +01:00
John Maguire a872fa3828 Redirect box login via SSL appengine page.
Apparently that's more secure than just redirecting to localhost :-S
Fixes issue #3936
2013-11-01 12:15:21 +01:00
Andreas 7f0d437d71 Remove file... 2013-10-31 19:55:13 +01:00
Andreas a979b22237 - Fix remove songs from playlist in network remote.
- Update protocol buffer version.
(cherry picked from commit 7470f67acf)
2013-10-31 19:53:26 +01:00
Andreas 6b80ec08d5 Fix library download in network remote.
(cherry picked from commit f6ab3a9044)
2013-10-31 19:53:09 +01:00
Andreas 7470f67acf - Fix remove songs from playlist in network remote.
- Update protocol buffer version.
2013-10-31 19:52:02 +01:00
Andreas 10369cdbbb revert last commit. 2013-10-30 22:36:44 +01:00
Andreas 9bc605dc58 Try to fix the config path in windows. 2013-10-30 22:27:08 +01:00
John Maguire 981bbdce72 D'oh 2013-10-28 17:39:18 +01:00
John Maguire b08898bf2d Add workaround for weird font issue in 10.9. 2013-10-28 17:12:23 +01:00
Clementine Buildbot 55be260750 Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2013-10-28 10:01:41 +01:00
David Sansome 30cca8adc4 Remove this generated file from git 2013-10-28 14:26:19 +11:00
David Sansome 0497e941c7 Fix a stupid typo. Fixes issue 3710 2013-10-28 14:23:52 +11:00
Andreas cee800cba5 1.2 with git revision 2013-10-26 09:37:02 +02:00
Andreas afae01156d Merge branch 'portable' 2013-10-26 09:34:07 +02:00
Andreas f6ab3a9044 Fix library download in network remote. 2013-10-25 20:31:56 +02:00
David Sansome 343414c52d Add saucy to the codesite upload script 2013-10-25 19:37:13 +11:00
David Sansome b34da7cb00 Merge branch 'release-1.2'
Conflicts:
	src/translations/ca.po
	src/translations/fi.po
	src/translations/fr.po
	src/translations/pl.po
	src/translations/pt.po
	src/translations/ru.po
	src/translations/tr.po
2013-10-25 19:02:06 +11:00
Clementine Buildbot 5306c290aa Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2013-10-21 10:01:54 +02:00
Clementine Buildbot e737e7467f Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2013-10-14 10:01:50 +02:00
David Sansome 61ee7468d9 Add Lucid back to the list of packages to upload. We can deprecate it later.
(cherry picked from commit b546dcba64)
2013-10-13 12:30:11 +11:00
David Sansome b546dcba64 Add Lucid back to the list of packages to upload. We can deprecate it later. 2013-10-13 12:28:29 +11:00