-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from okta/lr-update-readme-file
Update README.
- Loading branch information
Showing
3 changed files
with
205 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
# CONTRIBUTOR COVENANT CODE OF CONDUCT | ||
|
||
## Our Pledge | ||
|
||
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation. | ||
|
||
## Our Standards | ||
|
||
Examples of behavior that contributes to creating a positive environment include: | ||
|
||
- Using welcoming and inclusive language | ||
- Being respectful of differing viewpoints and experiences | ||
- Gracefully accepting constructive criticism | ||
- Focusing on what is best for the community | ||
- Showing empathy towards other community members | ||
|
||
Examples of unacceptable behavior by participants include: | ||
|
||
- The use of sexualized language or imagery and unwelcome sexual attention or advances | ||
- Trolling, insulting/derogatory comments, and personal or political attacks | ||
- Public or private harassment | ||
- Publishing others’ private information, such as a physical or electronic address, without explicit permission | ||
- Other conduct which could reasonably be considered inappropriate in a professional setting | ||
|
||
## Our Responsibilities | ||
|
||
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. | ||
|
||
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. | ||
|
||
## Scope | ||
|
||
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. | ||
|
||
## Enforcement | ||
|
||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. | ||
|
||
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project’s leadership. | ||
|
||
## Attribution | ||
|
||
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] | ||
|
||
For answers to common questions about this code of conduct, see https://www.contributor-covenant.org/faq | ||
|
||
[homepage]: http://contributor-covenant.org | ||
[version]: http://contributor-covenant.org/version/1/4/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
Contributing to Okta Open Source Repos | ||
====================================== | ||
|
||
Sign the CLA | ||
------------ | ||
|
||
You _may_ need to [sign the CLA](https://developer.okta.com/cla/), read it before getting started. Common questions/answers are also listed on the CLA page. | ||
|
||
Summary | ||
------- | ||
This document covers how to contribute to an Okta Open Source project. These instructions assume you have a GitHub.com account, so if you don't have one you will have to create one. Your proposed code changes will be published to your own fork of the Okta Xamarin SDK project and you will submit a Pull Request for your changes to be added. | ||
|
||
_Lets get started!!!_ | ||
|
||
|
||
Fork the code | ||
------------- | ||
|
||
In your browser, navigate to: [https://github.com/okta/okta-oidc-xamarin](https://github.com/okta/okta-oidc-xamarin/) | ||
|
||
Fork the repository by clicking on the 'Fork' button on the top right hand side. The fork will happen and you will be taken to your own fork of the repository. Copy the Git repository URL by clicking on the clipboard next to the URL on the right hand side of the page under '**HTTPS** clone URL'. You will paste this URL when doing the following `git clone` command. | ||
|
||
On your computer, follow these steps to setup a local repository for working on the Okta Xamarin SDK: | ||
|
||
``` bash | ||
$ git clone https://github.com/YOUR_ACCOUNT/okta-oidc-xamarin.git | ||
$ cd okta-oidc-xamarin | ||
$ git remote add upstream https://github.com/okta/okta-oidc-xamarin.git | ||
$ git checkout master | ||
$ git fetch upstream | ||
$ git rebase upstream/master | ||
``` | ||
|
||
|
||
Making changes | ||
-------------- | ||
|
||
It is important that you create a new branch to make changes on and that you do not change the `master` branch (other than to rebase in changes from `upstream/master`). In this example I will assume you will be making your changes to a branch called `feature_x`. This `feature_x` branch will be created on your local repository and will be pushed to your forked repository on GitHub. Once this branch is on your fork you will create a Pull Request for the changes to be added to the Okta Xamarin SDK project. | ||
|
||
It is a recommended practice to create a new branch each time you want to contribute to the project and only track the changes for that pull request in this branch. | ||
|
||
``` bash | ||
$ git checkout -b feature_x | ||
(make your changes) | ||
$ git status | ||
$ git add . | ||
$ git commit -a -m "descriptive commit message for your changes" | ||
``` | ||
|
||
> The `-b` specifies that you want to create a new branch called `feature_x`. You only specify `-b` the first time you checkout because you are creating a new branch. Once the `feature_x` branch exists, you can later switch to it with only `git checkout feature_x`. | ||
|
||
Rebase `feature_x` to include updates from `upstream/master` | ||
------------------------------------------------------------ | ||
|
||
It is important that you maintain an up-to-date `master` branch in your local repository. This is done by rebasing in the code changes from `upstream/master` (the official Okta Xamarin SDK project repository) into your local repository. You will want to do this before you start working on a feature as well as right before you submit your changes as a pull request. I recommend you do this process periodically while you work to make sure you are working off the most recent project code. | ||
|
||
This process will do the following: | ||
|
||
1. Checkout your local `master` branch | ||
2. Synchronize your local `master` branch with the `upstream/master` so you have all the latest changes from the project | ||
3. Rebase the latest project code into your `feature_x` branch so it is up-to-date with the upstream code | ||
|
||
``` bash | ||
$ git checkout master | ||
$ git fetch upstream | ||
$ git rebase upstream/master | ||
$ git checkout feature_x | ||
$ git rebase master | ||
``` | ||
|
||
> Now your `feature_x` branch is up-to-date with all the code in `upstream/master`. | ||
|
||
Make a GitHub Pull Request to contribute your changes | ||
----------------------------------------------------- | ||
|
||
When you are happy with your changes and you are ready to contribute them, you will create a Pull Request on GitHub to do so. This is done by pushing your local changes to your forked repository (default remote name is `origin`) and then initiating a pull request on GitHub. | ||
|
||
> **IMPORTANT:** Make sure you have rebased your `feature_x` branch to include the latest code from `upstream/master` _before_ you do this. | ||
``` bash | ||
$ git push origin master | ||
$ git push origin feature_x | ||
``` | ||
|
||
Now that the `feature_x` branch has been pushed to your GitHub repository, you can initiate the pull request. | ||
|
||
To initiate the pull request, do the following: | ||
|
||
1. In your browser, navigate to your forked repository: [https://github.com/YOUR_ACCOUNT/okta-oidc-xamarin](https://github.com/YOUR_ACCOUNT/okta-oidc-xamarin) | ||
2. Click the new button called '**Compare & pull request**' that showed up just above the main area in your forked repository | ||
3. Validate the pull request will be into the upstream `master` and will be from your `feature_x` branch | ||
4. Enter a detailed description of the work you have done and then click '**Send pull request**' | ||
|
||
If you are requested to make modifications to your proposed changes, make the changes locally on your `feature_x` branch, re-push the `feature_x` branch to your fork. The existing pull request should automatically pick up the change and update accordingly. | ||
|
||
> **Note**: Although we are using continuous integration, not all the tests will run from third party contributors. It is the repository owner’s responsibility to make sure that your changes don’t break anything before merging into master. | ||
Cleaning up after a successful pull request | ||
------------------------------------------- | ||
|
||
Once the `feature_x` branch has been committed into the `upstream/master` branch, your local `feature_x` branch and the `origin/feature_x` branch are no longer needed. If you want to make additional changes, restart the process with a new branch. | ||
|
||
> **IMPORTANT:** Make sure that your changes are in `upstream/master` before you delete your `feature_x` and `origin/feature_x` branches! | ||
You can delete these deprecated branches with the following: | ||
|
||
``` bash | ||
$ git checkout master | ||
$ git branch -D feature_x | ||
$ git push origin :feature_x | ||
``` | ||
|
||
Code of Conduct | ||
--------------- | ||
|
||
This project and everyone participating in it is governed by the [Okta Code of Conduct](https://github.com/okta/okta-oidc-xamarin/tree/master/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [email protected]. | ||
|
Oops, something went wrong.