Skip to content

Commit

Permalink
Merge pull request OmniDB#998 from wind39/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
wind39 authored Jun 11, 2019
2 parents 5c494c3 + 2cd0118 commit 99c5f81
Show file tree
Hide file tree
Showing 10 changed files with 1,133 additions and 444 deletions.
56 changes: 45 additions & 11 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@

## 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, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
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, gender identity and expression, level of
experience, nationality, personal appearance, race, religion, or sexual identity
and orientation.


## Our Standards

Examples of behavior that contributes to creating a positive environment include:
Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
Expand All @@ -16,31 +23,58 @@ Examples of behavior that contributes to creating a positive environment include

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* 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
* 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 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.

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.
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]. The project team will review and investigate all complaints, and will respond in a way that it deems 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.
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. The
project team will review and investigate all complaints, and will respond in a
way that it deems 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.

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]
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
39 changes: 28 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Contributing to OmniDB

We love your input! We want to make contributing to this project as easy and transparent as possible, whether it's:
We love your input! We want to make contributing to this project as easy and
transparent as possible, whether it's:

- Reporting a bug
- Asking questions
Expand All @@ -12,25 +13,35 @@ We love your input! We want to make contributing to this project as easy and tra

## OmniDB Database Support

Currently OmniDB supports `PostgreSQL`, `Oracle`, `MySQL` and `MariaDB`. We plan to support `Firebird`, `MSSQL Server`, `SQLite` and `IBM DB2` in the foreseeable future. Suggestions and even pull requests for other databases are welcome.
Currently OmniDB supports `PostgreSQL`, `Oracle`, `MySQL` and `MariaDB`. We plan
to support `Firebird`, `MSSQL Server`, `SQLite` and `IBM DB2` in the foreseeable
future. Suggestions and even pull requests for other databases are welcome.


## OmniDB Operating System Support

We currently build OmniDB for Debian, CentOS, Windows and OSX. Deployment for different Linux distributions such as openSUSE, Arch Linux, Gentoo and RaspBian is in our roadmap, but it requires time. You can suggest other operating systems or architectures and even perform pull requests, we will appreciate that.
We currently build OmniDB for Debian, CentOS, Windows and OSX. Deployment for
different Linux distributions such as openSUSE, Arch Linux, Gentoo and RaspBian
is in our roadmap, but it requires time. You can suggest other operating systems
or architectures and even perform pull requests, we will appreciate that.


## OmniDB Repositories

- [https://github.com/OmniDB/OmniDB](https://github.com/OmniDB/OmniDB): Main application and server, deployment scripts and tests.
- [https://github.com/OmniDB/doc](https://github.com/OmniDB/doc): OmniDB documentation.
- [https://github.com/OmniDB/monitors](https://github.com/OmniDB/monitors): Monitors (charts, grids) for the Monitoring Dashboard.
- [https://github.com/OmniDB/plugins](https://github.com/OmniDB/plugins): OmniDB oficial plugins.
- [https://github.com/OmniDB/OmniDB](https://github.com/OmniDB/OmniDB): Main
application and server, deployment scripts and tests.
- [https://github.com/OmniDB/doc](https://github.com/OmniDB/doc): OmniDB
documentation.
- [https://github.com/OmniDB/monitors](https://github.com/OmniDB/monitors)
Monitors (charts, grids) for the Monitoring Dashboard.
- [https://github.com/OmniDB/plugins](https://github.com/OmniDB/plugins): OmniDB
official plugins.


## We Develop with Github

We use GitHub to host code, to track issues and feature requests, as well as accept pull requests.
We use GitHub to host code, to track issues and feature requests, as well as
accept pull requests.

1. Fork the repo.
2. Checkout `dev` branch.
Expand All @@ -39,17 +50,23 @@ We use GitHub to host code, to track issues and feature requests, as well as acc
5. Ensure the test suite passes.
5. Issue that pull request to the `dev` branch.

Note that the `dev` branch is only used in the main repo. For other repos, issue your pull request to the `master` branch.
Note that the `dev` branch is only used in the main repo. For other repos, issue
your pull request to the `master` branch.


## Any contributions you make will be under the MIT Software License

In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.
In short, when you submit code changes, your submissions are understood to be
under the same [MIT License](http://choosealicense.com/licenses/mit/) that
covers the project. Feel free to contact the maintainers if that's a concern.


## Report bugs using Github's [issues](https://github.com/OmniDB/OmniDB/issues)

We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/OmniDB/OmniDB/issues/new); it's that easy!
We use GitHub issues to track public bugs. Report a bug by
[opening a new issue](https://github.com/OmniDB/OmniDB/issues/new); it's that
easy!


## Write bug reports with detail

Expand Down
Loading

0 comments on commit 99c5f81

Please sign in to comment.