MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
457 Commits 2 Branches 0 Tags
7c19e9f4ab1085a357b937487b566cbb2b1d1023
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew DeMaria 7c19e9f4ab Merge branch 'stable' into develop 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>

Conflicts:
	libresonic-main/pom.xml
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml
 2017-05-04 17:38:42 -06:00
Andrew DeMaria 0916ab1aac Dont mix ws and normal HttpServletRequest retrieval methods 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-05-03 17:18:50 -06:00
Andrew DeMaria 68170789d7 Merge remote-tracking branch 'origin/pr/365' into develop 2017-05-01 21:20:42 -06:00
Andrew DeMaria 37ae8d9f61 Fix previous checksum 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-28 21:10:13 -06:00
Andrew DeMaria bba6e45664 Fixes #331 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-25 20:41:52 -06:00
Andrew DeMaria b108787f1b Fixed auth login failure logging 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-22 10:04:48 -06:00
Andrew DeMaria 6f3ede33d9 Bump jaudio tagger version 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-17 20:17:54 -06:00
Andrew DeMaria 856733d639 Fix recover and access denied security 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-15 17:18:29 -06:00
Andrew DeMaria e3d2dc292f Fix csrf token with multipart upload 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-15 16:53:12 -06:00
Andrew DeMaria 589909b906 Cache avatar view 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-12 21:06:54 -06:00
Andrew DeMaria b2957139a3 Cache script, dwr, icons and coverArt 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-12 21:06:48 -06:00
Andrew DeMaria b22437c735 Bump to 6.3 snapshot 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-10 19:19:42 -06:00
Andrew DeMaria 60248477f6 Cache avatar view 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-08 10:40:19 -06:00
Andrew DeMaria b6544e6738 Cache script, dwr, icons and coverArt 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-08 10:34:12 -06:00
Andrew DeMaria 49f4b45725 Merge remote-tracking branch 'origin/pr/315' into develop 2017-04-08 10:10:32 -06:00
Andrew DeMaria 8505d69dd5 Fixed null pointer exception when getting avatar when NONE 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-08 10:01:40 -06:00
Andrew DeMaria fdcb4adb3b Add logger before create media file 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-07 18:02:51 -06:00
Andrew DeMaria cb781fde26 Removed unused license notice jsp 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-07 17:57:34 -06:00
Andrew DeMaria 678c3a7cd3 Change back to snapshot 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-04 06:54:18 -06:00
Andrew DeMaria cd0665e426 Added debug info of scan date 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-04 06:37:42 -06:00
Andrew DeMaria f7bd43136b Lock Down unsecured urls 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-03 18:22:43 -06:00
Andrew DeMaria bcbd6c361f Added test database versions 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-04-02 21:54:17 -06:00
Andrew DeMaria 8e99811fe0 Use proper resource loading for Upnp Logo #320 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-27 20:13:52 -06:00
Andrew DeMaria e47928d26a Possible fix for #319 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-27 19:45:45 -06:00
Andrew DeMaria 312774de9b Added type to rest api 2017-03-25 00:23:43 -06:00
Andrew DeMaria 11e80dd43b Jetty and Tomcat spring boot support 
Spring boot supports both Jetty and Tomcat, however only one is supposed
to be used at a time. This is problematic for us, because we would like
to have both on the classpath so we can configure them (i.e.
org.libresonic.player.boot.TomcatApplication). To remedy this, we mark
both as provided, but have two profiles which then tell spring to
exclude one or the other from the lib-provided war. These exclude rules
are a bit fragile, but can be reproduced by analyzing mvn
dependency:tree output.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-24 16:20:34 -06:00
Andrew DeMaria b53f8eef17 Catch NoClassDefFoundError as well 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-23 22:46:38 -06:00
Andrew DeMaria 6900142c4d Added doc from @texneues for https on tomcat and freebsd 2017-03-23 20:41:33 -06:00
Andrew DeMaria 07ff71df0c Consolidate Logging 
- Use sl4fj as a backend to org.libresonic.Logger
- Output the same logs to libresonic.log as the console
- Use spring-boot logging constructs
- Turn down logging to error for non-libresonic classes info for
  libresonic classes and liquibase (perhaps change this in the future,
  but might be helpful for folks migrating their databases).

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-22 21:36:00 -06:00
Andrew DeMaria a12bdd6e0a Merge branch 'stable' into develop 
Conflicts:
	CHANGELOG.md
	INSTALL.md
	libresonic-assembly/pom.xml
	libresonic-booter/pom.xml
	libresonic-booter/src/main/resources/images/libresonic-512.png
	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-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema62.java
	libresonic-main/src/main/resources/org/libresonic/player/service/logo-512.png
	libresonic-main/src/main/webapp/icons/buuftheme/logo.png
	libresonic-main/src/main/webapp/icons/coolandclean/logo.png
	libresonic-main/src/main/webapp/icons/default_dark/logo_light.png
	libresonic-main/src/main/webapp/icons/default_light/logo.png
	libresonic-main/src/main/webapp/icons/denim/logo_light.png
	libresonic-main/src/main/webapp/icons/groove/logo.png
	libresonic-main/src/main/webapp/icons/hicon/logo.png
	libresonic-main/src/main/webapp/icons/hiconi/logo_light.png
	libresonic-main/src/main/webapp/icons/hitech/logo_light.png
	libresonic-main/src/main/webapp/icons/midnightfun/logo.png
	libresonic-main/src/main/webapp/icons/monochrome/logo.png
	libresonic-main/src/main/webapp/icons/monochrome/logo_light.png
	libresonic-main/src/main/webapp/icons/pinkpanther/logo_light.png
	libresonic-main/src/main/webapp/icons/simplify/logo_light.png
	libresonic-main/src/main/webapp/icons/slick/logo_light.png
	libresonic-main/src/main/webapp/icons/sonic/logo.png
	libresonic-main/src/main/webapp/icons/sonic_blue/logo_light.png
	libresonic-main/src/main/webapp/icons/sonic_white/logo.png
	libresonic-main/src/main/webapp/icons/subStandard/logo_light.png
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml
 2017-03-22 19:47:57 -06:00
