forked from hoppscotch/hoppscotch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6c61a70
commit 88b32e3
Showing
10 changed files
with
34 additions
and
91 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
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
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 |
|---|---|---|
|
|
@@ -12,81 +12,6 @@ Please note we have a code of conduct, please follow it in all your interactions | |
| 2. Update the README.md with details of changes to the interface, this includes new environment | ||
| variables, exposed ports, useful file locations and container parameters. | ||
| 3. Increase the version numbers in any examples files and the README.md to the new version that this | ||
| Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/). | ||
| Pull Request would represent. The versioning scheme we use is [SemVer](https://semver.org). | ||
| 4. You may merge the Pull Request once you have the sign-off of two other developers, or if you | ||
| do not have permission to do that, you may request the second reviewer merge it for you. | ||
|
|
||
| ## 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 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. Maintainers 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 with our 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/ | ||
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 |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| FROM node:12.10.0-alpine | ||
|
|
||
| LABEL maintainer="Liyas Thomas ([email protected])" | ||
| LABEL maintainer="Hoppscotch ([email protected])" | ||
|
|
||
| # Add git as the prebuild target requires it to parse version information | ||
| RUN apk add --update --no-cache \ | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ Before, any of you jump in and start contributing, here are a few documents from | |
| - [GitHub Externship: Website](https://github-externships.github.io/externship/index.html) | ||
| - [GitHub Externship: Program Structure](https://github-externships.github.io/externship/structure.html) | ||
|
|
||
| Our awesome community members frequently request for features on our [Discord server](https://discord.gg/GAMWxmR), [Telegram group](https://t.me/hoppscotch_externship), [GitHub issues tab](https://github.com/hoppscotch/hoppscotch/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and we have a never ending list of awesome ideas. However, keeping in mind the 3 months time span, we have filtered through our stockpile and come up with the following ideas for [GitHub Externship](https://github-externships.github.io/externship/index.html) program. | ||
| Our awesome community members frequently request for features on our [Discord server](https://hoppscotch.io/discord), [Telegram group](https://hoppscotch.io/externship_telegram), [GitHub issues tab](https://github.com/hoppscotch/hoppscotch/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and we have a never ending list of awesome ideas. However, keeping in mind the 3 months time span, we have filtered through our stockpile and come up with the following ideas for [GitHub Externship](https://github-externships.github.io/externship/index.html) program. | ||
|
|
||
| ## **Ideas** | ||
|
|
||
|
|
@@ -70,9 +70,9 @@ Please read [`CONTRIBUTING`](CONTRIBUTING.md) for details on our [`CODE OF CONDU | |
|
|
||
| [**`Web app →`**](https://hoppscotch.io) | ||
|
|
||
| [**`Discord server →`**](https://discord.gg/GAMWxmR) | ||
| [**`Discord server →`**](https://hoppscotch.io/discord) | ||
|
|
||
| [**`Telegram group →`**](https://t.me/hoppscotch_externship) | ||
| [**`Telegram group →`**](https://hoppscotch.io/externship_telegram) | ||
|
|
||
| ## **Discussions channel** | ||
|
|
||
|
|
@@ -87,7 +87,7 @@ Before asking a question please check this [How do I ask a good question?](https | |
|
|
||
| ## **Need help?** | ||
|
|
||
| Start a discussion [here](https://github.com/hoppscotch/hoppscotch/discussions) if you’re unable to get a response from the [Telegram](https://t.me/hoppscotch_externship), [Discord](https://discord.gg/GAMWxmR) communities. | ||
| Start a discussion [here](https://github.com/hoppscotch/hoppscotch/discussions) if you’re unable to get a response from the [Telegram](https://hoppscotch.io/externship_telegram), [Discord](https://hoppscotch.io/discord) communities. | ||
|
|
||
| Start a new idea under [discussions](https://github.com/hoppscotch/hoppscotch/discussions) only once you’ve finalized your project proposal. | ||
|
|
||
|
|
@@ -106,4 +106,4 @@ We look forward to seeing your proposals for a happy summer of coding. | |
| - [Liyas Thomas](https://github.com/liyasthomas) | ||
| - [Andrew Bastin](https://github.com/andrewbastin) | ||
|
|
||
| If you have any questions or queries please contact us via [Telegram](https://t.me/hoppscotch_externship), [Discord](https://discord.gg/GAMWxmR) or send an email to us at [email protected]. | ||
| If you have any questions or queries please contact us via [Telegram](https://hoppscotch.io/externship_telegram), [Discord](https://hoppscotch.io/discord) or send an email to us at [email protected]. | ||
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
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 |
|---|---|---|
|
|
@@ -39,7 +39,7 @@ | |
| ></iframe> | ||
| </span> | ||
| <span class="flex flex-col font-mono md:flex-row" style="align-items: start"> | ||
| <a href="mailto:[email protected]" target="_blank" rel="noopener"> | ||
| <a href="mailto:[email protected]" target="_blank" rel="noopener"> | ||
| <button class="icon" v-tooltip="$t('contact_us')"> | ||
| <i class="material-icons">email</i> | ||
| </button> | ||
|
|
||
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
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 |
|---|---|---|
| @@ -1,3 +1,21 @@ | ||
| [build] | ||
| command = "npm run generate" | ||
| functions = "netlify/" | ||
|
|
||
| [[redirects]] | ||
| from = "/discord" | ||
| to = "https://discord.gg/GAMWxmR" | ||
| status = 301 | ||
| force = true | ||
|
|
||
| [[redirects]] | ||
| from = "/telegram" | ||
| to = "https://t.me/hoppscotch" | ||
| status = 301 | ||
| force = true | ||
|
|
||
| [[redirects]] | ||
| from = "/externship_telegram" | ||
| to = "https://t.me/hoppscotch_externship" | ||
| status = 301 | ||
| force = true |
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