Commit Graph
612 Commits
Author SHA1 Message Date
jvoisin e1a8a3b752 Use a switch-case instead of if-spaghettis 2019-10-24 21:42:50 +02:00
jvoisin 6b54086590 Remove an unused method 2019-10-24 21:42:50 +02:00
jvoisin 332718386b Simplify the parseInts method 2019-10-24 21:42:50 +02:00
jvoisin 29b083ddac Simplify the split method
Use a regexp with two groups, instead of
doing some black magic manually.
2019-10-24 21:42:50 +02:00
jvoisin e1583691d8 Replace StringUtil.toHtml with StringEscapeUtils.escapeHtml
Apache commons is providing Html-escaping, no need to reinvent the wheel:

> It supports all known HTML 4.0 entities, including funky accents. Note that the
> commonly used apostrophe escape character (') is not a legal entity and so
> is not supported).

So I manually checked that nothing is relying on escaped single-quotes,
and didn't manage to find anything that does.
2019-10-24 21:42:50 +02:00
jvoisin 9dc9cbd821 Remove the unused toISO8601 method 2019-10-24 21:42:50 +02:00
jvoisinandGitHub 9f6b02c5d0 Refactor a bit how we're handling avatars
- Remove an unnecessary cast
- Fix two stored XSS, since the name of the avatar is user-controlled
- Tighten the type of some exceptions
2019-10-24 19:39:39 +00:00
François-Xavier ThomasandGitHub b37cbf6617 Merge pull request #1359 from randomnicode/minorfixtostatictimeunit
Minor fix to static time unit call
2019-10-22 21:33:39 +02:00
François-Xavier ThomasandGitHub 320e2a7b77 Merge pull request #1352 from fxthomas/1333-allow-previous-migration-checksums-for-mariadb
Allow previous Liquibase migration checksums for MariaDB
2019-10-22 20:27:53 +02:00
François-Xavier Thomas 78a99d5860 Allow previous Liquibase migration checksums for MariaDB
If someone was using MariaDB before #1188, they were probably doing so
by using the MySQL JDBC driver to pass the migration (which had the
proper workarounds in place for some column types).

