Commit Graph
381 Commits
Author SHA1 Message Date
Rémi Cocula 3354f6623a Change version to 6.2.spring4-SNAPSHOT. 2016-11-28 21:22:20 +01:00
Rémi Cocula 02544d8406 LoginController : no need to declare members final. 2016-11-28 20:52:03 +01:00
Rémi Cocula c7c2ee4875 Merge branch 'biconou_spring-3-update_PR' into biconou_spring-4-update_PR 2016-11-28 20:49:53 +01:00
Eugene E. Kashpureff Jr c50060884d Merge Pull Request #137 into develop
Conflicts:
	libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
2016-11-27 23:05:38 +00:00
Eugene E. Kashpureff Jr 9d3d6ce52d Merge Pull Request #124 into develop 2016-11-27 23:00:58 +00:00
Eugene E. Kashpureff Jr e51edb3e20 Merge Pull Request #110 into develop 2016-11-27 23:00:01 +00:00
François-Xavier ThomasandTom Powell 9b48d45d51 Fix libresonic-booter crash with Spring 3 2016-11-27 13:36:24 -08:00
François-Xavier ThomasandEugene E. Kashpureff Jr 739fafe633 Fix shuffle behavior introduced in #132
The player's current file was not being updated, resulting in always
considering that it was playing the first one when shuffling.
2016-11-27 18:56:32 +00:00
Eugene E. Kashpureff Jr 5c5bce6f8d Merge 6.1.beta2 into stable
Conflicts:
	CHANGELOG.md
	INSTALL.md
	documentation/FreeBSD-FreeNAS-Install.md
	documentation/INSTALL.md
	libresonic-assembly/pom.xml
	libresonic-booter/pom.xml
	libresonic-installer-debian/pom.xml
	libresonic-installer-mac/pom.xml
	libresonic-installer-rpm/pom.xml
	libresonic-installer-windows/pom.xml
	libresonic-main/pom.xml
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml
2016-11-27 18:53:36 +00:00
François-Xavier Thomas ad94e9a9d3 Store previously used shuffle filters 2016-11-27 18:41:26 +01:00
François-Xavier Thomas 76f42dfc1f Add play count filter 2016-11-27 18:41:26 +01:00
François-Xavier Thomas 1311e0220a Add to playlist feature in the 'shuffle' section 2016-11-27 18:41:26 +01:00
François-Xavier Thomas 71b17a8588 Handle additional shuffle filters
This commit also replaces Lucene with an SQL query when looking for
random songs. This should improve performance quite a bit and allows us
to use more complex filters on columns that are not indexed by Lucene.
2016-11-27 18:41:26 +01:00
François-Xavier Thomas 8ff762ed0f Add more filters to the shuffle page 2016-11-27 18:40:25 +01:00
François-Xavier Thomas ef1a41b2a6 Fix jerky play queue animation right after loading 2016-11-27 18:40:03 +01:00
François-Xavier Thomas d2c23dfbcf Help: Add padding to keyboard shortcuts for readability 2016-11-27 18:40:03 +01:00
François-Xavier Thomas 49f6420c44 Help: Add link to the user preferences page 2016-11-27 18:40:03 +01:00
François-Xavier Thomas 04c9308a85 Test: Add missing columns to UserDao test case 2016-11-27 18:40:03 +01:00
François-Xavier Thomas 0fc35dd1b2 Add shortcut help for 'toggle play queue' 2016-11-27 18:40:02 +01:00
François-Xavier Thomas 349143cff1 Make shortcuts work in Jukebox mode 2016-11-27 18:40:02 +01:00
François-Xavier Thomas 4f2887e60a Fix issue with volume up/down shortcut 2016-11-27 18:40:02 +01:00
François-Xavier Thomas 3fdb07aa27 Add keyboard shortcuts help page in more.jsp 2016-11-27 18:40:02 +01:00
François-Xavier Thomas fccf2a013d Add user option for keyboard shortcuts 2016-11-27 18:40:02 +01:00
François-Xavier Thomas 8006d62f55 Restored most keyboard shortcuts from Subsonic
Signed-off-by: François-Xavier Thomas <fx.thomas@gmail.com>
2016-11-27 18:40:02 +01:00
Tom PowellandGitHub 705a3d80b7 Make libresonic build again. (#149)
Fix dependency issues introduced by #143.
2016-11-26 23:06:55 -08:00
remi 58dae1ae97 Test audio files size reduced.
Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:41 +01:00
remi dd88ac6806 Assertion added in org.libresonic.player.service.MediaScannerServiceTestCase.testScanLibrary
Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:33 +01:00
remi 26793653a1 Removed an unused method in MediaScannerServiceTestCase.
Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:28 +01:00
remi 05518019b5 The LIBRESONIC_HOME directory used for tests is now a temporary directory.
Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:23 +01:00
remi 6fa150e194 Lack of version number for metrics.
Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:19 +01:00
remi 799739458c Clean unused method.
(cherry picked from commit 6c44bb5)

Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:13 +01:00
remi f599271163 Refactoring in test cases. The /tmp/libresonic directory used as LIBRESONIC_HOME for tests is now located in the target dir of the project.
(cherry picked from commit 32d4580)

Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:08:04 +01:00
remi ba28d52ba4 MediaScannerService unit test and test media library
(cherry picked from commit c2b17f0)

Signed-off-by: Rémi Cocula <rcocula@gmail.com>
2016-11-24 22:07:26 +01:00
remi 520008bb60 No need for a constructor in the LoginController. Just need to @Autowire each property. 2016-11-22 22:09:16 +01:00
remi a03aa2805d New LoginController in place of the login method in MultiController.
Slight introduction to Java annotation based configuration (note that <mvc:annotation-driven /> has been added to libresonic-servlet.xml).
2016-11-21 23:32:43 +01:00
Andrew DeMaria 81730fe52f Bump spring beans version
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2016-11-20 22:01:14 -07:00
Andrew DeMaria 901067bb1a Fixed display of login error
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2016-11-19 10:40:05 -07:00
Andrew DeMaria a3c64d2024 Migrate from acegisecurity to spring security
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2016-11-19 10:39:58 -07:00
Andrew DeMaria 6896538a6f Added missing dependencies
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2016-11-19 10:39:54 -07:00
Andrew DeMaria 196fdf63ba Fixed issue with null Integer id return value
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2016-11-19 10:39:49 -07:00
Andrew DeMaria bd42e92928 Update dao layer to use update spring-jdbc 3/4 api
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2016-11-19 10:39:44 -07:00
Andrew DeMaria d4422a8c37 Update to spring 3.X.X temporarily
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2016-11-19 10:39:37 -07:00
Eugene E. Kashpureff Jr fa00684a27 Add missing help popup text from PR #108 2016-11-19 03:37:10 +00:00
Eugene E. Kashpureff Jr 31ddd33c9c Libresonic v6.1.beta2 2016-11-19 03:30:37 +00:00
Eugene E. Kashpureff Jr e0cd0d64eb Libresonic v6.1.rc1 2016-11-19 03:25:36 +00:00
Eugene E. Kashpureff Jr 139755d4be Merge Pull Request #139 into develop 2016-11-19 03:12:34 +00:00
Eugene E. Kashpureff Jr 7832e5083e Merge Pull Request #132 into develop 2016-11-19 03:12:21 +00:00
Shen-Ta Hsieh f5c9cabed7 add BOM support for generating m3u file
Signed-off-by: Shen-Ta Hsieh <ibmibmibm.tw@gmail.com>
2016-11-16 16:35:16 +08:00
Andrew DeMaria bc8186fd1b Removed extraneous property
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2016-11-15 20:42:26 -07:00
Shen-Ta HsiehandAndrew DeMaria 3d550946d6 update zh_TW translate for smtp
Signed-off-by: Shen-Ta Hsieh <ibmibmibm.tw@gmail.com>
2016-11-15 20:39:16 -07:00