Skip to content

Commit 0988a64

Browse files
authored
Merge branch 'master' into update-python-deps
2 parents 517991f + 38d2df6 commit 0988a64

File tree

176 files changed

+2944
-1674
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+2944
-1674
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Build and Deploy CC Open Source
2+
on: [push, pull_request]
3+
jobs:
4+
build-and-deploy:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v1
8+
- name: setup python version
9+
uses: actions/setup-python@v1
10+
with:
11+
python-version: 3.7
12+
- name: Install dependencies
13+
run: |
14+
pip install pipenv
15+
pipenv install
16+
pipenv run lektor build -f webpack
17+
- name: Deploy to production
18+
if: github.ref == 'refs/heads/master'
19+
run: |
20+
pipenv run lektor deploy ghpages --username ${{ secrets.LEKTOR_DEPLOY_USERNAME }} --password ${{ secrets.LEKTOR_DEPLOY_PASSWORD }}

.lektorproject

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ lektor-google-analytics = 0.1.3
1212
lektor-webpack-support = 0.5
1313
lektor-atom = 0.3
1414
lektor-disqus-comments = 0.4.1
15+
lektor-strip-html-tags = 0.3.1
16+
lektor-markdown-excerpt = 0.1

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ Here's how the code is structured in the top level of the repository:
9393
- `/cc-vocabulary/` to https://cc-vocabulary.netlify.com/
9494
- Added so that the `opensource.creativecommons.org/cc-vocabulary/` will
9595
continue to work with that project moving to utilize Netlify.
96+
- `/cc-vue-vocabulary` to https://cc-vue-vocabulary.netlify.com/
97+
- Added so that the `opensource.creativecommons.org/cc-vue-vocabulary/` will
98+
continue to work with that project moving to utilize Netlify.
99+
- `/cc-fonts` to https://cc-fonts.netlify.com/
100+
- Added so that the `opensource.creativecommons.org/cc-fonts/` will
101+
continue to work with that project moving to utilize Netlify.
96102

97103

98104
## License

content/404.html/contents.lr

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
_model: page
2+
---
3+
_template: 404.html
4+
---

content/archives/old-tech-blog/entries/banshee-now-with-creative-commons-support-devel/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body:
88