Andrew DeMaria a7be3743b1 Merge remote-tracking branch 'personal/album-subdirs-pagination' into develop 2017-03-22 19:07:19 -06:00
Andrew DeMaria 4b7ab82017 Merge remote-tracking branch 'origin/pr/304' into develop 2017-03-22 19:07:11 -06:00
Andrew DeMaria a1698861d4 Change to server-side pagination for Sibling Albums and Sub Dirs 
- Only paritial pagination, first X, then showAll
- Default is 40 for subDirs and sibling albums each
- showAll parameter causes page refresh with entirely new list

TODO/Future improvements include:
- Finer grain pagination
- Pagination done at the database level
- Seamless refresh with JS
- Unify all pagination uses across the site

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-22 19:00:48 -06:00
Andrew DeMaria f78b4a2d76 Relax rest view suffix 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-20 18:10:56 -06:00
Andrew DeMaria c309eb79de Merge remote-tracking branch 'origin/pr/303' into develop 2017-03-19 19:43:31 -06:00
Andrew DeMaria 9c224b7853 Added UI for Database settings 
Also cleanup some documentation

*Database Settings have been renamed and will require manually fixing
from 6.2beta1*

database.varchar.maxlength -> DatabaseMysqlMaxlength
database.config.type -> DatabaseConfigType
database.config.embed.driver -> DatabasigEmbedDriver
database.config.embed.url -> DatabaseConfigEmbedUrl
database.config.embed.username -> DatabasigEmbedUsername
database.config.embed.password -> DatabasigEmbedPassword
database.config.jndi.name -> DatabaseConfigJNDIName
database.usertable.quote -> DatabaseUsertableQuote

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-19 16:35:26 -06:00
Andrew DeMaria 9b35781b87 Fix #296 4XX on podcasts page 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-16 15:27:07 -06:00
Andrew DeMaria a16ef6e9c3 Merge branch 'banner' into develop 2017-03-15 18:52:53 -06:00
Andrew DeMaria 83373193f4 Merge remote-tracking branch 'origin/pr/288' into develop 2017-03-14 21:13:39 -06:00
Andrew DeMaria b9b34d22d7 Remove stack trace output 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-14 21:12:00 -06:00
Andrew DeMaria 988c98b3a9 Added libresonic banner 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-14 21:02:11 -06:00
Andrew DeMaria 509fd8f6aa Various documentation improvements 
- Remove duplicate and outdated INSTALL.md file
- Clarity around supported platforms
- Misc

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-11 19:05:04 -07:00
Andrew DeMaria 3c43630f93 Reduce logging during tests to make travis happy 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-11 18:21:03 -07:00
Andrew DeMaria d8eb4109b8 Turn off reuse forks 
Reusing forks seems to cause problems with the Jenkins build.
It adds about 2 minutes additional test time

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-11 17:58:31 -07:00
Andrew DeMaria 6e5ba7a261 Cleanup unused file and reorder test home setup 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-11 17:38:45 -07:00
Andrew DeMaria 81553a55b5 Fix test dependency 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-11 17:22:17 -07:00
Andrew DeMaria dad809cf79 Added test case for special characters 2017-03-11 17:05:07 -07:00
Andrew DeMaria 97a54658c6 Avoid direct dependency on tomcat 
- Use reflection to invoke tomcat configs

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-07 22:20:05 -07:00
Andrew DeMaria 68967a0f8d Cleanup pom and remove full profile 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-05 21:26:18 -07:00
Andrew DeMaria 190208debc Correctly calculate base url in the case a proxy server is present 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-03 15:25:03 -07:00
Andrew DeMaria 0c629abd4f Removed unused network status 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-03 15:24:03 -07:00
Andrew DeMaria 8b92f2bc51 Remove url redirection 
- Add upnp specific base url
- Use http request base url for areas used by url redirection
- Fix sharing
- Removed Network Settings tab

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-03-03 15:23:59 -07:00
Andrew DeMaria 333d2f13fd Fix link 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-26 13:56:36 -07:00
Andrew DeMaria dbab20e096 Added transcoder setup doc 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-26 13:54:39 -07:00
Andrew DeMaria 464e2825d5 Removed unused import 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-25 16:08:13 -07:00
Andrew DeMaria 502b5fba17 Fix #257 Playlist download dups 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-25 16:04:20 -07:00
Andrew DeMaria b72c513c6a Removed port forwarding 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-23 21:02:06 -07:00
Andrew DeMaria 2791287bd5 Merge branch 'biconou-install' into develop 2017-02-23 20:31:45 -07:00
Andrew DeMaria 6d3c3e2d8d Use more intelligent version parsing 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-23 20:31:19 -07:00
Andrew DeMaria 48c4bba92e Added screenshot 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-19 21:41:22 -07:00
Andrew DeMaria 2fa3d61506 Added screenshot 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-19 21:37:36 -07:00
Andrew DeMaria cc0ac2e4d2 Removed chat feature 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-19 21:02:41 -07:00
Andrew DeMaria 370089f3e1 Stop using legacy schema version scheme, set it to 100 as the last update 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-19 21:01:50 -07:00
Andrew DeMaria d12c790a0e Bump apache commons libraries to fix some known bugs 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-19 21:01:07 -07:00
Andrew DeMaria 370fbeb6b4 Change the version back to 6.2 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-19 20:59:08 -07:00
Andrew DeMaria 0d8fb8c318 Remove BUILD.md as its redundant to INSTALL.md 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-02-19 15:45:36 -07:00
Andrew DeMaria 1f1ec26634 Fixed rating query 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-30 12:43:10 -07:00
Andrew DeMaria 488a7d720b Reimplement ldap 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-30 12:43:02 -07:00
Andrew DeMaria e15eec7fdd Fixed column reference 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-28 16:09:13 -07:00
Andrew DeMaria c37f25c2ba Make xspf import less picky 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-21 13:49:40 -07:00
Andrew DeMaria cf849ee948 Added csrf token to html forms 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-21 09:48:09 -07:00
Andrew DeMaria d5ccb9bb78 Added other spring related information to error.jsp 2017-01-21 09:23:47 -07:00
Andrew DeMaria 9292c457c9 Updated proxy doc 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-20 21:07:00 -07:00
Andrew DeMaria 0ecdaec783 Removed unncessary build steps in travis 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-17 21:24:16 -07:00
Andrew DeMaria d681eda914 Remove installation from project 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-17 21:23:33 -07:00
Andrew DeMaria 2948ae0f78 Fix remember me 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-15 14:09:47 -07:00
Andrew DeMaria 9df2660d1e Allow data source config type to be specified via system property 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-15 12:48:18 -07:00
Andrew DeMaria d6d53ef2f6 Standardize import order and add maven plugin to check 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-13 19:58:48 -07:00
Andrew DeMaria 4dc97f8dbb Removed synchronized from dao layer and replaced with transactions 
Also improved tests to be more spring like

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-13 18:35:20 -07:00
Andrew DeMaria 153ba1adfa Cleanup playlists controller and fix 404 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-07 14:50:21 -07:00
Andrew DeMaria 37b35cdb87 More logout fixes 
- Ensure logout query parameters are allowed by spring security
- Allow GET request for logout

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-07 14:35:14 -07:00
Andrew DeMaria 6427b0ce59 Added back in force default login url 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-07 14:35:05 -07:00
Andrew DeMaria edc734dc43 Fixed logout jsp url reference 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-07 13:52:20 -07:00
Andrew DeMaria 0a16c2cb52 Merge remote-tracking branch 'origin/pr/210' into develop 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-07 13:32:16 -07:00
Andrew DeMaria fd9fd618af Fix #211 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-07 13:29:16 -07:00
Andrew DeMaria bbe20e2556 Fix podcast query 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-04 23:37:40 -07:00
Andrew DeMaria f57da83df1 Removed checkpoint call 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-04 23:37:35 -07:00
Andrew DeMaria 7b304cf57d Fix sql type error for postgres 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-04 23:37:29 -07:00
Andrew DeMaria 49dc5176d5 General fixups 
- Fixed tomcat deployment
- Removed web.xml
- Migrated to servlet api 3
- Added back in logging error resolver
- Fixed error jsp page not working
- Fixed login path when deployed to tomcat
- Cleanup custom liquibase precondition class
- Made the hsql index check more robust

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2017-01-04 23:37:22 -07:00
Andrew DeMaria c6ff05fa7a Fixes #198 Use correct libresonic home 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-31 10:12:41 -07:00
Andrew DeMaria fac659eb24 Fixed assigning a playlist to a user 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-31 10:12:33 -07:00
Andrew DeMaria 0749b5f281 Removed no longer needed setting for mysql 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-23 15:16:45 -07:00
Andrew DeMaria a097644e5f Created a better workaround for https://liquibase.jira.com/browse/CORE-2966 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-23 15:16:41 -07:00
Andrew DeMaria 9540167d49 Revert "Only create indices with tables" 
This reverts commit f26addfd1b.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-23 15:16:37 -07:00
Andrew DeMaria 0cbd3ad538 Fix overflow and tests 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-23 12:10:54 -07:00
Andrew DeMaria 478c32a631 Mark old checksums as valid 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-23 11:42:06 -07:00
Andrew DeMaria f26addfd1b Only create indices with tables 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-23 11:42:02 -07:00
Andrew DeMaria 667367280f Added testcase to reproduce liquibase failure 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-23 11:41:58 -07:00
Andrew DeMaria 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>
 2016-12-23 11:41:55 -07:00
Andrew DeMaria f60811e51b Fix ambigous constructor ref that seems to only happen on debian 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-23 11:41:51 -07:00