Skip to content

Commit 15b612d

Browse files
TimidRobotTimidRobot
committed
Merge branch 'master' into cc4-zh-Hant-legalcode
2 parents 84e9b09 + 99947bd commit 15b612d

1,009 files changed

Lines changed: 123874 additions & 76392 deletions

File tree

Some content is hidden

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

‎.cc-metadata.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Whether this GitHub repo is engineering related
2+
engineering_project: true
3+
# Name of the repository/project in English
4+
english_name: License chooser and license display code
5+
# All technologies used
6+
technologies: Python, bash
7+
# Whether this repository should be featured on the CC Open Source site
8+
featured: false

‎.circleci/config.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 2
2+
jobs:
3+
build:
4+
machine: true
5+
steps:
6+
- checkout
7+
- run: sudo apt-get update && sudo apt-get install -y tidy
8+
- run: TRANSLATIONS=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master))
9+
- run: for htmlfile in $TRANSLATIONS; do echo $htmlfile; tidy -errors -quiet $htmlfile; done

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# These owners will be the default owners for everything in
2+
# the repo. Unless a later match takes precedence, they will
3+
# be requested for review when someone opens a pull request.
4+
* @creativecommons/internal-tech

‎.gitignore‎

Lines changed: 18 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,22 @@
1-
cc-wp-theme
2-
vendor
3-
composer.phar
4-
python_env/bin
5-
!python_env/bin/ccengine.fcgi.in
6-
python_env/build
7-
python_env/include
8-
python_env/lib
9-
python_env/local
10-
python_env/paste_errors.log
11-
python_env/.Python
12-
python_env/src/
13-
docroot/license.rdf
14-
docroot/license_rdf
1+
# -*- mode: gitignore; -*-
2+
# symantic web symlinks
153
docroot/rdf
16-
docroot/wp-content/
17-
docroot/wordpress/
18-
#docroot/sitemap.*
19-
docroot/wp-config-local.php
20-
vendor/*# -*- mode: gitignore; -*-
21-
*~
22-
\#*\#
23-
/.emacs.desktop
24-
/.emacs.desktop.lock
25-
*.elc
26-
#*.apk
27-
*.exe
28-
*.dmg
29-
auto-save-list
30-
tramp
31-
.\#*
32-
*.swp
33-
34-
# Org-mode
35-
.org-id-locations
36-
*_archive
37-
38-
# flymake-mode
39-
*_flymake.*
40-
41-
# eshell files
42-
/eshell/history
43-
/eshell/lastdir
44-
45-
# elpa packages
46-
/elpa/
47-
48-
# reftex files
49-
*.rel
4+
docroot/license_rdf
5+
docroot/license.rdf
6+
docroot/cc.licenserdf
507

51-
# AUCTeX auto folder
52-
/auto/
8+
# repositories
9+
python_env/src/
5310

54-
# apitest
55-
/apitest/node_modules
11+
# python environment
12+
python_env/paste_errors.log
13+
python_env/local
14+
python_env/lib
15+
python_env/include
16+
python_env/build
17+
python_env/bin
18+
python_env/.Python
19+
!python_env/bin/ccengine.fcgi.in
5620

57-
.DS_Store
21+
# vim
22+
*.swp

‎CODE_OF_CONDUCT.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Contributor Code of Conduct
2+
3+
The Creative Commons team is committed to fostering a welcoming community. This
4+
project and all other Creative Commons open source projects are governed by our
5+
[Code of Conduct][code_of_conduct]. Please report unacceptable behavior to
6+
[conduct@creativecommons.org](mailto:conduct@creativecommons.org) per our
7+
[reporting guidelines][reporting_guide].
8+
9+
For a history of updates, see the [page history here][updates].
10+
11+
[code_of_conduct]:https://opensource.creativecommons.org/community/code-of-conduct/
12+
[reporting_guide]:https://opensource.creativecommons.org/community/code-of-conduct/enforcement/
13+
[updates]:https://github.com/creativecommons/creativecommons.github.io-source/commits/master/content/community/code-of-conduct/contents.lr

‎CONTRIBUTING.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Contributing to CC Open Source
2+
3+
Thank you for your interest in contributing to CC Open Source! This document is
4+
a set of guidelines to help you contribute to this project.
5+
6+
## Code of Conduct
7+
8+
By participating in this project, you are expected to uphold our [Code of
9+
Conduct][code_of_conduct].
10+
11+
[code_of_conduct]:https://opensource.creativecommons.org/community/code-of-conduct/
12+
13+
## Project Documentation
14+
15+
The `README` in the root of the repository should contain or link to
16+
project documentation. If you cannot find the documentation you're
17+
looking for, please file a GitHub issue with details of what
18+
you'd like to see documented.
19+
20+
## How to Contribute
21+
22+
Please follow the processes in our general [Contributing Code][contributing]
23+
guidelines on the Creative Common Open Source website.
24+
25+
[contributing]:https://opensource.creativecommons.org/contributing-code/
26+
27+
## Questions or Thoughts?
28+
29+
Talk to us on [one of our community forums][community].
30+
31+
[community]:https://opensource.creativecommons.org/community/

‎COPYING‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
This repository contains assets under various licenses and none.
2+
3+
Code with licenses attached is under the attached license.
4+
5+
The /legalcode/ subdirectory contains the text of Creative Commons legal
6+
tools in various formats. Regarding the text of the licenses the CC FAQ says:
7+
8+
CC does not assert copyright in the text of its licenses, so you are permitted to modify the text as long as you do not use the CC marks to describe it. However, we do not recommend this.
9+
10+
If you have found a file in this repository that you feel should have licensing
11+
information attached but does not you can help us to improve this by creating
12+
an issue here:
13+
14+
https://github.com/creativecommons/creativecommons.org/issues/new

‎ISSUE_TEMPLATE‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
1-
Thanks for reporting an issue, to help us file this efficiently we made this template. Feel free to ignore the template if you wish :)
1+
Thanks for reporting an issue, to help us file this efficiently we made this
2+
template. Feel free to ignore the template if you wish :)
23

3-
If this is a bug or a problem with one of our websites or page on one of our sites, please put the URL or page address here:
4+
If this is a bug or a problem with one of our websites or page on one of our
5+
sites, please put the URL or page address here:
46

57
Please tell us the steps to reproduce the problem, if needed:
68

7-
1.
9+
1.
810
2.
911
3.
1012

11-
Please tell us a little bit about how you're accessing the site or page, such as which web browser and which version of the browser:
1213

13-
(You can also vist https://aboutmybrowser.com/ which will give you a link you can share with us that'll tell us everything we need to know)
14+
Please tell us a little bit about how you're accessing the site or page, such
15+
as which web browser and which version of the browser:
1416

15-
You can also attach a screenshot to this issue if you have a visual bug to report. That'll help us figure it out faster. http://www.take-a-screenshot.org/ has instructions on taking screenshots.
17+
(You can also visit <https://aboutmybrowser.com/> which will give you a link
18+
you can share with us that'll tell us everything we need to know)
1619

17-
Finally, we're going to put someone's name here, so they get alerted to the new issue and can assign it to the right person. @robmyers @little-wow
20+
You can also attach a screenshot to this issue if you have a visual bug to
21+
report. That'll help us figure it out faster.
22+
<http://www.take-a-screenshot.org/> has instructions on taking screenshots.
23+
24+
Please feel free to assign a label to this issue (on the right). For security
25+
issues, please use the "urgent" label.
26+
27+
Finally, we're going to put someone's name here, so they get alerted to the new
28+
issue and can assign it to the right person. @little-wow

‎LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2019 Creative Commons
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎README.md‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
# creativecommons.org
2+
3+
Website parent project ([When we share, everyone wins - Creative
4+
Commons][ccorg]), legalcode and translations, and GitHub Issues for public
5+
help and support
6+
7+
[ccorg]: https://creativecommons.org/
8+
9+
10+
## Overview
11+
12+
This repostory is currently for:
13+
1. Public help and support [Issues][issues]
14+
2. Legalcode and translations
15+
3. Installation of the website (including Styles and other Includes)
16+
17+
[issues]: https://github.com/creativecommons/creativecommons.org/issues
18+
19+
20+
## Code of Conduct
21+
22+
[`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md):
23+
> The Creative Commons team is committed to fostering a welcoming community.
24+
> This project and all other Creative Commons open source projects are governed
25+
> by our [Code of Conduct][code_of_conduct]. Please report unacceptable
26+
> behavior to [conduct@creativecommons.org](mailto:conduct@creativecommons.org)
27+
> per our [reporting guidelines][reporting_guide].
28+
29+
[code_of_conduct]:https://opensource.creativecommons.org/community/code-of-conduct/
30+
[reporting_guide]:https://opensource.creativecommons.org/community/code-of-conduct/enforcement/
31+
32+
33+
## Contributing
34+
35+
See [`CONTRIBUTING.md`](CONTRIBUTING.md).
36+
37+
38+
## Issues
39+
40+
This repository's [Issues][issues] is also the primary location for public help
41+
and support.
42+
43+
44+
## Legalcode and Translations
45+
46+
Relevant directories:
47+
- [`docroot/legalcode`](docroot/legalcode/): legalcode and translations "source" files
48+
- [`tools`](tools/): tools to assist with managing the translations
49+
50+
Also see:
51+
- [Legal Code Translation Policy - CC Public Wiki][translatepolicy]: Documents
52+
Legal/Translation process and policy
53+
- [Legal Tools Translation - CC Public Wiki][fourstatus]: Translation status
54+
for 4.0 and CC0 licenses
55+
56+
[translatepolicy]: https://wiki.creativecommons.org/wiki/Legal_Code_Translation_Policy
57+
[fourstatus]: https://wiki.creativecommons.org/wiki/Legal_Tools_Translation
58+
59+
60+
### English Licenses
61+
*Our public copyright licenses incorporate a unique and innovative
62+
"three-layer" design*:
63+
1. **Legal code**: the traditional legal tool *that most lawyers know and love*
64+
2. Human Readable **Deed**: *a format that normal people can read... a handy
65+
reference for licensors and licensees*
66+
3. Machine Readable **RDF**: *recognizes that software, from search engines to
67+
office productivity to music editing, plays an enormous role in the
68+
creation, copying, discovery, and distribution of works*
69+
([Three “Layers” Of Licenses - About The Licenses - Creative
70+
Commons][threelayer])
71+
72+
[threelayer]: https://creativecommons.org/licenses/#layers
73+
74+
License | Source File | Legal Code | Deed | RDF
75+
------- | ----------- | ---------- | ---- | ---
76+
CC BY-NC-ND 4.0 | [Source File][cc-by-nc-nd-source] | [Legal Code][cc-by-nc-nd-legalcode] | [Deed][cc-by-nc-nd-deed] | [RDF][cc-by-nc-nd-rdf]
77+
CC BY-NC-SA 4.0 | [Source File][cc-by-nc-sa-source] | [Legal Code][cc-by-nc-sa-legalcode] | [Deed][cc-by-nc-sa-deed] | [RDF][cc-by-nc-sa-rdf]
78+
CC BY-NC 4.0 | [Source File][cc-by-nc-source] | [Legal Code][cc-by-nc-legalcode] | [Deed][cc-by-nc-deed] | [RDF][cc-by-nc-rdf]
79+
CC BY-ND 4.0 | [Source File][cc-by-nd-source] | [Legal Code][cc-by-nd-legalcode] | [Deed][cc-by-nd-deed] | [RDF][cc-by-nd-rdf]
80+
CC BY-SA 4.0 | [Source File][cc-by-sa-source] | [Legal Code][cc-by-sa-legalcode] | [Deed][cc-by-sa-deed] | [RDF][cc-by-sa-rdf]
81+
CC BY 4.0 | [Source File][cc-by-source] | [Legal Code][cc-by-legalcode] | [Deed][cc-by-deed] | [RDF][cc-by-rdf]
82+
CC0 1.0 | [Source File][cc-zero-source] | [Legal Code][cc-zero-legalcode] | [Deed][cc-zero-deed] | [RDF][cc-zero-rdf]
83+
84+
[cc-by-nc-nd-source]: docroot/legalcode/by-nc-nd_4.0.html
85+
[cc-by-nc-nd-legalcode]: https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode.en
86+
[cc-by-nc-nd-deed]: https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en
87+
[cc-by-nc-nd-rdf]: https://creativecommons.org/licenses/by-nc-nd/4.0/rdf
88+
89+
[cc-by-nc-sa-source]: docroot/legalcode/by-nc-sa_4.0.html
90+
[cc-by-nc-sa-legalcode]: https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode.en
91+
[cc-by-nc-sa-deed]: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en
92+
[cc-by-nc-sa-rdf]: https://creativecommons.org/licenses/by-nc-sa/4.0/rdf
93+
94+
[cc-by-nc-source]: docroot/legalcode/by-nc_4.0.html
95+
[cc-by-nc-legalcode]: https://creativecommons.org/licenses/by-nc/4.0/legalcode.en
96+
[cc-by-nc-deed]: https://creativecommons.org/licenses/by-nc/4.0/deed.en
97+
[cc-by-nc-rdf]: https://creativecommons.org/licenses/by-nc/4.0/rdf
98+
99+
[cc-by-nd-source]: docroot/legalcode/by-nd_4.0.html
100+
[cc-by-nd-legalcode]: https://creativecommons.org/licenses/by-nd/4.0/legalcode.en
101+
[cc-by-nd-deed]: https://creativecommons.org/licenses/by-nd/4.0/deed.en
102+
[cc-by-nd-rdf]: https://creativecommons.org/licenses/by-nd/4.0/rdf
103+
104+
[cc-by-sa-source]: docroot/legalcode/by-sa_4.0.html
105+
[cc-by-sa-legalcode]: https://creativecommons.org/licenses/by-sa/4.0/legalcode.en
106+
[cc-by-sa-deed]: https://creativecommons.org/licenses/by-sa/4.0/deed.en
107+
[cc-by-sa-rdf]: https://creativecommons.org/licenses/by-sa/4.0/rdf
108+
109+
[cc-by-source]: docroot/legalcode/by_4.0.html
110+
[cc-by-legalcode]: https://creativecommons.org/licenses/by/4.0/legalcode.en
111+
[cc-by-deed]: https://creativecommons.org/licenses/by/4.0/deed.en
112+
[cc-by-rdf]: https://creativecommons.org/licenses/by/4.0/rdf
113+
114+
[cc-zero-source]: docroot/legalcode/zero_1.0.html
115+
[cc-zero-legalcode]: https://creativecommons.org/publicdomain/zero/1.0/legalcode.en
116+
[cc-zero-deed]: https://creativecommons.org/publicdomain/zero/1.0/deed.en
117+
[cc-zero-rdf]: https://creativecommons.org/publicdomain/zero/1.0/rdf
118+
119+
120+
## Installation
121+
122+
:warning: **WARNING:** Use of the bootstrap scripts in the master branch is NOT
123+
recommended. Instead, see the [dev2019][dev2019] branch for current/ongoing
124+
work.
125+
126+
[dev2019]: https://github.com/creativecommons/creativecommons.org/tree/dev2019
127+
128+
129+
### Child Repositories
130+
131+
In addition to this one, the following child repositories are also used:
132+
133+
- License Engine (chooser, deeds, legalcode, RDFs):
134+
135+
- [creativecommons/cc.engine][ccengine]
136+
- [creativecommons/cc.i18n][cci18n]
137+
- [creativecommons/cc.license][cclicense]
138+
- [creativecommons/cc.licenserdf][cclicenserdf]
139+
- [creativecommons/rdfadict][rdfadict]
140+
141+
- WordPress and styles:
142+
143+
- [creativecommons/new-creativecommons.org][neworg]
144+
145+
[ccengine]: https://github.com/creativecommons/cc.engine
146+
[cci18n]: https://github.com/creativecommons/cc.i18n
147+
[cclicense]: https://github.com/creativecommons/cc.license
148+
[cclicenserdf]: https://github.com/creativecommons/cc.licenserdf
149+
[rdfadict]: https://github.com/creativecommons/rdfadict
150+
151+
As of 2019 December, there are around 9,700 lines of python code split between
152+
the repositories.
153+
154+
155+
### Styles and other Includes
156+
157+
:warning: **WARNING:** Any change to style or other includes must be duplicated
158+
within the [creativecommons/new-creativecommons.org][neworg] respository.
159+
160+
[neworg]: https://github.com/creativecommons/new-creativecommons.org
161+
162+
163+
## License
164+
165+
- [`LICENSE`](LICENSE) (Expat/[MIT][mit] License)
166+
167+
[mit]: http://www.opensource.org/licenses/MIT "The MIT License | Open Source Initiative"

0 commit comments

Comments
 (0)