99
Great news from [Gabriel Burt](http://gburt.blogspot.com/), lead developer for the Open Source media player [Banshee](http://banshee-project.org/):
1010

11-
[![](banshee-cc.png)](http://labs.creativecommons.org/files/2009/01/banshee-cc.png)
11+
[![](banshee-cc.png)](banshee-cc.png)
1212
(click for larger version)
1313

1414
**Search based on the license of a song/album with direct support of displaying CC license logos!**

content/archives/old-tech-blog/entries/bridging-public-bugtrackers-and-local-tasklists/contents.lr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ Anyway, enough talk, let's give it a spin. You'll need a recent version org-mode
3232

3333
Next open up the relevant org-mode file. Move to the "Roundup" line, hit Tab to cycle its visibility, and move to the line that starts with "#+call:"
3434

35-
[![](cc_blog_ccommons_screenshot1.png)](http://labs.creativecommons.org/files/2010/11/cc_blog_ccommons_screenshot1.png)
35+
[![](cc_blog_ccommons_screenshot1.png)](cc_blog_ccommons_screenshot1.png)
3636

3737
Now press "Ctrl+c Ctrl+c". You'll see it populate with issues from [my issues list](http://code.creativecommons.org/issues/issue?status=-1,1,2,3,4,5,6,7&@sort=-activity&@search_text=&@dispname=Your%20Issues&@filter=status,assignedto&@group=priority&@columns=id,activity,title,creator,status&assignedto=40&@pagesize=50&@startwith=0):
3838

39-
[![](cc_blog_ccommons_screenshot2.png)](http://labs.creativecommons.org/files/2010/11/cc_blog_ccommons_screenshot2.png)
39+
[![](cc_blog_ccommons_screenshot2.png)](cc_blog_ccommons_screenshot2.png)
4040

4141
What's happening here? So we're executing an org-babel block at point. [Org-babel](http://orgmode.org/worg/org-contrib/babel/intro.php) is an org-mode extension that allows you to make blocks of code executable, and even chain from one language to another (it also has some stuff relevant to Donald Knuth's "literate programming" which is cool but I'm not using here). If we look at the code blocks:
4242

43-
[![](cc_blog_ccommons_screenshot3.png)](http://labs.creativecommons.org/files/2010/11/cc_blog_ccommons_screenshot3.png)
43+
[![](cc_blog_ccommons_screenshot3.png)](cc_blog_ccommons_screenshot3.png)
4444

4545
Anyway, there are three code blocks here.
4646

content/archives/old-tech-blog/entries/cc-legaleratta-errata-annotations-without-republishing-licenses/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: lunpa
66
---
77
body:
88

9-
[![Screenshot of the errata tool.](errata_highlighted1.png)](http://labs.creativecommons.org/files/2012/02/errata_highlighted1.png)
9+
[![Screenshot of the errata tool.](errata_highlighted1.png)](errata_highlighted1.png)
1010

1111
The html for the legalcode pages cannot be changed once they are published. The reason for this is because we provide sha1 hashes of them so that they may be redistributed. It also is a reason of credibility; that the license you've applied to your work today will still be the same one tomorrow. However, sometimes there are errors. They need to be accessible, yet they usually are too small to merit releasing a new version of the license.
1212

content/archives/old-tech-blog/entries/find-and-reuse-with-attribution-cc-licensed-images/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Nino Barbieri [CC BY-SA 2.5](http://creativecommons.org/licenses/by-sa/2.5/)
1717

1818
The inclusion of structured data with the HTML means you can click the license link above and the license deed will display the attribution information, as well as our generated attribution HTML.
1919

20-
[![](Screenshot-Creative-Commons-—-Attribution-ShareAlike-2.5-Generic-Google-Chrome.png)](http://labs.creativecommons.org/files/2010/10/Screenshot-Creative-Commons-—-Attribution-ShareAlike-2.5-Generic-Google-Chrome.png)
20+
[![](Screenshot-Creative-Commons-—-Attribution-ShareAlike-2.5-Generic-Google-Chrome.png)](Screenshot-Creative-Commons-—-Attribution-ShareAlike-2.5-Generic-Google-Chrome.png)
2121

2222
---
2323
pub_date: 2010-10-04

content/archives/old-tech-blog/entries/flickr-image-re-use-for-openofficeorg-demo-availlable/contents.lr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ What has be done since my last article :
3030

3131
Some screenshots :
3232

33-
[The results from a search by the extension vs Flickr search](http://labs.creativecommons.org/files/2008/07/mysearchvsflickradvsearch.jpg)
33+
[The results from a search by the extension vs Flickr search](mysearchvsflickradvsearch.jpg)
3434

35-
[Right click on an image](http://labs.creativecommons.org/files/2008/07/popupmenu.jpg)
35+
[Right click on an image](popupmenu.jpg)
3636

37-
[Inserted image into Writer](http://labs.creativecommons.org/files/2008/07/insertedimageinwriter.jpg)
37+
[Inserted image into Writer](insertedimageinwriter.jpg)
3838

3939
Also i would to add that this extension, at this momment, works only in Writer.
4040

content/archives/old-tech-blog/entries/flickr-image-re-use-for-openofficeorg-new-updates/contents.lr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ Now i found some settings and at this moment the popup will appear for each resu
2626

2727
Some screenshots :
2828

29-
[Results](http://labs.creativecommons.org/files/2008/08/results.jpg "Results")
29+
[Results](results.jpg "Results")
3030

31-
[Writer](http://labs.creativecommons.org/files/2008/08/writer.jpg "Writer")
31+
[Writer](writer.jpg "Writer")
3232

33-
[Impress](http://labs.creativecommons.org/files/2008/08/impress.jpg "Impress")
33+
[Impress](impress.jpg "Impress")
3434

35-
[Calc](http://labs.creativecommons.org/files/2008/08/calc.jpg "Calc")
35+
[Calc](calc.jpg "Calc")
3636

3737
[Download extension](http://code.creativecommons.org/viewsvn/ccooo/branches/mihai-flickr-soc/demo13072008/ccooo.oxt?revision=10689) (right click and save as)
3838

content/archives/old-tech-blog/entries/libreoffice-and-cc-openoffice-plugin/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Over the summer, our GSOC student Akila Wajirasena gave a [wonderful overhaul to
1212

1313
The good news? It seems that it works just fine out of the box:
1414

15-
[![CC LibreOffice plugin test](cc_libreoffice_plugin_test.png)](http://labs.creativecommons.org/files/2010/12/cc_libreoffice_plugin_test.png)
15+
[![CC LibreOffice plugin test](cc_libreoffice_plugin_test.png)](cc_libreoffice_plugin_test.png)
1616

1717
We've only tested it on some limited systems though, so if you do have some problems, [please report them here](http://code.creativecommons.org/issues/issue738).
1818

content/archives/old-tech-blog/entries/license-identifier-on-the-deeds/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ body:
99

1010
Yesterday we [launched a refresh of the site design](http://creativecommons.org/weblog/entry/25965) for [creativecommons.org](http://creativecommons.org/). Included in the changes pushed was one small one originally suggested by our international [Affiliate Network](http://creativecommons.org/affiliates): the inclusion of the license identifier on the deeds.
1111

12-
[![](CC-BY-with-dc-identifier.png)](http://labs.creativecommons.org/files/2011/01/CC-BY-with-dc-identifier.png)
12+
[![](CC-BY-with-dc-identifier.png)](CC-BY-with-dc-identifier.png)
1313

1414
Anyone who's been in the CC community for any length of time has seen people refer to the licenses by their short-hand names: CC BY for [Attribution](http://creativecommons.org/licenses/by/3.0/), BY-SA for [Attribution-ShareAlike](http://creativecommons.org/licenses/by-sa/3.0/), etc. But that short hand, while useful, has been a bit of [inside baseball](http://en.wikipedia.org/wiki/Inside_baseball_\(metaphor\)): it's part of the URL, but never appeared on the deeds, which we want to be the human readable summary of the license. As of yesterday the short-hand name is now on the deed. We've also annotated it with RDFa, so the licenses self-describe their short name (software can dereference the license URI and look for information describing it there). Thanks again to Alek and the affiliate network for suggesting this change.
1515

content/archives/old-tech-blog/entries/three-layers-of-a-cc-license/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ body:
99

1010
Included in [last week's redesign](http://creativecommons.org/weblog/entry/25965) is an updated Licenses page, describing the CC licenses and what makes them unique. The combination of machine-readable metadata, human readable deeds, and the legal code are unique (to my knowledge) in the public licensing world, and this approach enables interesting applications of the licenses and broadens their accessibility. That said, the approach is not always easy to describe.
1111

12-
[![](3layers-300x164.png)](http://labs.creativecommons.org/files/2011/01/3layers.png)
12+
[![](3layers-300x164.png)](3layers.png)
1313

1414
After seeing Alex's updated graphics for the page, I roped him into helping me create an interactive version, based on CSS3 Transitions and Transformations. You can find the visualization [here on CC Labs](http://labs.creativecommons.org/2011/demos/license-layers/). More information about why and how I built it is on [my personal blog](http://yergler.net/blog/2011/01/07/css3-license-layers/). Note that this demonstration requires Chrome, Safari, or Firefox 4. Opera 11 sort of works. IE, well, doesn't.
1515

content/archives/old-tech-blog/entries/welcome-hudson-to-creative-commons/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ We've been working over the past year on improving our tooling and processes for
1212

1313
Earlier this week I spent a little time installing [Hudson](http://hudson-ci.org/) on our [development server](http://code.creativecommons.org). By looking at the [dashboard](http://code.creativecommons.org/hudson), you can easily see the build status of CC projects, including the aforementioned license components, and [DiscoverEd](http://wiki.creativecommons.org/DiscoverEd), our linked data search prototype.
1414

15-
[![](trend.png)](http://labs.creativecommons.org/files/2010/08/trend.png)
15+
[![](trend.png)](trend.png)
1616

1717
Hudson is already proving itself worth the time to deploy and configure. After installation, I saw that a test for the API was failing. I pinged John, and was happy to see the build go green a few minutes later when he checked in a fix and Hudson rebuilt the package. Graphs like the testing trend for [discovered](http://code.creativecommons.org/hudson/job/discovered/) also help quantify the progress being made. Overall, it already feels like we have better visibility into the state of our infrastructure.
1818

content/blog/authors/akmadian/contents.lr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ name: Ari Madian
55
md5_hashed_email: af23a7b0ab15b5c5ae21649bf69f8b66
66
---
77
about:
8-
Ari is a 19 year old, Seattle based, mostly self taught, Computer Science student and freelance software developer. He originally started programming by tinkering with Python, and eventually moved into C# and the .NET framework, as well as JS and some web development. He likes tea (blacks, whites, and Shou Pu Erhs are his favorites), volunteering at his local food bank, and some occasional PC gaming, among other things.
8+
Ari is CC's Open Source Community Coordinator, a mostly self taught Computer Science student, and tea enthusiast. He is based in Seattle and his favorite teas are blacks, whites, and Shou Pu Erhs.
99

10-
Ari is working on [a new version of the CC license chooser tool](https://github.com/creativecommons/cc-chooser) as part of [Google Summer of Code 2019](/gsoc-2019).
10+
He started working with CC through Google Summer of Code 2019 through his work on the CC license chooser tool. [[source code](https://github.com/creativecommons/chooser)]
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
username: apdsrocha
2+
---
3+
name: Ana Paula Rocha
4+
---
5+
md5_hashed_email: d57fcb48567c6365f6ebc847ec31bbef
6+
---
7+
about:
8+
Ana is based in Sao Paulo, Brazil, and is currently helping revamp the [Platform Toolkit](https://creativecommons.org/platform/toolkit/) as part of the Outreachy 2019-2020 round. Her favorite thing is thinking up and building great interfaces. You can find her as `@apdsrocha` on the CC Slack.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
username: conye
2+
---
3+
name: Chidiebere Onyegbuchulem
4+
---
5+
md5_hashed_email: 9088efad6d512ef79556a3b6adcf048f
6+
---
7+
about:
8+
Chidiebere Onyegbuchulem is a Frontend developer based in Lagos, Nigeria.
9+
10+
Chidi is currently working on [CC Vocabulary](https://github.com/creativecommons/cc-vocabulary) as part of 2019-2020 [Outreachy Internship](/programs/outreachy/2019-12-start).
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
username: ffont
2+
---
3+
name: Frederic Font
4+
---
5+
md5_hashed_email: a2738d7b7e93570ed5f5736ccdc7d265
6+
---
7+
about:
8+
Frederic Font is a post-doc researcher at the Music Technology Group (MTG) of the Department of Information and Communication Technologies of Universitat Pompeu Fabra, Barcelona. Frederic Font holds a degree in Telecommunications Engineering from Universitat Politècnica de Catalunya (2007) and a MSc in Sound and Music Computing from Universitat Pompeu Fabra (2010). In 2015, he obtained a PhD in Sound and Music Computing from Universitat Pompeu Fabra. His research interests lay in the field of sound and music computing, audio processing and the semantic representation of audio content, motivated by the creative potential that online communities of users have through online sound sharing sites such as Freesound. His current research is focused on understanding how to analyze and describe large sound collections so that these become more useful in creative contexts. This includes the use of a wide range of techniques from signal processing and machine learning to semantic representation of music information and analysis of user communities and their generated metadata. In the MTG, Frederic also leads the Freesound website and its related projects, and has coordinated the EU funded AudioCommons project.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
username: mathemancer
2+
---
3+
name: Brent Moran
4+
---
5+
md5_hashed_email: d06fcd3796829bac4f8fd1fb28fc47e4
6+
---
7+
about:
8+
[Brent](https://creativecommons.org/author/brent-moran/) is the Senior Data Engineer at Creative Commons. He's `mathemancer` on Freenode (IRC) and `@Brent Moran` on the CC Slack.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
username: obulat
2+
---
3+
name: Olga Bulat
4+
---
5+
md5_hashed_email: acd34b5434369aeaf31de8ea94368bf0
6+
---
7+
about:
8+
[Olga](https://creativecommons.org/author/obulat/) is a developer based in Istanbul, Turkey. She loves programming in Python and Javascript. Her main areas of interest are web development, Natural Language Processing, languages, geography and education. Apart from that, she is busy raising her (soon to be) three kids.
9+
10+
Olga is currently working on improving [the CC License Chooser](https://github.com/creativecommons/cc-chooser) as part of 2019-2020 [Outreachy Internship](/programs/outreachy).
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name: airflow
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name: audio
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name: cc-chooser
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name: freesound
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name: outreachy
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name: platform-toolkit
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name: testing

content/blog/entries/2019-09-25-ccgn-redesign/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ Giving more visibility for the local chapters’ infrastructure, this entire sec
4646

4747
## Keeping forward the global network website
4848

49-
This is certainly not the end of our revamp of the CC Global Network website, we're always working on giving the members a better experience by fixing bugs and updating the interface. If you have any feedback, feature request, or bug report please feel free to [open an issue](https://github.com/creativecommons/commoners/issues) in the [Commoners repository](https://github.com/creativecommons/commoners) on Github or reach out to us on Slack.
49+
This is certainly not the end of our revamp of the CC Global Network website, we're always working on giving the members a better experience by fixing bugs and updating the interface. If you have any feedback, feature request, or bug report please feel free to [open an issue](https://github.com/creativecommons/commoners/issues) in the [Commoners repository](https://github.com/creativecommons/commoners) on Github or reach out to us on Slack.

content/blog/entries/2019-11-25-empowering-collaboration/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
title: Empowering Collaboration in the Common
1+
title: Empowering Collaboration in the Commons
22
---
33
categories:
44
community

0 commit comments

Comments
 (0)