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

5108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 a872fa3828567bb696848d0d9ae8f3432cb72624)
 2013-11-01 12:52:43 +01:00
John Maguire
d8e01157b0 Add workaround for weird font issue in 10.9. 
(cherry picked from commit b08898bf2d28aebdebdfe7c0f675e909b5e55bdd)
 2013-11-01 12:47:44 +01:00
John Maguire
92eb4fe74a Remove generated file again. 
(cherry picked from commit d7aed8b260f58b9ec768c9c9863913f1a9f8f916)
 2013-11-01 12:47:26 +01:00
John Maguire
7218130cfd Revert "Remove file..." 
This reverts commit 7f0d437d717b2352e24c1d5708e02f3457abed96.
 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 7470f67acf3d3d8d437da7c3734a28125cc74c59)
 2013-10-31 19:53:26 +01:00
Andreas
6b80ec08d5 Fix library download in network remote. 
(cherry picked from commit f6ab3a90440deeb62b4fdfbb94a047790d4963f6)
 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 b546dcba64a18cbfae9d2033ead0ff1526f287d8)
1.2 		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
David Sansome
312e05088e Remove this old line that was used for testing 
(cherry picked from commit 1399493a5cae4d249e4f5d48c71e6eee45cac80d)
 2013-10-13 11:35:15 +11:00
David Sansome
1399493a5c Remove this old line that was used for testing 2013-10-13 11:33:58 +11:00
Andreas
8b8d3e2849 Rearrange main.cpp, so no GetConfigPath() is called before instanciating QApplication and CheckPortable(). 2013-10-10 18:36:12 +02:00
Andreas
4584b50d18 Fix wrong networkcache dir. 2013-10-10 10:00:57 +02:00
Andreas
9d0b1611c7 Fix crash when fetching lyrics with the network remote. 
(cherry picked from commit 90c8929f96805bc25020bd03ec9f19dd6fb1f13b)
 2013-10-09 19:43:28 +02:00
Andreas
72c10d42f4 Fix crash when fetching lyrics with the network remote. 
(cherry picked from commit 90c8929f96805bc25020bd03ec9f19dd6fb1f13b)
 2013-10-09 19:36:22 +02:00
Andreas
90c8929f96 Fix crash when fetching lyrics with the network remote. 2013-10-09 19:33:59 +02:00
Andreas
a8e8898111 Fix portable nsis script. 2013-10-09 18:19:35 +02:00
Clementine Buildbot
8e39e70c39 Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2013-10-07 10:01:28 +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
Andreas
1d3a1dca1f Update buildscript to create a normal and a portable installer. 2013-10-05 12:23:16 +02:00
Andreas
77ac74c3f5 Merge branch 'release-1.2' into portable 2013-10-05 12:03:57 +02:00
Andreas
c389b2e303 Merge branch 'release-1.2' into portable 2013-10-05 12:01:49 +02:00
David Sansome
4b459b6d25 Add an empty bin directory 2013-10-04 15:47:22 +10:00
Arnaud Bienner
cdd5bf928c Check playlist exists in manager. Fixes issue 3878 
(cherry picked from commit 2e18b7eb96bed6a824e3d23d5a287c587b5a324d)
 2013-10-03 20:45:12 +02:00
Arnaud Bienner
ce117da026 Don't ignore Folder (so we don't ignore playlists they contain and we don't end up with dangling pointers in playlists_by_id_) 
(cherry picked from commit fb78321c161832a52c44c221068a14e6e9792747)
 2013-10-03 20:45:01 +02:00
Arnaud Bienner
2e18b7eb96 Check playlist exists in manager. Fixes issue 3878 2013-10-03 20:36:46 +02:00
Andreas
98dd001a4f Further work on portable version. 2013-10-03 17:08:42 +02:00
Arnaud Bienner
fb78321c16 Don't ignore Folder (so we don't ignore playlists they contain and we don't end up with dangling pointers in playlists_by_id_) 2013-10-02 22:58:47 +02:00
Andreas
acb18cdcde First tries on a portable version. 2013-09-29 10:43:34 +02:00