From cd8526a9b1ac0a303a28628216ddaf6cf1e12e6a Mon Sep 17 00:00:00 2001 From: Rob Myers Date: Tue, 19 May 2015 12:03:09 -0700 Subject: [PATCH 01/19] Use https rather than ssh for submodules so github pages can use them. --- .gitmodules | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3b66d34..5739361 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,27 +1,27 @@ [submodule "2011/ccrel-guide"] path = 2011/ccrel-guide -url = git@github.com:creativecommons/ccrel-guide.git +url = https://github.com/creativecommons/ccrel-guide.git [submodule "2011/demos/license-layers"] path = 2011/demos/license-layers -url = git@github.com:cc-archive/labs-license-layers.git +url = https://github.com/cc-archive/labs-license-layers.git [submodule "demos/facebook"] path = demos/facebook -url = git@github.com:cc-archive/cc_license_facebook_app.git +url = https://github.com/cc-archive/cc_license_facebook_app.git [submodule "demos/facebook.old"] path = demos/facebook.old -url = git@github.com:cc-archive/cc_license_facebook_app.git +url = https://github.com/cc-archive/cc_license_facebook_app.git [submodule "demos/search"] path = demos/search -url = git@github.com:cc-archive/ccsearch.git +url = https://github.com/cc-archive/ccsearch.git [submodule "demos/search-b"] path = demos/search-b -url = git@github.com:cc-archive/search3.git +url = https://github.com/cc-archive/search3.git [submodule "demos/search.old/search-i18n"] path = demos/search.old/search-i18n -url = git@github.com:cc-archive/i18n_ccsearch.git \ No newline at end of file +url = https://github.com/cc-archive/i18n_ccsearch.git \ No newline at end of file From 67c3ce294fbaf5d1dcd2634cea1b23b4a5a3720d Mon Sep 17 00:00:00 2001 From: Rob Myers Date: Tue, 19 May 2015 13:20:05 -0700 Subject: [PATCH 02/19] Update front page and contact details. --- contact.md | 10 +++++++++- index.html | 16 ++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contact.md b/contact.md index d32568e..156fd87 100644 --- a/contact.md +++ b/contact.md @@ -4,7 +4,7 @@ title: Contact Us permalink: /contact/ --- -There are a few ways to get in touch with CC Labs. +## There are a few ways to get in touch with CC Labs. * IRC: #creativecommons-dev on Freenode. See [CC's wiki](https://wiki.creativecommons.org/IRC) for more details on other IRC channels for CC. @@ -14,8 +14,16 @@ There are a few ways to get in touch with CC Labs. * Email us. webmaster at the main Creative Commons domain, or mattl at the same place. You choose. +### Contacting Matt + * Follow me on GNU social or Twitter: @mattl (with a self hosted GNU social at ) * In person. If you're in the Boston, MA area or elsewhere. Let me know. I travel a fair amount to San Francisco, but also to Europe and other places in the US. I'm available to come talk about CC tech work at your event. + +### Contacting Rob + +* Follow me on GNU social or Twitter: @robmyers (for GNU social I'm on [quitter.se](https://quitter.se/robmyers)). + +* In person. If you're in the Vancouver, BC area or elsewhere. Let me know. I travel less than Matt but I love meeting up with people when I do. diff --git a/index.html b/index.html index f7d64cb..109f9d4 100644 --- a/index.html +++ b/index.html @@ -6,19 +6,11 @@
-

Welcome to the new look CC labs website. Our previous site - hadn't been updated in about two years, so I'm back with some - regular updates on what we're doing at CC.

- -

The plan is to update the blog three times a week — Monday will give an update on what we're working on. Wednesday will give an update on our infrastructure work, hopefully sharing some useful tips, and on Friday I'd like to set a potential idea for a weekend hack project.

- -

Plus, somewhere along the way I'll share other things, like neat pieces of free software I come across or things related to our work.

- +

Welcome to the new look CC labs website.

This site is in Jekyll, and you can fork it on GitHub, or send improvements and fixes.

- -

Matt Lee,
Technical Lead
Creative Commons

- -

Follow me on GNU social or Twitter.

+

Want to contact us? Click here!

+

Matt Lee, Technical Lead, Creative Commons

+

Rob Myers, Software Developer, Creative Commons

From 9f00d8a889339a322e59371f0fdea0effff62077 Mon Sep 17 00:00:00 2001 From: Matt Lee Date: Tue, 19 May 2015 16:38:56 -0400 Subject: [PATCH 03/19] Create CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 0000000..0c437c4 --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +labs.creativecommons.org From 7fe447e1334aa7f3b91ad23c3df997cf02417ebb Mon Sep 17 00:00:00 2001 From: Rob Myers Date: Tue, 19 May 2015 13:38:58 -0700 Subject: [PATCH 04/19] Clean up contacts. --- contact.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contact.md b/contact.md index 156fd87..7280bba 100644 --- a/contact.md +++ b/contact.md @@ -10,9 +10,9 @@ permalink: /contact/ * Send us a bug report. Generally, filing them against the [main CC.org repo](https://github.com/creativecommons/creativecommons.org/issues) is preferred, but if there's a bug with another project, report it there. You'll know what to do. -* Join the CC development mailing list. This is unfortunately broken. In early 2015, we're moving to our own self-hosted GNU Mailman instance to overcome this problem. +* Join the [CC development mailing list](http://lists.ibiblio.org/mailman/listinfo/cc-devel). -* Email us. webmaster at the main Creative Commons domain, or mattl at the same place. You choose. +* Email us. webmaster at the main Creative Commons domain. ### Contacting Matt From fb989d3ce3ede272251f7fa5c44f98efa2a80cfc Mon Sep 17 00:00:00 2001 From: Matt Lee Date: Tue, 19 May 2015 16:40:25 -0400 Subject: [PATCH 05/19] Delete CNAME --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index 0c437c4..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -labs.creativecommons.org From 77de11373875322347051440976f416c4821a233 Mon Sep 17 00:00:00 2001 From: Matt Lee Date: Tue, 19 May 2015 16:41:00 -0400 Subject: [PATCH 06/19] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index c3c22d9..f5bc483 100644 --- a/_config.yml +++ b/_config.yml @@ -3,7 +3,7 @@ title: Creative Commons Labs email: your-email@domain.com description: > # this means to ignore newlines until "baseurl:" Website of the Creative Commons tech team. -baseurl: "" # the subpath of your site, e.g. /blog/ +baseurl: "/labs/" # the subpath of your site, e.g. /blog/ twitter_username: creativecommons github_username: creativecommons From 40a398bc766c4fc66af3a9b7e6f959066e85c8f3 Mon Sep 17 00:00:00 2001 From: Matt Lee Date: Tue, 19 May 2015 17:09:24 -0400 Subject: [PATCH 07/19] Update default.html --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 1f139d0..350317a 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -15,7 +15,7 @@ -