f402731ce7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #197  from DavidARussell/issue131_fileFormat_display  
							
							... 
							
							
 
							
							Use original file type for display formatting 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								7d9aa70555 
								
							
								 
							
						 
						
							
							
								
								Use original file type for display formatting  
							
							... 
							
							
 
							
							The bitrate column uses the original file, so the file type column
should do the same for consistency.
Fixes  #131 
Signed-off-by: David Russell <david.russell.scotland@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								7191d804ec 
								
									
								
							
								 
							
						 
						
							
							
								
								Updated jaxb2 plugin to allow generation in non UTF-8 encoding  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								752704c15d 
								
							
								 
							
						 
						
							
							
								
								Merge Pull Request  #172  into develop. #yolo  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								0749b5f281 
								
									
								
							
								 
							
						 
						
							
							
								
								Removed no longer needed setting for mysql  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								a097644e5f 
								
									
								
							
								 
							
						 
						
							
							
								
								Created a better workaround for  https://liquibase.jira.com/browse/CORE-2966  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								9540167d49 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Only create indices with tables"  
							
							... 
							
							
 
							
							This reverts commit f26addfd1b 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								ea592d7778 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #188  from fxthomas/fix-shortcuts-and-coverart-overflow  
							
							... 
							
							
 
							
							Fix shortcut help text and cover art overflow 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								3dd21c6465 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #171  
							
							... 
							
							
 
							
							New logo. 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								cd348fe21e 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix typo in 'next song' keyboard shortcut help  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								df345f0342 
								
									
								
							
								 
							
						 
						
							
							
								
								Hide cover art overflows again when needed  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								0cbd3ad538 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix overflow and tests  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								30bc5a90f5 
								
							
								 
							
						 
						
							
							
								
								Update StringUtil.java  
							
							... 
							
							
 
							
							Added TB 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								478c32a631 
								
									
								
							
								 
							
						 
						
							
							
								
								Mark old checksums as valid  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								f26addfd1b 
								
									
								
							
								 
							
						 
						
							
							
								
								Only create indices with tables  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								667367280f 
								
									
								
							
								 
							
						 
						
							
							
								
								Added testcase to reproduce liquibase failure  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								18e793c64d 
								
									
								
							
								 
							
						 
						
							
							
								
								Make dao layer more db vendor agnostic  
							
							... 
							
							
 
							
							- Removed usages of TOP
- Dont send null for autogenerate columns
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								f60811e51b 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix ambigous constructor ref that seems to only happen on debian  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								529cb6c317 
								
									
								
							
								 
							
						 
						
							
							
								
								Added documentation  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								4b34bc0139 
								
									
								
							
								 
							
						 
						
							
							
								
								Convert to liquibase from handrolled migration tool  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								1d9b7d48c5 
								
									
								
							
								 
							
						 
						
							
							
								
								Migrate from Properties to Commons-Configuration  
							
							... 
							
							
 
							
							- Added loading of properties file before database initialization
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								762ce0ad52 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Auto locate transcoder binary"  
							
							... 
							
							
 
							
							This reverts commit cadc1022f1 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								f344fbb989 
								
									
								
							
								 
							
						 
						
							
							
								
								Fixes   #180  Display validation errors on user settings tab  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								8d28f2ab87 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #185  from plastikman/develop-nolicense-fixcoverart  
							
							... 
							
							
 
							
							Cherry picked https://sourceforge.net/p/subsonic/code/4587/  
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								c9afbac242 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #178  from plastikman/nolicense  
							
							... 
							
							
 
							
							Remove all premium/license calls. 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								7e9c2582f5 
								
							
								 
							
						 
						
							
							
								
								fixed derps with merges  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								3d23b540ba 
								
							
								 
							
						 
						
							
							
								
								fixed some derps with merge conflicts  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								28f81a7107 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into develop-nolicense-fixcoverart  
							
							... 
							
							
 
							
							Conflicts:
	libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
	libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								b0e91b5569 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:libresonic/libresonic into nolicense  
							
							... 
							
							
 
							
							Conflicts:
	libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
	libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
	libresonic-main/src/main/webapp/WEB-INF/jsp/premiumSettings.jsp 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								baa681619c 
								
							
								 
							
						 
						
							
							
								
								Forgot to remove the premiumSettings.jsp  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								72851f0721 
								
							
								 
							
						 
						
							
							
								
								Back ported last.fm coverart service from Subsonic 6.0_beta1  
							
							... 
							
							
 
							
							None of this code is mine, I just integrated it. 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								c2f9803adc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #182  from muff1nman/log-errors  
							
							... 
							
							
 
							
							Log Errors 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								51de74b7c5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #183  from muff1nman/settings-fixes  
							
							... 
							
							
 
							
							Fixes  #179  and Fixes  #181  
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								5ba7e77e11 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix build dependency  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								699ea643e2 
								
									
								
							
								 
							
						 
						
							
							
								
								Fixes   #179  and  Fixes   #181  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								95159ed298 
								
									
								
							
								 
							
						 
						
							
							
								
								Added logging exception resolver  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								2b236e8d47 
								
							
								 
							
						 
						
							
							
								
								Missed a couple lines in the playqueuecast.jsp  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								e06d9dbc22 
								
							
								 
							
						 
						
							
							
								
								Removed the rest of the license, now builds  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								66ae21856c 
								
							
								 
							
						 
						
							
							
								
								Removed all traces of premium license  
							
							
 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								74b60013c7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #177  from fxthomas/fix-shuffle-radio-spring-4  
							
							... 
							
							
 
							
							Migrate random play queues to Spring 4 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								22fe408818 
								
									
								
							
								 
							
						 
						
							
							
								
								Migrate random play queues to Spring 4  
							
							
 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								cadc1022f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Auto locate transcoder binary  
							
							... 
							
							
 
							
							Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com> 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								5ae6f5462a 
								
							
								 
							
						 
						
							
							
								
								Clean up dependencies  
							
							
 
							
						 
						
							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