From 9ad6d1bd704331433cb0d140a264bc7ad7880136 Mon Sep 17 00:00:00 2001 From: Bill Bittner Date: Tue, 1 Aug 2017 10:06:06 -0700 Subject: [PATCH 1/3] Update isFreePublicClaim.js --- helpers/functions/isFreePublicClaim.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/functions/isFreePublicClaim.js b/helpers/functions/isFreePublicClaim.js index c58dccee..b43a2861 100644 --- a/helpers/functions/isFreePublicClaim.js +++ b/helpers/functions/isFreePublicClaim.js @@ -1,5 +1,5 @@ const logger = require('winston'); -const licenses = ['Creative Commons', 'Public Domain', 'CC Attribution-NonCommercial 4.0 International']; +const licenses = ['Creative Commons', 'Public Domain', 'Creative Commons Attribution 4.0 International', 'Creative Commons Attribution-ShareAlike 4.0 International', 'Creative Commons Attribution-NoDerivatives 4.0 International', 'Creative Commons Attribution-NonCommercial 4.0 International', 'Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International', 'Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International']; module.exports = ({ value }) => { logger.debug('checking isFreePublicClaim ?'); From 3a006ed958f65b112b634ab480222604e80f168c Mon Sep 17 00:00:00 2001 From: Bill Bittner Date: Tue, 1 Aug 2017 10:23:08 -0700 Subject: [PATCH 2/3] Update publish.handlebars added all CC licenses from app --- views/partials/publish.handlebars | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/views/partials/publish.handlebars b/views/partials/publish.handlebars index a8d7b2ed..f744ba74 100644 --- a/views/partials/publish.handlebars +++ b/views/partials/publish.handlebars @@ -19,8 +19,12 @@
@@ -58,4 +62,4 @@ // remove nsfw check document.getElementById('publish-nsfw').checked = false; } - \ No newline at end of file + From 0dcb3d7c232e483be0b6cd192add948834e6295e Mon Sep 17 00:00:00 2001 From: Bill Bittner Date: Tue, 1 Aug 2017 10:26:43 -0700 Subject: [PATCH 3/3] Update publish.handlebars temporarily reverting to old 'public domain' and plain 'creative commons' licenses. --- views/partials/publish.handlebars | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/views/partials/publish.handlebars b/views/partials/publish.handlebars index f744ba74..e17816e3 100644 --- a/views/partials/publish.handlebars +++ b/views/partials/publish.handlebars @@ -19,12 +19,7 @@