From ea9f3017019b2e87e217c5049c942dcc3ebe381b Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 21 Jun 2017 09:18:22 +0100 Subject: [PATCH 1/8] Point to Open Source Friday - Add Open Source Friday to the "How To Contribute" list and tweak the wording to suggest that it's more than just discovery (this applies to other projects in that list too) - On Fridays show a link to Open Source Friday on the index page --- _articles/how-to-contribute.md | 3 ++- assets/js/index.js | 8 ++++++++ index.html | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/_articles/how-to-contribute.md b/_articles/how-to-contribute.md index b9bc9908ef8..dc71105d637 100644 --- a/_articles/how-to-contribute.md +++ b/_articles/how-to-contribute.md @@ -210,9 +210,10 @@ You might scan a README and find a broken link or a typo. Or you're a new user a > [28% of casual contributions](http://www.igor.pro.br/publica/papers/saner2016.pdf) to open source are documentation, such as a typo fix, reformatting, or writing a translation. -You can also use one of the following resources to help you discover new projects: +You can also use one of the following resources to help you discover and contribute to new projects: * [GitHub Explore](https://github.com/explore/) +* [Open Source Friday](https://opensourcefriday.com) * [First Timers Only](http://www.firsttimersonly.com/) * [Your First PR](https://yourfirstpr.github.io/) * [CodeTriage](https://www.codetriage.com/) diff --git a/assets/js/index.js b/assets/js/index.js index d996bbd5e54..d8bba8b7949 100644 --- a/assets/js/index.js +++ b/assets/js/index.js @@ -15,3 +15,11 @@ $(selector).wrapInner(''); })(); + +(function() { + var FRIDAY = 5; + var today = new Date(); + if (FRIDAY == today.getDay()) { + $("#opensourcefriday").show(); + } +})(); diff --git a/index.html b/index.html index 6d10967e547..db1def84878 100644 --- a/index.html +++ b/index.html @@ -25,6 +25,10 @@

Open Source Guides

Open source software is made by people just like you. Learn how to launch and grow your project.

+ From 7a85b49e5cb0f904cc4723f643462e73f9ce3d40 Mon Sep 17 00:00:00 2001 From: Kyle Magnuson Date: Tue, 27 Jun 2017 10:09:45 -0400 Subject: [PATCH 2/8] Remove extra word 'the' from Trade secrets section --- _articles/legal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_articles/legal.md b/_articles/legal.md index 022f9b45ca1..d33b9a5f20d 100644 --- a/_articles/legal.md +++ b/_articles/legal.md @@ -125,7 +125,7 @@ For better or worse, consider letting them know even if it's a personal project. * **Third party material:** Does your project have dependencies created by others or otherwise include or use others' code? If these are open source, you'll need to comply with the materials' open source licenses. That starts with choosing a license that works with the third party open source licenses (see above). If your project modifies or distributes third party open source material, then your legal team will also want to know that you're meeting other conditions of the third party open source licenses such as retaining copyright notices. If your project uses others' code that doesn't have an open source license, you'll probably have to ask the third party maintainers to [add an open source license](https://choosealicense.com/no-license/#for-users), and if you can't get one, stop using their code in your project. -* **Trade secrets:** Consider whether there is anything in the project that the company does not want to make available to the general public. If so, you could open source the rest of your project, after extracting the material the you want to keep private. +* **Trade secrets:** Consider whether there is anything in the project that the company does not want to make available to the general public. If so, you could open source the rest of your project, after extracting the material you want to keep private. * **Patents:** Is your company applying for a patent of which open sourcing your project would constitute [public disclosure](https://en.wikipedia.org/wiki/Public_disclosure)? Sadly, you might be asked to wait (or maybe the company will reconsider the wisdom of the application). If you're expecting contributions to your project from employees of companies with large patent portfolios, your legal team may want you to use a license with an express patent grant from contributors (such as Apache 2.0 or GPLv3), or an additional contributor agreement (see above). From aa9daf9dd0b911528dbfd896fea7e933ad4414c2 Mon Sep 17 00:00:00 2001 From: "C.X. Ling" Date: Thu, 29 Jun 2017 21:15:09 +0800 Subject: [PATCH 3/8] Fix typo in legal.md --- _articles/legal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_articles/legal.md b/_articles/legal.md index d33b9a5f20d..52c56d332db 100644 --- a/_articles/legal.md +++ b/_articles/legal.md @@ -96,7 +96,7 @@ Probably not. For the vast majority of open source projects, an open source lice An additional contributor agreement -- often called a Contributor License Agreement (CLA) -- can create administrative work for project maintainers. How much work an agreement adds depends on the project and implementation. A simple agreement might require that contributors confirm, with a click, that they have the rights necessary to contribute under the project open source license. A more complicated agreement might require legal review and sign-off from contributors' employers. -Also, by adding "paperwork" that some believe is unnecessary, hard to understand, or unfair (when the agreement recipient gets more rights than contriubtors or the public do via the project's open source license), an additional contributor agreement may be perceived as unfriendly to the project's community. +Also, by adding "paperwork" that some believe is unnecessary, hard to understand, or unfair (when the agreement recipient gets more rights than contributors or the public do via the project's open source license), an additional contributor agreement may be perceived as unfriendly to the project's community.