MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,103 Commits 2 Branches 0 Tags
3d0d0482f550049c325ba1a757c5f5ccec081b19
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew DeMaria 3d0d0482f5 Merge remote-tracking branch 'origin/pr/985' 2019-07-03 19:22:17 -06:00
Andrew DeMaria 42bced139f Small refactor on httpservletrequest injection 2019-07-02 00:59:38 -06:00
Andrew DeMaria a9b4d481c3 Merge remote-tracking branch 'origin/pr/1129' 2019-07-01 21:14:11 -06:00
Andrew DeMaria 2bfaea2e22 Merge remote-tracking branch 'origin/pr/1090' 2019-07-01 20:45:48 -06:00
Andrew DeMaria f8bd580fb7 Revert "Replace wz_tooltip.js with jquery-ui" and Revert "Fix #1112" 
This reverts commit 50467942c8.
This reverts commit 195a0879c3.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-06-26 17:16:34 -06:00
Andrew DeMaria 50467942c8 Fix #1112 2019-06-26 16:18:16 -06:00
Andrew DeMaria cf5a43d327 Merge remote-tracking branch 'origin/pr/1134' 2019-06-26 12:50:48 -06:00
Andrew DeMaria 85e0deeab2 Merge remote-tracking branch 'origin/pr/1143' 2019-06-26 12:41:39 -06:00
Andrew DeMaria 680da7a190 Merge remote-tracking branch 'origin/pr/1147' 2019-06-26 11:56:36 -06:00
Andrew DeMaria 4d615a35f4 Add comment for why ossindex is disabled 2019-06-26 11:52:11 -06:00
Andrew DeMaria e9986606ca Merge remote-tracking branch 'origin/pr/1148' 2019-06-26 11:50:12 -06:00
Andrew DeMaria f134f81e7a Use openjdk for most of the tests 2019-06-26 11:44:01 -06:00
Andrew DeMaria 05580ae7f3 Fix typo 2019-06-26 11:23:49 -06:00
Andrew DeMaria c2acc36f85 Disable ossindex analyzer as its data is questionable 2019-06-26 11:20:45 -06:00
Andrew DeMaria 7c7ac3e591 Update dependency check 2019-06-26 10:57:49 -06:00
Andrew DeMaria 7a769d57cf Merge remote-tracking branch 'origin/pr/1103' 2019-06-14 12:01:37 -06:00
Andrew DeMaria 57dea9598e Merge remote-tracking branch 'origin/pr/1118' 2019-06-14 11:54:54 -06:00
Andrew DeMaria 910e292af1 Merge remote-tracking branch 'origin/pr/1119' 2019-06-14 11:53:26 -06:00
Andrew DeMaria 2b178c4117 Merge remote-tracking branch 'origin/pr/1120' 2019-06-14 11:52:46 -06:00
Andrew DeMaria 5671d11ab4 Merge remote-tracking branch 'origin/pr/1000' 2019-06-10 23:58:16 -06:00
Andrew DeMaria c8f9c75d19 Merge remote-tracking branch 'origin/pr/887' 2019-06-10 23:28:19 -06:00
Andrew DeMaria 14b812568c Merge remote-tracking branch 'origin/pr/1072' 2019-06-10 23:06:51 -06:00
Andrew DeMaria e646077957 Merge remote-tracking branch 'origin/pr/1097' 2019-06-10 22:50:00 -06:00
Andrew DeMaria 6baa2d09d6 Merge remote-tracking branch 'origin/pr/1091' 2019-06-06 19:58:12 -06:00
Andrew DeMaria 90712d2940 Merge remote-tracking branch 'origin/pr/1092' 2019-06-06 19:55:56 -06:00
Andrew DeMaria 3d4ff601bf Merge remote-tracking branch 'origin/pr/966' 2019-05-23 11:20:27 -06:00
Andrew DeMaria ce2a56e6f1 Merge remote-tracking branch 'origin/pr/1033' 2019-05-23 10:45:07 -06:00
Andrew DeMaria 590abb40e4 Merge remote-tracking branch 'origin/pr/1064' 2019-05-23 10:27:57 -06:00
Andrew DeMaria fa514f6929 Merge remote-tracking branch 'origin/pr/1026' 2019-05-23 10:21:04 -06:00
Andrew DeMaria 72e4c7b965 Merge remote-tracking branch 'origin/pr/1035' 2019-05-23 10:18:39 -06:00
Andrew DeMaria 68723db2e9 Test m4a and flac streaming 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-05-22 22:59:13 -06:00
Andrew DeMaria 16fb6d6134 Disable gpg plugin for integration test 2019-05-21 14:06:01 -06:00
Andrew DeMaria 445b4fba03 Add 10.3.1 change notes 2019-05-21 14:05:52 -06:00
Andrew DeMaria 310156f891 CVE-2019-12086 - bump jackson version 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-05-21 12:58:38 -06:00
Andrew DeMaria 4e7b2aaa71 Docs for creating a release 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-05-21 12:06:31 -06:00
Andrew DeMaria ae968078bb Merge remote-tracking branch 'origin/pr/1068' 2019-05-21 11:52:36 -06:00
Andrew DeMaria 2643545b39 Rename utilsjs 2019-05-21 11:00:27 -06:00
Andrew DeMaria b407231132 Update changelog for 10.3.0 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-05-20 17:10:24 -06:00
Andrew DeMaria 6fbed41b7b Add date for version release 2019-05-20 17:00:27 -06:00
Andrew DeMaria 8be0746bd4 Bump to 10.4.0 SNAPSHOT 2019-05-20 16:59:57 -06:00
Andrew DeMaria 7203d4ba6b One more changelog update 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-05-20 15:59:10 -06:00
Andrew DeMaria 53142c8702 Merge remote-tracking branch 'origin/pr/1062' 2019-05-20 15:53:22 -06:00
Andrew DeMaria f1831820f4 Update docker base image 2019-05-20 15:36:08 -06:00
Andrew DeMaria 493a53b418 Merge remote-tracking branch 'origin/pr/930' 2019-05-20 15:30:15 -06:00
Andrew DeMaria 6729838030 Changelog updates for 10.3.0 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-05-20 15:27:57 -06:00
Andrew DeMaria bec5cec4a2 Merge remote-tracking branch 'origin/pr/930' 2019-05-20 15:05:18 -06:00
Andrew DeMaria 0a1164966d Merge remote-tracking branch 'origin/pr/1032' 2019-05-20 14:52:32 -06:00
Andrew DeMaria cdd307d86f Merge remote-tracking branch 'origin/pr/1042' 2019-05-20 14:50:56 -06:00
Andrew DeMaria 1e89890223 Merge remote-tracking branch 'origin/pr/1038' 2019-05-20 14:17:33 -06:00
Andrew DeMaria 7b628ed8dd Merge remote-tracking branch 'origin/pr/1056' 2019-05-16 13:05:19 -06:00
Andrew DeMaria ac0a722a10 Merge remote-tracking branch 'airsonic/pr/990' 2019-04-28 22:59:23 -04:00
Andrew DeMaria b51cdc1c5c Merge remote-tracking branch 'airsonic/pr/1028' 2019-04-28 22:58:29 -04:00
Andrew DeMaria 4537495baf Merge remote-tracking branch 'airsonic/pr/1012' 2019-04-28 22:55:50 -04:00
Andrew DeMaria 3cdecb87f4 Merge remote-tracking branch 'airsonic/pr/1037' 2019-04-28 19:20:03 -04:00
Andrew DeMaria a911ebab80 Merge remote-tracking branch 'origin/pr/1027' 2019-04-27 20:27:37 -06:00
Andrew DeMaria df352d8cb0 Fix #611 Add support for Java 9 and greater 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-04-27 14:04:48 -06:00
Andrew DeMaria 2162250101 Revert "Minor frameset-related factorization" 
This reverts commit e69287cfe6.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-04-27 14:00:52 -06:00
Andrew DeMaria a14c8549fa Merge remote-tracking branch 'origin/pr/963' 2019-04-27 11:56:46 -06:00
Andrew DeMaria a3e59e9724 Fix file encoding 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-04-27 10:56:09 -06:00
Andrew DeMaria e5c36d9854 Fix variable name 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-04-27 10:55:54 -06:00
Andrew DeMaria d8a5d1afad Merge remote-tracking branch 'origin/pr/1034' 2019-04-27 10:45:48 -06:00
Andrew DeMaria afc2f58ac5 Merge remote-tracking branch 'origin/pr/1036' 2019-04-27 10:39:19 -06:00
Andrew DeMaria ab07462530 Update tomcat to 8.5.40 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-04-27 10:36:10 -06:00
Andrew DeMaria 1463f75b06 Merge remote-tracking branch 'origin/pr/961' 2019-04-19 09:51:41 -06:00
Andrew DeMaria 693336af83 Merge remote-tracking branch 'origin/pr/967' 2019-04-19 09:50:32 -06:00
Andrew DeMaria e2e1554e93 Merge remote-tracking branch 'origin/pr/968' 2019-04-19 09:49:06 -06:00
Andrew DeMaria cddc2b2fa7 Merge remote-tracking branch 'origin/pr/983' 2019-04-19 09:48:05 -06:00
Andrew DeMaria d03b4dd963 Merge remote-tracking branch 'origin/pr/984' 2019-04-19 09:47:28 -06:00
Andrew DeMaria 2030caa219 Merge remote-tracking branch 'origin/pr/994' 2019-04-19 09:46:40 -06:00
Andrew DeMaria 1bd70263bd Merge remote-tracking branch 'origin/pr/989' 2019-04-19 09:41:06 -06:00
Andrew DeMaria 24f5c2d8f5 Merge remote-tracking branch 'origin/pr/1005' 2019-04-19 09:40:48 -06:00
Andrew DeMaria 3f9c525933 Merge remote-tracking branch 'origin/pr/1007' 2019-04-19 09:39:48 -06:00
Andrew DeMaria 50964fa378 Merge remote-tracking branch 'origin/pr/1002' 2019-04-19 09:39:17 -06:00
Andrew DeMaria 326583839e Merge remote-tracking branch 'origin/pr/982' 2019-04-19 08:17:33 -06:00
Andrew DeMaria a2b423aa82 Merge remote-tracking branch 'origin/pr/1020' 2019-04-19 08:17:18 -06:00
Andrew DeMaria f5250e36f1 Merge remote-tracking branch 'origin/pr/1021' 2019-04-19 08:17:06 -06:00
Andrew DeMaria fdfa244ad4 Merge remote-tracking branch 'origin/pr/1022' 2019-04-19 08:16:57 -06:00
Andrew DeMaria fe08dd1c94 Merge remote-tracking branch 'origin/pr/1023' 2019-04-19 08:16:43 -06:00
Andrew DeMaria 969394a1c9 Merge remote-tracking branch 'origin/pr/1006' 2019-04-19 08:16:30 -06:00
Andrew DeMaria 10e90beb30 Refactor stream integration test 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-04-10 22:43:15 -06:00
Andrew DeMaria c3a1980ca2 Merge remote-tracking branch 'airsonic/pr/964' 2019-04-05 23:23:52 -04:00
Andrew DeMaria 15c6a8861b Fix formatting on external player for firefox 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-04-05 23:14:48 -04:00
Andrew DeMaria b128479972 Merge remote-tracking branch 'airsonic/pr/962' 2019-04-05 22:28:22 -04:00
Andrew DeMaria 4b2cf99adf Merge remote-tracking branch 'airsonic/pr/951' 2019-04-05 22:26:27 -04:00
Andrew DeMaria 8e0d49834c Merge remote-tracking branch 'airsonic/pr/929' 2019-04-05 22:22:40 -04:00
Andrew DeMaria ab33b34a67 Merge remote-tracking branch 'airsonic/pr/898' 
Conflicts:
	airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
 2019-04-05 22:11:18 -04:00
