MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
954 Commits 2 Branches 0 Tags
4537495bafe63d1862ebecf0fa6c13c0cdad59b4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Andrew DeMaria edd097ad5b Add a couple of static analysis badges 2019-03-31 19:33:32 -04:00
Andrew DeMaria cd45717256 Merge remote-tracking branch 'airsonic/pr/938' 2019-03-31 19:31:18 -04:00
Andrew DeMaria 570abe69d5 Merge remote-tracking branch 'airsonic/pr/939' 2019-03-31 19:29:39 -04:00
Andrew DeMaria d5500ce3d2 Merge remote-tracking branch 'airsonic/pr/941' 2019-03-31 19:24:26 -04:00
Andrew DeMaria 41a5ae06d5 Merge remote-tracking branch 'airsonic/pr/922' 2019-03-31 19:20:33 -04:00
Andrew DeMaria 6613bd86d5 Merge remote-tracking branch 'airsonic/pr/907' 2019-03-31 19:19:44 -04:00
Andrew DeMaria c9a209fd8f Merge remote-tracking branch 'airsonic/pr/943' 2019-03-31 19:16:41 -04:00
Andrew DeMaria 2b0fe25eff Merge remote-tracking branch 'airsonic/pr/946' 2019-03-31 19:16:28 -04:00
Andrew DeMaria e330eeb864 Remove coverity integration - not working 2019-03-27 20:50:03 -06:00
Andrew DeMaria 4e73266a7f Add travis ci badge 2019-03-27 19:58:55 -06:00
Andrew DeMaria 897de26886 Remove comment 2019-03-27 19:56:13 -06:00
Andrew DeMaria bc0bfdf481 Update scan token 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-03-27 19:14:32 -06:00
Andrew DeMaria fb0079d3c0 Merge remote-tracking branch 'origin/pr/932' 2019-03-27 19:02:25 -06:00
Andrew DeMaria 54e1237320 Exclude new spring 5.0.5 cve 2019-03-27 19:00:14 -06:00
Andrew DeMariaandGitHub 5dc96ba011 Add coverity badge 2019-03-27 18:50:37 -06:00
Andrew DeMaria 8a1f36c792 Revert change to DWR fixes #923 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-03-26 16:08:54 -06:00
Andrew DeMaria e76d44d957 Merge remote-tracking branch 'origin/pr/908' 2019-03-26 13:59:48 -06:00
Andrew DeMaria 9413f1f489 Merge remote-tracking branch 'origin/pr/912' 2019-03-26 13:00:39 -06:00
Andrew DeMaria 8f1d790784 Merge remote-tracking branch 'origin/pr/913' 2019-03-26 13:00:08 -06:00
Andrew DeMaria 00ee8a9662 Merge remote-tracking branch 'origin/pr/915' 2019-03-26 12:59:48 -06:00
Andrew DeMaria a3041a59c7 Merge remote-tracking branch 'origin/pr/916' 2019-03-26 12:59:22 -06:00
Andrew DeMaria 143a220719 Merge remote-tracking branch 'airsonic/pr/849' 
Conflicts:
	airsonic-main/cve-suppressed.xml
	airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java
	airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java
	pom.xml
 2019-03-16 19:27:53 -04:00
Andrew DeMaria 0d78c30d06 Change a couple more log entries to debug 2019-03-16 12:56:57 -04:00
Andrew DeMaria 360f469bf1 Merge remote-tracking branch 'airsonic/pr/895' 2019-03-16 12:55:02 -04:00
Andrew DeMaria 972c6cd462 Dont sign until verify stage 2019-03-16 12:53:30 -04:00
Andrew DeMaria 3fb697ddce Update Changelog 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-02-18 22:46:10 -05:00
Andrew DeMaria 1a88f46c18 CVE-2018-20222 Prevent xxe during parse 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-02-18 22:46:05 -05:00
Andrew DeMaria faedfd8a62 Bump version to 10.3.0-SNAPSHOT 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-02-18 21:58:15 -05:00
Andrew DeMaria a16b89e0ac Bump to version 10.2.0-RELEASE 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2019-02-16 11:38:17 -07:00
Andrew DeMaria a1abdb580b Update changelog 2019-02-16 11:34:36 -07:00
Andrew DeMaria e4bb808862 Merge remote-tracking branch 'origin/pr/869' 2019-02-16 10:46:18 -07:00
Andrew DeMaria adc224147a Merge remote-tracking branch 'airsonic/pr/855' 2019-01-09 21:02:23 -05:00
Andrew DeMaria 5e14996dc3 Merge remote-tracking branch 'airsonic/pr/859' 2019-01-09 20:59:14 -05:00
Andrew DeMaria ac0e29bf9c Remove unused import 2019-01-08 21:57:23 -05:00
Andrew DeMaria 61c0c0d758 Fix import style error 2019-01-08 21:56:26 -05:00
Andrew DeMaria 06a8e2dc02 Merge remote-tracking branch 'airsonic/pr/833' 2019-01-08 21:46:11 -05:00
Andrew DeMaria 355868bf60 Bump spring version 2019-01-08 21:41:33 -05:00
Andrew DeMaria ee4cb71052 Ignore CVE-2018-8088 related to slf4j ext 2019-01-08 21:41:13 -05:00
Andrew DeMaria fb18862db4 Fix extraneous closing tag 2018-12-09 23:59:31 -05:00
Andrew DeMaria cddacb61c2 Merge remote-tracking branch 'airsonic/pr/834' 2018-12-09 23:48:49 -05:00
Andrew DeMaria 4d56df06ba Merge remote-tracking branch 'airsonic/pr/844' 2018-12-09 23:40:31 -05:00
Andrew DeMaria 7425e71d25 Ensure batch mode is used during CI 2018-12-09 23:29:05 -05:00
Andrew DeMaria 4dde6de2e8 Merge remote-tracking branch 'airsonic/pr/839' 2018-12-02 18:26:14 -05:00
Andrew DeMaria 3efd278799 Merge remote-tracking branch 'airsonic/pr/810' 2018-12-02 18:26:00 -05:00
Andrew DeMaria 5202845373 Bump version of guava to deal with CVE-2018-10237 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2018-12-02 16:27:21 -05:00
Andrew DeMaria 8c4b2aa1fb Merge remote-tracking branch 'origin/pr/808' 2018-10-21 14:32:27 -06:00
Andrew DeMaria 8c6ddb1aba Dependency tweaks and remove extraneous code 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2018-10-21 14:31:52 -06:00
Andrew DeMaria cd05af87dc Merge remote-tracking branch 'origin/pr/807' 2018-10-21 14:07:23 -06:00
Andrew DeMaria 5fd50d4ec2 Merge remote-tracking branch 'origin/pr/813' 2018-10-20 15:33:42 -06:00
Andrew DeMaria f8686d9638 Tweaked logging around servlet container and added warning about jetty 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2018-10-20 15:30:37 -06:00
Andrew DeMaria afb0fb1d27 Merge remote-tracking branch 'origin/pr/814' 2018-10-20 14:58:19 -06:00
Andrew DeMaria 3288a75c3e Merge remote-tracking branch 'origin/pr/811' 2018-10-20 14:57:40 -06:00
Andrew DeMaria f8161f5184 White list jars that are scanned for tlds to prevent spurious logs 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2018-10-20 16:42:23 -04:00