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

Merge layer progress into files #158

Merged
merged 59 commits into from
Sep 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
563d5f6
Bump electron from 6.0.2 to 6.0.3
dependabot-preview[bot] Aug 20, 2019
06ac680
Bump tslint from 5.18.0 to 5.19.0
dependabot-preview[bot] Aug 21, 2019
4340f58
Bump @angular/router from 8.2.2 to 8.2.3
dependabot-preview[bot] Aug 22, 2019
bf40a84
Bump @angular/language-service from 8.2.2 to 8.2.3 (#100)
dependabot-preview[bot] Aug 22, 2019
ad4cf37
Bump @angular/cli from 8.2.2 to 8.3.0
dependabot-preview[bot] Aug 22, 2019
0a31390
Bump @fortawesome/free-solid-svg-icons from 5.10.1 to 5.10.2
dependabot-preview[bot] Aug 23, 2019
7cac71f
Bump @angular-devkit/build-angular from 0.802.2 to 0.803.0
dependabot-preview[bot] Aug 23, 2019
4cd6aa8
Bump @fortawesome/fontawesome-svg-core from 1.2.21 to 1.2.22
dependabot-preview[bot] Aug 23, 2019
f81febe
Bump electron from 6.0.3 to 6.0.4
dependabot-preview[bot] Aug 26, 2019
4fd38df
Bump @types/lodash from 4.14.137 to 4.14.138
dependabot-preview[bot] Aug 28, 2019
1163ae0
Bump electron from 6.0.4 to 6.0.5
dependabot-preview[bot] Aug 28, 2019
fb6ab19
Bump @angular/cli from 8.3.0 to 8.3.1
dependabot-preview[bot] Aug 28, 2019
c671a48
Bump @angular-devkit/build-angular from 0.803.0 to 0.803.1
dependabot-preview[bot] Aug 28, 2019
ebd816b
Bump @angular/router from 8.2.3 to 8.2.4
dependabot-preview[bot] Aug 28, 2019
7d128ce
Bump @angular/language-service from 8.2.3 to 8.2.4
dependabot-preview[bot] Aug 28, 2019
69b9d15
Bump @angular/cli from 8.3.1 to 8.3.2
dependabot-preview[bot] Aug 29, 2019
899bf48
Bump @angular-devkit/build-angular from 0.803.1 to 0.803.2
dependabot-preview[bot] Aug 29, 2019
00f72c2
Bump @types/node from 12.7.2 to 12.7.3
dependabot-preview[bot] Aug 30, 2019
7df06d6
Bump electron from 6.0.5 to 6.0.6
dependabot-preview[bot] Aug 30, 2019
ee6fafc
Bump electron from 6.0.6 to 6.0.7
dependabot-preview[bot] Aug 31, 2019
385541f
Bump @types/node from 12.7.3 to 12.7.4
dependabot-preview[bot] Sep 3, 2019
d9bd49d
Bump rxjs from 6.5.2 to 6.5.3
dependabot-preview[bot] Sep 3, 2019
3d13185
Bump @angular/cli from 8.3.2 to 8.3.3
dependabot-preview[bot] Sep 4, 2019
e4ad30d
Bump @angular-devkit/build-angular from 0.803.2 to 0.803.3
dependabot-preview[bot] Sep 4, 2019
23f9b0f
Bump @angular/router from 8.2.4 to 8.2.5
dependabot-preview[bot] Sep 4, 2019
471ccde
Bump @angular/language-service from 8.2.4 to 8.2.5
dependabot-preview[bot] Sep 4, 2019
259ebd7
Bump electron-store from 4.0.0 to 5.0.0
dependabot-preview[bot] Sep 9, 2019
bd6a188
Bump electron from 6.0.7 to 6.0.8
dependabot-preview[bot] Sep 9, 2019
aa838ab
Bump tslint from 5.19.0 to 5.20.0
dependabot-preview[bot] Sep 10, 2019
a146b75
Bump @types/node from 12.7.4 to 12.7.5
dependabot-preview[bot] Sep 11, 2019
0b2da2e
Bump @angular/cli from 8.3.3 to 8.3.4
dependabot-preview[bot] Sep 11, 2019
bfc56c0
Bump @angular-devkit/build-angular from 0.803.3 to 0.803.4
dependabot-preview[bot] Sep 11, 2019
65a3558
Bump @angular/router from 8.2.5 to 8.2.6
dependabot-preview[bot] Sep 11, 2019
5be8530
Bump @angular/language-service from 8.2.5 to 8.2.6
dependabot-preview[bot] Sep 11, 2019
852019e
Bump electron from 6.0.8 to 6.0.9
dependabot-preview[bot] Sep 12, 2019
3d6b2f7
Bump ts-node from 8.3.0 to 8.4.0
dependabot-preview[bot] Sep 15, 2019
3a48b15
Bump ts-node from 8.4.0 to 8.4.1
dependabot-preview[bot] Sep 16, 2019
11b605d
Bump @fortawesome/fontawesome-svg-core from 1.2.22 to 1.2.23
dependabot-preview[bot] Sep 18, 2019
1c29fc9
Bump @fortawesome/free-solid-svg-icons from 5.10.2 to 5.11.0
dependabot-preview[bot] Sep 18, 2019
dc8cb14
Bump @angular/router from 8.2.6 to 8.2.7
dependabot-preview[bot] Sep 18, 2019
fa0b841
Bump @angular/language-service from 8.2.6 to 8.2.7
dependabot-preview[bot] Sep 18, 2019
de5596f
Bump @angular/cli from 8.3.4 to 8.3.5
dependabot-preview[bot] Sep 18, 2019
48f9a1e
Bump @angular-devkit/build-angular from 0.803.4 to 0.803.5
dependabot-preview[bot] Sep 18, 2019
b60d765
Bump @fortawesome/fontawesome-svg-core from 1.2.23 to 1.2.24
dependabot-preview[bot] Sep 18, 2019
cf65551
Bump @fortawesome/free-solid-svg-icons from 5.11.0 to 5.11.1
dependabot-preview[bot] Sep 18, 2019
76aacb0
Bump electron from 6.0.9 to 6.0.10
dependabot-preview[bot] Sep 19, 2019
1b4843e
Bump codelyzer from 5.1.0 to 5.1.1
dependabot-preview[bot] Sep 19, 2019
e44928b
Bump node-dht-sensor from 0.3.0 to 0.4.0
dependabot-preview[bot] Sep 22, 2019
23e7ecf
Display layer progress (#97)
UnchartedBull Sep 23, 2019
2eb53a2
Bump @types/lodash from 4.14.138 to 4.14.139
dependabot-preview[bot] Sep 23, 2019
123ec66
Create CODE_OF_CONDUCT.md
UnchartedBull Sep 24, 2019
e6d8eb6
Create CONTRIBUTING.md
UnchartedBull Sep 24, 2019
65d695a
Update README.md
UnchartedBull Sep 24, 2019
2250c2c
Bump @types/node from 12.7.5 to 12.7.7
dependabot-preview[bot] Sep 24, 2019
62ef9ce
Bump @angular/router from 8.2.7 to 8.2.8
dependabot-preview[bot] Sep 25, 2019
83e55a7
Bump @angular/language-service from 8.2.7 to 8.2.8
dependabot-preview[bot] Sep 25, 2019
a912c0a
Bump @angular-devkit/build-angular from 0.803.5 to 0.803.6
dependabot-preview[bot] Sep 25, 2019
65bf8ef
Bump @angular/cli from 8.3.5 to 8.3.6
dependabot-preview[bot] Sep 25, 2019
9b0a813
Bump @types/node from 12.7.7 to 12.7.8
dependabot-preview[bot] Sep 25, 2019
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
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# 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 https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

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

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
If you can think of something nice to add or want to change some of the messy code feel free to create a Pull Request. I'll have a look at it and will merge it into master if everything checks out! Any help is greatly appreciated!

If you can think of a great feature, but don't feel yet ready to code something open an issue. I'll have a look at it and maybe implement it if I have the time. It is preferred if you directly create a Pull Request for your new feature. If you need some help, I can point you in the correct direction.
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,11 @@ One more thing: If you're Octoprint is running on a Raspberry Pi 1 you may want

## Contributing

If you can think of something nice to add or want to change some of the messy code feel free to create a Pull Request. I'll have a look at it and will merge it into master if everything checks out!
Any help is greatly appreciated!

If you can think of a great feature, but don't feel yet ready to code something open an issue. I'll have a look at it and maybe implement it if I have the time. It is preferred if you directly create a Pull Request for your new feature. If you need some help, I can point you in the correct direction.
See [CONTRIBUTING.md](https://github.com/UnchartedBull/OctoDash/blob/master/CONTRIBUTING.md).

## License

The project is licensed under the Apache 2.0 License.
The project is licensed under the Apache 2.0 License. [More Information](https://github.com/UnchartedBull/OctoDash/blob/master/LICENSE.md).

The Credits for the icons can be (temporarily) found at icons.txt. They'll get moved into the product soon.

Expand Down
Loading