This commit assumes that the migrations done that way were valid and
produced the same result as running the MariaDB migrations after #1188.
2019-10-21 22:00:37 +02:00
Randomnicode acb4e033aa Minor fix to static time unit call 2019-10-21 11:55:01 -07:00
Evan Harris a793deab0b Got rid of duplicated code to format durations
Added new functions and test cases.
2019-10-21 07:46:16 -05:00
Evan Harris 0660c4f3e6 Renamed StringUtil.formatDuration to formatDurationMSS 2019-10-21 07:01:34 -05:00
jvoisin f910c572c9 Use a static access in a test file, because we can. 2019-10-20 22:43:10 +02:00
Evan Harris 29c1b5dbca Enabled PMD checking for jsp files
2 rulesets are included.
2019-10-20 10:20:42 -05:00
Evan Harris 42537686fc Added page encoding meta tags to jsp files to satisfy PMD 2019-10-20 10:20:41 -05:00
Evan Harris 4098d801fc Fixed a bunch of quoting issues in jsp files
All the quoting issues were causing PMD violations.
A few other things that were noticed along the way were fixed too.
2019-10-20 10:20:31 -05:00
Evan Harris cd0dc8673d Move DOCTYPE line to top of all jsp files
Not doing this causes violations when using PMD.
2019-10-20 10:03:22 -05:00
François-Xavier ThomasandGitHub 2438044c5d Merge pull request #1265 from benferreri/master
Add discogs search link to main album page
2019-10-20 16:08:16 +02:00
jvoisinandGitHub d3a9a3226f Replace deprecated Date by Calendar
Apparently, Date.setYear and Date.getYear are deprecated in favour of Calendar, since Java6!
Source: https://docs.oracle.com/javase/6/docs/api/java/util/Date.html
2019-10-17 21:28:40 +00:00
Evan Harris 460589f590 Added an SVG icon for shuffle in dark theme 2019-10-17 15:57:05 -05:00
Evan Harris 18e2fe6449 Changed link text from "more" to "refresh" (more correct)
Also added refresh SVG icons to match the text.
2019-10-17 15:34:50 -05:00
Evan Harris 91f91ed654 Removed the auto-refresh feature
This feature just generated a lot of unnecessary traffic to the server and
hurt usability because the page would refresh unexpectedly while a user was
actively looking at content.  Fixes #1003, #1179, #729.
Did not remove the column for that setting in the user database, since that
would lead to complications if needing to downgrade for some reason.
2019-10-16 00:50:15 -05:00
jvoisinandAndrew DeMaria d17c00115a Minor refactor of CsrfSecurityRequestMatcher
- use plain string comparison instead of regexp
- Simplify data structures

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-10-15 21:15:55 -06:00
Andrew DeMaria d61a00e830 Merge remote-tracking branch 'origin/pr/1315' 2019-10-15 21:13:46 -06:00
Andrew DeMaria 75a280457e Merge remote-tracking branch 'origin/pr/1327' 2019-10-15 21:09:48 -06:00
Andrew DeMaria 0d0683d066 Merge remote-tracking branch 'origin/pr/1335' 2019-10-15 21:08:39 -06:00
Andrew DeMaria ceb6b3e598 Merge remote-tracking branch 'origin/pr/1332' 2019-10-15 21:07:42 -06:00
Evan Harris c728d267c7 Fixed inconsistencies in SVG icon colors 2019-10-15 20:51:04 -05:00
Evan Harris 4fb9820a08 Added test case sources to checkstyle
Fixes #1328.
2019-10-15 12:38:52 -05:00
Phil Hudson 0a94058a62 Fix broken update link 2019-10-15 17:24:50 +08:00
Andrew DeMaria 666bc66ec8 Merge remote-tracking branch 'origin/pr/1313' 2019-10-14 21:38:45 -06:00
jvoisinandGitHub 82fa09d198 Bump jwt 2019-10-13 23:32:45 +00:00
jvoisin 78480ab766 Remove a homemade implementation of Pair
Since apache-commons is already implementing a Pair
type, there is no need to reinvent the wheel.
2019-10-13 23:36:33 +02:00
jvoisin c25e26d61a Remove a dead file 2019-10-12 13:07:35 +02:00
jvoisin 06e36ff154 Mark a field as private
Since we're synchronising on playQueue, we should make
it final.
2019-10-12 12:55:58 +02:00
Evan Harris 06f81f8b97 Added separate user icon from logout icon
Fixes #1305 and improves navigation.
2019-10-12 00:45:25 -05:00
Andrew DeMaria 89ea120a2f Merge remote-tracking branch 'origin/pr/1310' 2019-10-11 21:16:59 -06:00
Andrew DeMaria 357758ba4e Merge remote-tracking branch 'origin/pr/1312' 2019-10-11 21:15:17 -06:00
Andrew DeMaria 7058b5098d Merge remote-tracking branch 'origin/pr/1302' 2019-10-11 21:14:05 -06:00
François-Xavier Thomas 6b2c7e338d Remove white underline from player controls 2019-10-12 01:03:51 +02:00
François-Xavier Thomas 09808b170e Update dark icons for the 'groove' theme 2019-10-12 00:49:09 +02:00
François-Xavier Thomas 8b72964086 Display file id and path in debug scanning logs 2019-10-11 23:40:19 +02:00
jvoisin b6414ebb6c Simplify a condition 2019-10-11 23:27:53 +02:00
jvoisin 9f027f333e Upgrade PlaylistService to non-deprecated methods
As documented here: https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/util/Assert.html#notNull-java.lang.Object-java.lang.String-
2019-10-11 22:17:42 +02:00
Andrew DeMaria 3fe6e8b267 Add logger name checkstyle
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-10-10 00:05:35 -06:00
Evan Harris 317b3a44b5 Fixed broken brace and quote splitting in help text
Hopefully fixes #1298.
2019-10-09 14:14:13 -05:00
Evan HarrisandAndrew DeMaria f644f5a1d0 Improved handling of missing/failed transcoder
Fixes #659.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-10-08 18:41:55 -06:00
Andrew DeMariaandjvoisin 431b42bfb3 Ensure commons logging is excluded (#1274)
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-10-08 14:27:56 +00:00
Evan Harris 6783ced897 Removed inability to change roles for admin user 2019-10-08 06:38:57 -05:00