Andrew DeMaria 8ed98ebb6b Merge remote-tracking branch 'airsonic/pr/980' 2019-04-05 21:40:34 -04:00
Andrew DeMaria f04ec61d0f Merge remote-tracking branch 'airsonic/pr/958' 2019-04-01 22:43:42 -04:00
Andrew DeMaria 58f4dfdb2e Merge remote-tracking branch 'airsonic/pr/957' 2019-04-01 22:42:39 -04:00
Andrew DeMaria a59e8e4a9f Merge remote-tracking branch 'airsonic/pr/956' 2019-04-01 22:42:16 -04:00
Andrew DeMaria afb9c6bfb7 Merge remote-tracking branch 'airsonic/pr/954' 2019-04-01 22:41:36 -04:00
Andrew DeMaria 1daa6cff6e Merge remote-tracking branch 'airsonic/pr/952' 2019-04-01 22:39:38 -04:00
Andrew DeMaria 72609a8d0c Merge remote-tracking branch 'airsonic/pr/950' 2019-04-01 22:34:30 -04:00
Andrew DeMaria c460a16628 Merge remote-tracking branch 'airsonic/pr/928' 2019-04-01 22:32:05 -04:00
Andrew DeMaria 83882b18d9 Merge remote-tracking branch 'airsonic/pr/919' 2019-03-31 20:01:31 -04:00
Andrew DeMaria 81835aa589 Merge remote-tracking branch 'airsonic/pr/934' 2019-03-31 19:56:56 -04:00
Andrew DeMaria f8f5c4a6bf Merge remote-tracking branch 'airsonic/pr/936' 2019-03-31 19:53:49 -04:00
Andrew DeMaria b73ab9c45e Merge remote-tracking branch 'airsonic/pr/949' 2019-03-31 19:53:17 -04:00
Andrew DeMaria 78ee5bd1da Merge remote-tracking branch 'airsonic/pr/948' 2019-03-31 19:46:17 -04:00
Andrew DeMaria 221a0ed933 Merge remote-tracking branch 'airsonic/pr/945' 2019-03-31 19:45:56 -04:00