Skip to content

Commit 5f86a31

Browse files
committed
Merge branch 'main' into cc4-da-legalcode
2 parents 45f5b7c + e57455d commit 5f86a31

File tree

213 files changed

+7797
-2033
lines changed

Some content is hidden

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

213 files changed

+7797
-2033
lines changed

.circleci/config.yml

-9
This file was deleted.

.github/workflows/tidy.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: lint
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [main]
7+
workflow_dispatch:
8+
9+
jobs:
10+
tidy:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
15+
- name: Install system dependencies
16+
env:
17+
DEBIAN_FRONTEND: noninteractive
18+
run: |
19+
sudo apt-get update
20+
sudo apt-get install -y tidy
21+
22+
# https://github.com/actions/checkout
23+
- uses: actions/checkout@v2
24+
25+
- name: Tidy Legal Code
26+
run: |
27+
./tools/tidy_legalcode.sh

CODE_OF_CONDUCT.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ project and all other Creative Commons open source projects are governed by our
88

99
For a history of updates, see the [page history here][updates].
1010

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
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/main/content/community/code-of-conduct/contents.lr

CONTRIBUTING.md

+10-7
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,32 @@
33
Thank you for your interest in contributing to CC Open Source! This document is
44
a set of guidelines to help you contribute to this project.
55

6+
67
## Code of Conduct
78

89
By participating in this project, you are expected to uphold our [Code of
910
Conduct][code_of_conduct].
1011

11-
[code_of_conduct]:https://opensource.creativecommons.org/community/code-of-conduct/
12+
[code_of_conduct]: https://opensource.creativecommons.org/community/code-of-conduct/
13+
1214

1315
## Project Documentation
1416

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.
17+
The `README` in the root of the repository should contain or link to project
18+
documentation. If you cannot find the documentation you're looking for, please
19+
file a GitHub issue with details of what you'd like to see documented.
20+
1921

2022
## How to Contribute
2123

2224
Please follow the processes in our general [Contributing Code][contributing]
2325
guidelines on the Creative Common Open Source website.
2426

25-
[contributing]:https://opensource.creativecommons.org/contributing-code/
27+
[contributing]: https://opensource.creativecommons.org/contributing-code/
28+
2629

2730
## Questions or Thoughts?
2831

2932
Talk to us on [one of our community forums][community].
3033

31-
[community]:https://opensource.creativecommons.org/community/
34+
[community]: https://opensource.creativecommons.org/community/

0 commit comments

Comments
 (0)