Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update licences #57

Merged
merged 23 commits into from
Nov 5, 2017
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
86e5939
Add CHANGELOG
Stephen-Gates Jul 17, 2017
9a603be
Fix CHANGLOG links
Stephen-Gates Jul 17, 2017
ede790f
Adjust for missing releases in GitHub
Stephen-Gates Jul 17, 2017
0c252dc
Add Community files
Stephen-Gates Jul 17, 2017
6a7f8ab
Fix broken CONTRIBUTING.md links
Stephen-Gates Jul 18, 2017
6276e81
Fix Readme link in CONTRIBUTING
Stephen-Gates Jul 18, 2017
26614c1
move community files
Stephen-Gates Oct 24, 2017
60a5187
update data package with constraints
Stephen-Gates Oct 24, 2017
1460781
remove quotes from "true" in constraints
Stephen-Gates Oct 24, 2017
bba338c
Add Open Government Data License Taiwan 1.0
Stephen-Gates Oct 24, 2017
38def69
add German Government licences
Stephen-Gates Oct 24, 2017
d9a1916
add missing commas in German Licences
Stephen-Gates Oct 24, 2017
f0c2d68
add non-conformant cc licences
Stephen-Gates Oct 24, 2017
5fdf54a
Add Open License 2.0 (France)
Stephen-Gates Oct 24, 2017
82fc321
Fix missing value and status in Geogratis
Stephen-Gates Oct 24, 2017
0bcc3e2
Add Open Data Commons as maintainer for PDDL and ODbL
Stephen-Gates Oct 24, 2017
00c3a74
add line ending to licenses.csv
Stephen-Gates Oct 24, 2017
c80e020
fix broken links in readme
Stephen-Gates Oct 24, 2017
61637bd
Mark OGL-UK-2.0 as "superseded"
Stephen-Gates Oct 24, 2017
371bc7a
adjust LO-FR-2.0
Stephen-Gates Oct 25, 2017
d02d8d6
correct spelling
Stephen-Gates Oct 27, 2017
fede711
Change superceded spelling to test schema
Stephen-Gates Oct 28, 2017
4cb5564
fix superseded spelling
Stephen-Gates Oct 28, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Code of Conduct

We are a worldwide network of people passionate about openness, and we use advocacy, technology and training to unlock information so everyone can benefit from open knowledge.

