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

Add allen #31

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
76fa9d8
updated the development guide
skalakm Oct 1, 2020
d3c191d
added docker compose, added install.sh
skalakm Oct 1, 2020
086456d
added the demodata as a volume and added fruit plantings
skalakm Oct 2, 2020
aacad5f
added more information about the early steps
skalakm Oct 2, 2020
7c6a774
added example lines on importing users and groups
skalakm Oct 6, 2020
128eb85
added a script to group the fruits into the Fruit group and updated t…
skalakm Oct 6, 2020
e4fe6e4
updated the guide to say that the fruit grouping is done by the script
skalakm Oct 6, 2020
fadc68b
removed www folder
skalakm Oct 7, 2020
21251a6
fixed a couple pieces in the install scripts
skalakm Oct 7, 2020
578c29a
added code to load harvests
skalakm Oct 7, 2020
aae28ef
simplified the git ignore
skalakm Oct 7, 2020
c3f7444
create load harvests that loads harvest logs
skalakm Oct 7, 2020
9f76708
Delete .gitignore
skalakm Oct 7, 2020
ef4fdbd
Added PR template for DCO check box
braughtstu Oct 10, 2020
d087408
Added README.md file with basic project info (#1)
braughtg Oct 10, 2020
4be7c98
Restructured and completed license information. (#17)
braughtg Oct 10, 2020
f4a159b
Moved PR Templateto proper location
braughtstu Oct 10, 2020
1d0827a
Add contrib doc (#19)
braughtg Oct 10, 2020
6f5e300
Updated the pull request template.
braughtstu Oct 10, 2020
e3d35f8
Add code of conduct (#23)
braughtg Oct 10, 2020
64eaf6b
Update pull_request_template.md
braughtg Oct 10, 2020
c6ce6cf
Create PULL_REQUEST_TEMPLATE.md
braughtg Oct 10, 2020
2a173bf
Delete pull_request_template.md
braughtg Oct 10, 2020
80e06c6
Update leaders list under enforcement
braughtstu Oct 11, 2020
4e84183
Created standard docker directory
braughtstu Oct 11, 2020
e09ce80
moved files so that they work with the new folder structure
skalakm Oct 14, 2020
ab6b5c3
simplified the gitignore
skalakm Oct 14, 2020
801b451
tested that new arrangement works
skalakm Oct 14, 2020
10187cf
added a script to revert the farmos version to 1.5
skalakm Oct 20, 2020
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
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__Pull Request Description__

<Add description>

---
__Licensing Certification__

FarmData2 is a [Free Cultural Work](https://freedomdefined.org/Definition) and all accepted contributions are licensed as described in the LICENSE.md file. This requires that the contributor holds the rights to do so. By submitting this pull request __I certify that I satisfy the terms of the [Developer Certificate of Origin](https://developercertificate.org/)__ for its contents.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
docker/www/*
docker/db/*

.DS_Store
134 changes: 134 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@

# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible 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.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders 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, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to any of the community leaders responsible for enforcement at:

* Grant Braught (braught@dickinson.edu)
* Farhan Siddiqui (siddiquf@dickinson.edu)
* Matt Steinman (steimanm@dickinson.edu)
* Allen Tucker (allen@npfi.org)

All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
74 changes: 74 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# Contributing to FarmData2 #

FarmData2 welcomes participation and contributions. There are many ways to contribute to FarmData2 that we hope will engage and energize a broad and diverse community. This document outlines a few of the ways to contribute.

## Code of Conduct ##

To promote an open, welcoming, inclusive and harassment free experience all engagement with FarmData2 is governed by the community standards expressed in the [Contributor Covenent](CODE_OF_CONDUCT.md).

## Licensing ##

Content in the FarmData2 project is released under several different licenses as described in the [LICENSE file](LICENSE.md). In addition, that file describes the rights and responsibilities of contributors with regard to the their contributed content. The licensing structure of FarmData2 is designed to ensure that FarmData2 remains free and open source while protecting both the project and it community of contributors. Please review it carefully before contributing content to FarmData2.

## Particpation ##

Having a running version of FarmData2 is a prerequisite for many of the forms of participation. The [Install Directions] give step by step instructions for getting FarmData2 up and running.

[Install Directions]: INSTALL.md

#### Gardening ####

The project [Issue Tracker] contains tickets describing known issues with the project. The tickets for known issues are tagged with the label "bug". Each reported bug is to have a detailed description of how the bug can be observed. Gardening includes activities such as:

* Verifying or clarifying that these descriptions.

* Enhance the report by providing additional information about the bug (e.g. platforms on which is is or is not seen).

* Confirming that bug does (or does not) exist in the current version.

To participate by Gardening follow the [Install Directions] to get FarmData2 up and running. Then visit the [Issue Tracker] and find something of interest to verify, enhance or clarify. Add a comment to the ticket with what you find.

[Issue Tracker]: https://www.contributor-covenant.org

#### Bug Reports ###

If you are are user of FarmData2 and discover something that doesn't seem to be working correctly:

* Search the [Issue Tracker] to see if it has been reported already.

* If it has, add a confirmed sighting or any additional information you have commenting on the ticket.

* If it has not, open a new ticket and give a description of the issue, identify the platform on which you are running FarmData2 and describe the steps someone can use to observe the bug.

#### Feature Requests ####

If you are are user of FarmData2 and have a new feature you would like to see:

* Search the [Issue Tracker] to see if it, or something close, has already been suggested by someone.

* If it has, add a comment lending support and possibly refining or giving your perspective on the idea.

* If it has not, open a new ticket and give a description of the new feature you would like to see.

#### Documentation or Code Contributions ####

If you are interested in contributing documentation or code changes, the project generally uses the [GitHub Flow](https://githubflow.github.io/) branching workflow and accepts contributions via Pull Requests.

The basic steps for working with GitHub Flow is as follows:

* Go to the [FarmData2 Repository] (the _upstream_)
* Fork the _upstream_ repository to your GitHub (the _origin_).
* Clone the _origin_ repository to your local machine.
* Set the _upstream_ remote for your local repository to point to the _upstream_ repository.
* Create a _feature branch_ from the _main_ branch your local machine.
* Make the edits to the documentation or the code in your _feature branch_.
* Commit your edits.
* If the contribution reflects the work of multiple people, ensure that
everyone receives attribution by [Creating a commit with multiple authors].
* Pull the most recent _upstream_ version of the _main branch_.
* Merge the update _main branch_ into your _feature branch_.
* Push your _feature branch_ to the _origin_.
* Make a Pull Request for your _feature branch_ to the _upstream_.

[FarmData2 Repository]: https://github.com/DickinsonCollege/FarmData2
[Creating a commit with multiple authors]: https://docs.github.com/en/free-pro-team@latest/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors
Binary file modified FarmData2developerguide.odt
100644 → 100755
Binary file not shown.
Loading