Merge branch 'develop' of https://git.pcl.ac.cn/yoyoyard/opendata into dev-query-public

modules/auth/repo_form.go

@@ -30,7 +30,7 @@ type CreateRepoForm struct {
 	UID           int64  `binding:"Required"`
 	RepoName      string `binding:"Required;AlphaDashDot;MaxSize(100)"`
 	Private       bool
-	Description   string `binding:"MaxSize(255)"`
+	Description   string `binding:"MaxSize(1024)"`
 	DefaultBranch string `binding:"GitRefName;MaxSize(100)"`
 	AutoInit      bool
 	Gitignores    string

modules/templates/helper.go

@@ -737,7 +737,7 @@ func categories() []string {
 }
 
 func licenses() []string {
-	return []string{"MIT", "GPL", "GFDL", "Apache 2.0", "CC BY 2.0", "CC BY 3.0", "CC BY-SA 3.0", "CC BY-SA 4.0", "CC0: Public Domain", "CDLA Permissive 1.0", "Open Database License", "Research or commercial", "Research and commercial", "Creative Commons CC BY 3.0", "Creative Commons CC BY 4.0", "Creative Commons Attribution 3.0", "Creative Commons Attribution 4.0", "GNU Free Documentation License", "Creative Commons Attribution (CC-BY) license", "Creative Commons Attribution 3.0 Unported License", "Creative Commons Attribution-NoDerivatives 4.0 International License", "Creative Commons CC BY 4.0", "Non-commercial"}
+	return []string{"MIT", "GPL", "GFDL", "Apache 2.0", "CC-BY", "CC-BY-SA", "CC-BY-NC", "CC-BY-ND", "CC0: Public Domain", "CDLA Permissive 1.0", "Open Database License", "Research or commercial", "Research and commercial", "CC-BY-NC-ND", "CC-BY-NC-SA", "CC-BY 2.0", "CC-BY-SA 2.0", "GNU Free Documentation License", "CC-BY-NC 2.0", "CC-BY-ND 2.0", "CC-BY-NC-ND 2.0", "CC-BY-NC-SA 2.0", "Non-commercial", "CC-BY 3.0", "CC-BY-SA 3.0", "CC-BY-NC 3.0", "CC-BY-ND 3.0", "CC-BY-NC-ND 3.0", "CC-BY-NC-SA 3.0", "CC-BY 4.0", "CC-BY-SA 4.0", "CC-BY-NC 4.0", "CC-BY-ND 4.0", "CC-BY-NC-ND 4.0", "CC-BY-NC-SA 4.0"}
 }
 
 // Dataset tasks