c0ee1ef786 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into biconou_develop_PR_SpringBoot  
							
							... 
							
							
 
							
							Conflicts:
	libresonic-main/src/main/resources/applicationContext-security.xml 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								2e09bc9b75 
								
							
								 
							
						 
						
							
							
								
								WIP Spring Boot  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								7ccc81c85f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #174  into develop  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								909516e4e7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #155  into develop  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								8cc6ab95fd 
								
							
								 
							
						 
						
							
							
								
								Change version number to 6.2.beta1.spring4  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								c3240b03bd 
								
							
								 
							
						 
						
							
							
								
								Remove direct Spring dependencies (as they come from SpringBoot)  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								cadc1022f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Auto locate transcoder binary  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								2ad8ec005c 
								
							
								 
							
						 
						
							
							
								
								Add SpringBoot application.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								33b7d81dd9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'biconou_spring-4-update_PR' into biconou_develop_PR_SpringBoot  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								5ae6f5462a 
								
							
								 
							
						 
						
							
							
								
								Clean up dependencies  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								63253e4ff8 
								
							
								 
							
						 
						
							
							
								
								Intoduce SpringBoot  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								7a8c0465c3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #168  from fxthomas/145-infinite-shuffle  
							
							... 
							
							
 
							
							Shuffle radio 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								ddd8498040 
								
							
								 
							
						 
						
							
							
								
								Move to Spring4 + remove PasswordSettingsController + remove PremiumSettingsController  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								d78244aa36 
								
							
								 
							
						 
						
							
							
								
								Corrections on UserSettingsController.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								ddea3f47ff 
								
							
								 
							
						 
						
							
							
								
								Corrections on PlayerSettingsController and SearchController.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								4561e38807 
								
							
								 
							
						 
						
							
							
								
								Corrections on GeneralSettingsController.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								b2b4384387 
								
							
								 
							
						 
						
							
							
								
								Corrections on MusicFolderSettingsController.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								a0ab86a6ac 
								
							
								 
							
						 
						
							
							
								
								Corrections on NetworkSettingsController.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								ba80e99703 
								
							
								 
							
						 
						
							
							
								
								Migration of PersonalSettingsController + unit test.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								6d8df63a7e 
								
									
								
							
								 
							
						 
						
							
							
								
								Implement shuffle radio feature ( #145 )  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								33de00c1a5 
								
							
								 
							
						 
						
							
							
								
								New logo.  
							
							... 
							
							
 
							
							Signed-off-by: Tiago <tiago@tdias.tech> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								a2deb0b779 
								
							
								 
							
						 
						
							
							
								
								Merge Pull Request  #167  into develop  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								24328a1d08 
								
									
								
							
								 
							
						 
						
							
							
								
								Doc: Move build and migration docs to documentation/  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								c9536ff310 
								
							
								 
							
						 
						
							
							
								
								This upgrades Apache HttpClient  
							
							... 
							
							
 
							
							- Update to latest version of httpclient and httpcomponents
- Fixes resulting deprecations
- Switch to using try with resources
Signed-off-by: Ben Kelsey <bfkelsey@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								31762a3e50 
								
									
								
							
								 
							
						 
						
							
							
								
								Doc: Add documentation for reverse proxying  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								f4636a09ed 
								
							
								 
							
						 
						
							
							
								
								Migration of UserSettingsController + unit test.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								0c265e2f3d 
								
							
								 
							
						 
						
							
							
								
								Migration of SearchController + unit test.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								c46416834b 
								
							
								 
							
						 
						
							
							
								
								Migration of PlayerSettingsController + unit test.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								33c16db802 
								
							
								 
							
						 
						
							
							
								
								Dont refresh key between server restarts  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								5023ba5875 
								
							
								 
							
						 
						
							
							
								
								Fix remember me  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								7c5d8088dc 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix SQL table and column being incorrectly swapped  
							
							... 
							
							
 
							
							Signed-off-by: Thomas Bastiani <thom@codehawks.eu> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								7a76a3ea75 
								
							
								 
							
						 
						
							
							
								
								Migration of GeneralSettingsController + unit test.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								f5a380eada 
								
							
								 
							
						 
						
							
							
								
								Migration of MusicFolderSettingsController + unit test.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								9bdbb5ab4f 
								
							
								 
							
						 
						
							
							
								
								Migration of NetworkSettingsController + unit test.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								d6999baa2d 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix login redirect not working occasionally  
							
							... 
							
							
 
							
							This forces the loading of the index page during login as was done prior
in acegi security. It is a necessary crutch for now because libresonic
doesn't retain a good targetUrl at all times.
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								d422fc4086 
								
							
								 
							
						 
						
							
							
								
								Begin of migration of deprecated controllers style.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								f6541632bb 
								
							
								 
							
						 
						
							
							
								
								Add temporary test jetty server (to be removed later).  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								3354f6623a 
								
							
								 
							
						 
						
							
							
								
								Change version to 6.2.spring4-SNAPSHOT.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								02544d8406 
								
							
								 
							
						 
						
							
							
								
								LoginController : no need to declare members final.  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								c7c2ee4875 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'biconou_spring-3-update_PR' into biconou_spring-4-update_PR  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								c50060884d 
								
							
								 
							
						 
						
							
							
								
								Merge Pull Request  #137  into develop  
							
							... 
							
							
 
							
							Conflicts:
	libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								9d3d6ce52d 
								
							
								 
							
						 
						
							
							
								
								Merge Pull Request  #124  into develop  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								e51edb3e20 
								
							
								 
							
						 
						
							
							
								
								Merge Pull Request  #110  into develop  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								9b48d45d51 
								
							
								 
							
						 
						
							
							
								
								Fix libresonic-booter crash with Spring 3  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								ad94e9a9d3 
								
									
								
							
								 
							
						 
						
							
							
								
								Store previously used shuffle filters  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								76f42dfc1f 
								
									
								
							
								 
							
						 
						
							
							
								
								Add play count filter  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								1311e0220a 
								
									
								
							
								 
							
						 
						
							
							
								
								Add to playlist feature in the 'shuffle' section  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								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. 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								8ff762ed0f 
								
									
								
							
								 
							
						 
						
							
							
								
								Add more filters to the shuffle page  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								ef1a41b2a6 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix jerky play queue animation right after loading  
							
							
 
							
						 
						
							9 years ago