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

71.4 KB
Loading

0 commit comments

Comments
 (0)