Skip to content

Commit c0a75fa

Browse files
hemanth-hkhemanth-hk
committed
Merge branch 'master' of https://github.com/creativecommons/chooser into Tests_for_LicenseDetailsCard
2 parents 57c68c5 + ff6d11b commit c0a75fa

22 files changed

+214
-98
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cc-chooser
1+
# chooser
22

33
The Creative Commons License Chooser is meant to help people learn about CC licenses, and select the license that best fits their needs. The new version in this repo places greater importance on usability and an educational experience of the six CC licenses.
44

@@ -9,7 +9,7 @@ This site is built using [Vue.js](https://vuejs.org/) (and vue-cli), and [Buefy]
99

1010
#### Roadmap
1111

12-
Tasks, issues, and discussion related to the release of the new chooser are tracked with the [`Launch Milestone`](https://github.com/creativecommons/cc-chooser/milestone/1).
12+
Tasks, issues, and discussion related to the release of the new chooser are tracked with the [`Launch Milestone`](https://github.com/creativecommons/chooser/milestone/1).
1313

1414
## Getting Started
1515
Run the following commands in order to have the code up and running on your machine:
@@ -24,11 +24,11 @@ $ npm run serve
2424
You should now have the application running and accessible at http://localhost:8080 (note: will run on a different port if 8080 is occupied, most common alternative port is 8081).
2525

2626
## Contributing
27-
Before getting started on an issue, please comment on the issue you would like to work on to indicate that you are interested. Issues marked with the yellow `in progress` tag are already claimed, and are not up for grabs.
27+
For information on contributing, please see [Creative Commons' Contribution Guidelines](https://opensource.creativecommons.org/contributing-code/)
2828

2929
If you create a PR for your work, but you are not finished yet, please include `WIP:` in the beginning of your PR title. When your work on your PR is completed and you are ready for a final review, please remove the `WIP:` prefix from the title to indicate that your work is done.
3030

31-
Here's a [handy link](https://github.com/creativecommons/cc-chooser/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22help+wanted%22+-label%3A%22in+progress%22) that will show you all open issues in this repo that have the `help wanted` tag, but do not have the `in progress` tag.
31+
Here's a [handy link](https://github.com/creativecommons/chooser/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22help+wanted%22+-label%3A%22in+progress%22) that will show you all open issues in this repo that have the `help wanted` tag, but do not have the `in progress` tag.
3232
All issues in this list are up for grabs!
3333
If it says "No results matched your search", then there are no issues currently up for grabs.
3434

‎docs/css/app.27d8733e.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/css/app.fddf921f.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><link rel=icon type=image/png href=https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png sizes=192x192><link rel=apple-touch-icon-precomposed href=https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png><meta name=twitter:card content=summary><meta name=twitter:site content=@creativecommons><meta name=twitter:creator content=@creativecommons><meta property=og:url content=https://beta-chooser.creativecommons.org><meta property=og:title content="Choose a License"><meta property=og:type content=website><meta property=og:description content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><meta property=og:image content=https://mirrors.creativecommons.org/presskit/logos/cc.logo.large.png><meta property=og:locale content=en_US><meta property=og:locale:alternate content=ru_RU><title>Choose a License</title><link href=/css/app.27d8733e.css rel=preload as=style><link href=/js/app.e6777d53.js rel=preload as=script><link href=/js/chunk-vendors.8ad4a80c.js rel=preload as=script><link href=/css/app.27d8733e.css rel=stylesheet></head><body><noscript><strong>We're sorry but License Chooser doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.8ad4a80c.js></script><script src=/js/app.e6777d53.js></script></body></html>
1+
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><meta name=description content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><link rel=icon href=/favicon.ico><link rel=icon type=image/png href=https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png sizes=192x192><link rel=apple-touch-icon-precomposed href=https://d15omoko64skxi.cloudfront.net/wp-content/uploads/2016/05/cc-site-icon-300x300.png><meta name=twitter:card content=summary><meta name=twitter:site content=@creativecommons><meta name=twitter:creator content=@creativecommons><meta property=og:url content=https://beta-chooser.creativecommons.org><meta property=og:title content="Choose a License"><meta property=og:type content=website><meta property=og:description content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><meta property=og:image content=https://mirrors.creativecommons.org/presskit/logos/cc.logo.large.png><meta property=og:locale content=en_US><meta property=og:locale:alternate content=ru_RU><title>Choose a License</title><link href=/css/app.fddf921f.css rel=preload as=style><link href=/js/app.52658b24.js rel=preload as=script><link href=/js/chunk-vendors.8ad4a80c.js rel=preload as=script><link href=/css/app.fddf921f.css rel=stylesheet></head><body><noscript><strong>We're sorry but License Chooser doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.8ad4a80c.js></script><script src=/js/app.52658b24.js></script></body></html>

‎docs/js/app.52658b24.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/app.52658b24.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/app.e6777d53.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎docs/js/app.e6777d53.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"name": "cc-chooser",
2+
"name": "chooser",
33
"version": "1.0.0",
44
"description": "The new and improved Creative Commons License Chooser",
55
"author": "akmadian <akmadian@gmail.com>",
66
"private": false,
77
"repository": {
88
"type": "git",
9-
"url": "git+https://github.com/creativecommons/cc-chooser.git"
9+
"url": "git+https://github.com/creativecommons/chooser.git"
1010
},
1111
"license": "MIT",
1212
"scripts": {
@@ -15,7 +15,7 @@
1515
"test:unit": "vue-cli-service test:unit",
1616
"test:e2e": "vue-cli-service test:e2e",
1717
"lint": "vue-cli-service lint",
18-
"test": "vue-cli-service test:unit --coverage",
18+
"test": "vue-cli-service test:unit --coverage && vue-cli-service test:e2e",
1919
"i18n:report": "vue-cli-service i18n:report -v --src src/**/*.vue --locales src/locales/**.json -o output.json"
2020
},
2121
"dependencies": {

0 commit comments

Comments
 (0)