actually commit the other stuff

Signed-off-by: MiniDigger <admin@minidigger.me>
This commit is contained in:
MiniDigger 2021-03-26 20:36:51 +01:00
parent a096444336
commit ad4b878e6f
3 changed files with 16 additions and 1 deletions

View File

@ -13,7 +13,6 @@
<template v-if="!isNew">
<tr v-for="dep in version.pluginDependencies[platform]" :key="`${platform}-${dep.name}`">
<td>{{ dep.name }}</td>
<!--TODO having ripple here produces console errors?-->
<td><v-simple-checkbox v-model="dep.required" :ripple="false" /></td>
<td>
<v-text-field

View File

@ -30,6 +30,7 @@ public class HangarConfig {
private String gaCode = "";
private List<Announcement> announcements = new ArrayList<>();
private String urlRegex = "^(https?:\\/\\/(?:www\\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\\.[^\\s]{2,}|www\\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\\.[^\\s]{2,}|https?:\\/\\/(?:www\\.|(?!www))[a-zA-Z0-9]+\\.[^\\s]{2,}|www\\.[a-zA-Z0-9]+\\.[^\\s]{2,})";
private List<String> licences = new ArrayList<>();
@NestedConfigurationProperty
public final FakeUserConfig fakeUser;
@ -186,6 +187,14 @@ public class HangarConfig {
this.urlRegex = urlRegex;
}
public List<String> getLicences() {
return licences;
}
public void setLicences(List<String> licences) {
this.licences = licences;
}
@Deprecated(forRemoval = true)
public boolean isValidProjectName(String name) {
String sanitized = StringUtils.compact(name);

View File

@ -47,6 +47,13 @@ hangar:
base-url: "http://localhost:8080"
ga-code: "UA-38006759-9"
licences:
- "MIT"
- "Apache 2.0"
- "GPL"
- "LPGL"
- "(custom)"
announcements:
-
text: "This is a staging server for testing purposes. Data could be deleted at any time. Please use our production server at (TODO: prod url, lol) for uploading your plugins!"