Read about [our vision and values](https://okfn.org/about/vision-and-values/).
69 changes: 69 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Contributing
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Purely personal opinion: I'm not a big fan of using .github directory for files that aren't GitHub-specific. In this PR, CONTRIBUTING.md and CODE_OF_CONDUCT.md aren't, while ISSUE_TEMPLATE.md is. Put another way, the the first two should be read by someone just browsing, while the last is of no use unless one is filing an issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The files can go in .github according to GitHub but elsewhere they recommend otherwise. Happy to move.


Firstly, thanks for being here. All types of contributions are valued and gratefully received. Please consider how you may be able to contribute:

- [financial support](#contribute-financial-support)
- [ideas and feature requests](#contribute-ideas-and-feature-requests)
- [issues or bug reports](#contribute-issues)
- [documentation](#contribute-documentation)
- [code](#contribute-code)

## Contribute Financial Support

We are grateful to all [our funders][funders]. Would you like to [make a donation][donate]?

## Contribute Ideas and Feature Requests

Your idea for a feature addition may already exist on our [issues] backlog. If you find it, join the conversation.

If the gist of your idea isn't there:
- [add an issue][issues]
- to discuss your idea privately, [contact us][contact_us]

## Contribute Issues

If you encounter a problem, please [add an issue][issues]. Make sure it hasn't already be reported.

In order for us to best respond to the issue, we need as much information about the issue as you can provide. Please provide:

- as much detail as possible in the issue template.
- a descriptive name for your issue.

We may add or change labels on your issue to help us manage the issue backlog.

## Contribute Documentation

Documentation helps people use and contribute to the work we do. You may like to:

- improve the [Readme.md][readme]
- add or improve other documentation in this repository
- write a Guide, Blog post or even Tweet

## Contribute Code
This work is open source, and we are grateful to all our [contributors]. By participating in this project, you agree to abide by our [Code of Conduct][code_of_conduct].

Before you start coding, please reach out to us to discuss how you can help.

If this is your first time contributing code, you will need to [create a fork of this repository](https://help.github.com/articles/fork-a-repo/).

Follow the [readme instructions][readme] to get your development environment running locally.

Ensure that all automated tests pass before starting work on your contribution.

### Code Review Process

All contributions to the codebase will be reviewed. To increase your chances of your code being accepted please be aware of the following:

- Write [well formed commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
- Write tests for all changes (additions or refactors of existing code).
- We may use GitHub integrations to check your contribution.
- Once your Pull Request (PR) is published and passes the above checks a repository administrator will review your contribution. Where appropriate, comments will be provided and amendments suggested before your PR is merged into Master.


[code_of_conduct]: CODE_OF_CONDUCT.md
[contact_us]: https://okfn.org/contact/
[contributors]: https://github.com/okfn/licenses/graphs/contributors
[donate]: https://okfn.org/donate/
[funders]: https://okfn.org/about/funders/
[issues]: https://github.com/okfn/licenses/issues
[readme]: ../README.md
24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
> Please provide a general summary of the issue in the Issue Title above
> fill out the headings below as applicable to the issue you are reporting,
> deleting as appropriate but offering us as much detail as you can to help us resolve the issue

### Expected Behaviour
> What should happen?

### Desired Behaviour (for enhancement suggestions only)
> if relevant include images or hyperlinks to other resources that clarify the enhancement you're seeking

### Current Behaviour (for problems)
> What currently happens that isn't expected behaviour?

### Steps to Reproduce (for problems)
> Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant
1.
2.
3.
4.

### Your Environment
> Include as many relevant details about the environment you experienced the bug in - this will help us resolve the bug more expediently
* Environment name and version (e.g. Chrome 39, node.js 5.4):
* Operating System and version (desktop or mobile):
45 changes: 45 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). The
[project releases](https://github.com/okfn/licenses/releases) will adhere to [semantic versioning](http://semver.org/spec/v2.0.0.html)

This approach was adopted after release 0.7.

To see what's planned, see our [milestones](https://github.com/okfn/licenses/milestones) or unreleased changes.

[Unreleased]: https://github.com/okfn/licenses/compare/0.7...HEAD
## [Unreleased]

[0.7]: https://github.com/okfn/licenses/compare/0.6.1...0.7
## [0.7] - 2012-03-18

[0.6.1]: https://github.com/okfn/licenses/compare/0.6...0.6.1
## [0.6.1] - 2011-02-23
### Changed
- Minor tweak to CC BY-SA license name

[0.6]: https://github.com/okfn/licenses/compare/0.5...0.6
## [0.6] - 2011-02-11
### Changed
- Heavy refactoring and simplification
- Improve and add documentation

## 0.5 - 2010-05-12
No GitHub compare between 0.4 and 0.5 available as 0.4 was not tagged as a release in GitHub.
### Added
- Addition of Licenses SoS v2.0 capabilities

## 0.4 - 2010-03-08
Release not implemented in GitHub.
### Added
- Addition of Licenses SoS v1.0 capabilities (Specification of Service)

### Changed
- This module is redesigned to be a web service

## 0.3 - 2010-03-06 and older
Release 0.3 not implemented in GitHub.

### Added
- Module is designed to be imported to provide its list of licenses
36 changes: 2 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ All data (and associated content) is placed in the Public Domain using the
License](http://opendatacommons.org/licenses/pddl/1-0/). All code is licensed
under the [MIT License](http://www.opensource.org/licenses/mit-license.php).


## Layout

<pre>
Expand All @@ -34,39 +33,8 @@ To build files for deployment do:

bin/deploy.py run

For deployment simply upload the current directory files to a relevant online
location.
For deployment simply upload the current directory files to a relevant online location.

We currently use github pages (we previously used s3).

## Changelog

### HEAD

* Complete rewrite to be simpler (just data, no longer python library).
See <https://github.com/okfn/licenses/issues/1>

### v0.6.1 2011-02-22

* Minor tweak to CC by-sa license name

### v0.6 2011-02-11

* Heavy refactoring and simplification
* Improve and add documentation

### v0.5 2010-05-11

* Addition of Licenses SoS v2.0 capabilities


### v0.4 2010-03-08

* This module is redesigned to be a web service
* Addition of Licenses SoS v1.0 capabilities (Specification of Service)


### v0.3 2010-03-06 and older

* Module is designed to be imported to provide its list of licenses

The changes in each [release](https://github.com/okfn/licenses/releases) are recorded in the [Change Log](./CHANGELOG.md).