Skip to content

Commit

Permalink
first commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Imanol Bernabeu committed Apr 20, 2018
0 parents commit 1080c76
Show file tree
Hide file tree
Showing 1,799 changed files with 221,449 additions and 0 deletions.
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# http://editorconfig.org
root = true

[*.{java,xml}]
indent_style = tab
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

# Kompatibility zu maven-dependency-plugin/maven-release-plugin... und damit zu jgitflow
[pom.xml]
indent_style = space
28 changes: 28 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
.idea/
*.iml
target/
derby.log
#LibreOffice Lockfiles (z.B. beim Bearbeiten von basisreport.xls)
.~lock*
# Irgendwelche Lockfiles (Citrix/Office?)
.attribute^
.access^
~\$*
~\*
ebegu-runconfig/wildfly_9.0.2/build.properties
ebegu-runconfig/wildfly_10.0.0.Final/build.properties
/*/~/.m2
~/.m2
/ebegu-rest/ch.dvbern.ebegu.entities.*/_*
/ebegu-server/ch.dvbern.ebegu.entities.*/_*
/ebegu-rest/ch.dvbern.ebegu.entities.*/segments_*
/ebegu-rest/ch.dvbern.ebegu.entities.*/write.lock
/ebegu-server/ch.dvbern.ebegu.entities.*/segments_*
/ebegu-server/ch.dvbern.ebegu.entities.*/write.lock
/ebegu-server/jboss.server.data.dir/*
/logstash/input/dvb-dev/server.log**
/logstash/input/dvb-int/server.log**
/logstash/input/id-test/server.log**
/logstash/input/id-int/server.log**
/logstash/input/id-test2/server.log**
/logstash/input/id-prod/server.log**
73 changes: 73 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# 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, 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:

* 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 explicit or offensive language or imagery
* 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]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
104 changes: 104 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
## Contributing

First off, thank you for considering contributing to Ki-Tax!
### 1. Where do I go from here?

If you've noticed a bug or have a question that doesn't belong on the
[wiki](https://github.com/StadtBern/Ki-Tax/wiki), then
[search the issue tracker](https://github.com/StadtBern/Ki-Tax/issues)
to see if someone else in the community has already created a ticket regarding your issue.
If not, feel free to go ahead and [make one](https://github.com/StadtBern/Ki-Tax/issues/new)!

### 2. Did you find a bug?

* **Ensure the bug was not already reported** by searching on GitHub under
[Issues](https://github.com/StadtBern/Ki-Tax/issues).

* If you're unable to find an open issue addressing the problem,
[open a new one](https://github.com/StadtBern/Ki-Tax/issues/new).
Be sure to include a **title and clear description**, as much relevant information as possible,
and a **code sample** or an **executable test case** demonstrating the expected behavior that is not happening.

### 3. I can fix this!

At this point, you're ready to make your changes! Feel free to ask for help!

If this is something you think you can fix, then
[fork (RepoName)](https://help.github.com/articles/fork-a-repo)
and create a branch with a descriptive name.

A good branch name would be (where issue #325 is the ticket you're working on):

```sh
git checkout develop
git checkout -b 325-add-mynewchanges
```

### 4. Code of Conduct

By being part of our development team and community, please abide the rules in our
[Code of Conduct](CODE_OF_CONDUCT.md)!
Further information on how to report inapropriate behaviour by others, check the Enforcements-Section
in said Code Of Conduct. Thank you for being a nice person!

### 5. Code Styles, Guildlines & Inspections

Since we're trying to keep the code structured, readable and standardised, please check out and implement our
Code Styles & Inspections if you are using IntelliJ IDEA.

[Code Styles](https://raw.githubusercontent.com/dvbern/codestyles/master/src!IDE-settings!IntelliJ!DVBern-Conventions-2017-05-29.xml)
(Add Scheme under Project Settings > Editor > Code Style)

[Inspections](https://raw.githubusercontent.com/dvbern/codestyles/master/src!IDE-settings!IntelliJ!DVBern_Inspections_2017_05_19.xml)
(Add Profile under Project Settings > Editor > Inspections)

### 6. Make a pull request

At this point, you should switch back to your master branch and make sure it's
up to date with the master branch:

```sh
git remote add upstream [email protected]/StadtBern/Ki-Tax.git
git checkout master
git pull upstream master
```

Then update your feature branch from your local copy of master, and push it!

```sh
git checkout 325-add-mynewchanges
git rebase master
git push --set-upstream origin 325-add-mynewchanges
```

Finally, go to GitHub and
[make a Pull Request](https://help.github.com/articles/creating-a-pull-request)


### 7. Keeping your pull request updated

If a maintainer asks you to "rebase" your pull request, they're saying that a lot of code
has changed, and that you need to update your branch so it's easier to merge.

To learn more about rebasing in Git, there are a lot of
[good](http://git-scm.com/book/en/Git-Branching-Rebasing)
[resources](https://help.github.com/articles/interactive-rebase),
but here's the suggested workflow:

```sh
git checkout 325-add-mynewchanges
git pull --rebase upstream develop
git push --force-with-lease 325-add-mynewchanges
```

### 8. Merging a pull request (maintainers only)

A pull request can only be merged into develop by a maintainer if:

* It is passing the tests.
* It has been approved by at least two maintainers. If it was a maintainer who
opened the pull request, only one extra approval is needed.
* It has no requested changes.
* It is up to date with current develop.

Any maintainer is allowed to merge a pull request if all of these conditions are met.
Loading

0 comments on commit 1080c76

Please sign in to comment.