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

gitter to discord (fixes #870) #871

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Please make sure to:
- add (fixes #issue_number) to the end of pull request title when applicable,
- drop a link to your new pull request in our gitter chat.
- drop a link to your new pull request in our discord server.

Thank you for contributing! -->

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Welcome to treehouses
=====================

[![Website treehouses.io](https://img.shields.io/website?url=https%3A%2F%2Ftreehouses.io)](https://treehouses.io)
[![Gitter chatroom](https://img.shields.io/gitter/room/treehouses/Lobby)](https://gitter.im/treehouses/Lobby)
[![chat on discord](https://img.shields.io/discord/1079980988421132369?logo=discord&color=%237785cc)](https://discord.gg/NdrumrSNSA)

What is treehouses?
-------------------
Expand Down
2 changes: 1 addition & 1 deletion index.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The project is divided into several parts to meet the needs of different users,
![OLE Raspberry Pi](./images/OLE_RPi.png)

More information about the internship and treehouses can be found in our [FAQ](https://treehouses.io/#!./pages/vi/faq.md#General_Internship_Questions).
Should you wish to reach out for information or assistance, feel free to contact us in the [Gitter chatroom](https://gitter.im/treehouses/Lobby). Feel free to direct message our [members](./pages/vi/team.md) in Gitter if you'd like.
Should you wish to reach out for information or assistance, feel free to contact us in [our Discord server](https://discord.gg/NdrumrSNSA).

---

Expand Down
6 changes: 3 additions & 3 deletions navigation.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@

* [**Introduction**](pages/docs/chat.md)
- - - -
* [General Chat (Open to Public)](https://gitter.im/treehouses/Lobby)
* [Virtual Interns](https://gitter.im/open-learning-exchange/interns)
* [RaspberryPi](https://gitter.im/open-learning-exchange/raspberrypi)
* [Discord Chat (Open to Public)](https://discord.gg/NdrumrSNSA)
* [Discord - Virtual Interns Lounge](https://discord.com/channels/1079980988421132369/1229436065090371616)
* [RaspberryPi](https://discord.gg/NdrumrSNSA)

<!-- System Manual -->

Expand Down
12 changes: 6 additions & 6 deletions pages/blog/20191202-blogfornewintern.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

This blog is about how to help aspiring interns complete the First Steps.

As an intern, your job is to look in the Gitter chat for:
• New aspiring virtual interns in the chat to welcome them
As an intern, your job is to look in the Discord server for:
• New aspiring virtual interns in the server to welcome them
• New pull requests by them in [treehouses.github.io](https://github.com/treehouses/treehouses.github.io) that are ready for review
• Pull requests ready to be merged (2 approvals)
• Questions and problems they are stuck on (they might send you a private message so please regularly check your Gitter)
• Questions and problems they are stuck on (they might send you a private message so please regularly check your Discord)

## How to welcome all new aspiring virtual interns
If you see this message `@/all Hello Team my name is .... I'd like to become a virtual intern. What is the next step?`, you need to welcome the new intern and send this link `https://treehouses.io/#!./pages/vi/firststeps.md` so they can start working on the First Steps.
Expand All @@ -28,7 +28,7 @@ One of your responsibilities as an intern is to review and help aspiring virtual

1. **Review files:** you can comment, approve, and request changes in the 'Files Changed' tab on their pull request. For this step, you should take your time to review a file. Do not rush :)

Every time you comment on an issue or review a pull request, message those involved on the Gitter chat with a link to the issue or the pull request so the aspiring virtual intern can see the comment. For example:
Every time you comment on an issue or review a pull request, message those involved on the Discord channel with a link to the issue or the pull request so the aspiring virtual intern can see the comment. For example:
```
@username_of_intern please see my comment (URL link of the issue or pull request)
```
Expand All @@ -43,7 +43,7 @@ The pull request can be merged if at least two other people have approved it and
* if you accidently merge a PR that does not include closing keywords, you need to manually close the issue and link it to the original pull request.
* The title should also be in lowercase letters `we do not want uppercase letters in the title of PRs`

Every time you merge a pull request, please send a message to the intern on the Gitter chat with a link to the issue and merged link. For example:
Every time you merge a pull request, please send a message to the intern on the Discord channel with a link to the issue and merged link. For example:

```
@username_of_intern please look at (URL link of the issue) and (URL link of the merged link)
Expand All @@ -52,7 +52,7 @@ Every time you merge a pull request, please send a message to the intern on the
## Work Routine
We recommend you to follow this basic daily routine:

1. [Check gitter chat](https://gitter.im/treehouses/Lobby)
1. Check our Discord server
1. Review any issues or pull requests that have been added or changed on [treehouses.github.io](https://github.com/treehouses/treehouses.github.io) since the last time you reviewed.
1. Make pull requests as early as possible so you can get feedback as you work.
1. Join the Google hangout sessions at [http://talk.ole.org]( http://talk.ole.org). At the Hangout meeting, we will discuss our projects. If you have any questions, you can also ask the team at the meeting. For the Treehouses meeting, we have three sessions which are ...
Expand Down
4 changes: 2 additions & 2 deletions pages/blog/20200110-androidstudiosetup.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ Run the app on an emulator as follows:

## Run into problems?

* Google your errors and post them in [Gitter](https://treehouses.io/#!pages/chat.md) if you need help.
* Google your errors and post them in our Discord server if you need help.
* You might need to reinstall Android Studio to fix your problem.

---

Portions of this page are reproduced from work created and shared by the Android Open Source Project and used according to terms described in the Creative Commons 2.5 Attribution License.
Portions of this page are reproduced from work created and shared by the Android Open Source Project and used according to terms described in the Creative Commons 2.5 Attribution License.
15 changes: 5 additions & 10 deletions pages/chat.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
# treehouses / chat

## Gitter
## Discord

Our **Gitter** chat is a great place to learn, discuss, and collaborate with other members to build a better treehouses platform. The chat lets our development team and interns communicate easily, and signup is through each member’s GitHub account.
Our **Discord** server is a great place to learn, discuss, and collaborate with other members to build a better treehouses platform. The chat lets our development team and interns communicate easily.

Communication is key in every collaborative project, and treehouses is no different. Gitter provides tight integration with *Github* and provides full rich text support through **Markdown** an important tool for clean and efficient communication. Combining these features allows members to mention other members in a message, format text, share images and code, and directly link to GitHub issues and repositories.
Communication is key in every collaborative project, and treehouses is no different. Discord provides integration with *Github* and provides full rich text support through **Markdown**, an important tool for clean and efficient communication. Combining these features allows members to mention other members in a message, format text, share images and code, and directly link to GitHub issues and repositories.

## Best Practices

As you complete the [First Steps](vi/firststeps.md), we want you to keep us updated in the Gitter chat. Generally, you should comment in the chat when you make an issue or pull request, and then link to it. Make a mention (@*name*) of someone when you comment on their issue/pull request, then link to it. For example:
As you complete the [First Steps](vi/firststeps.md), we want you to keep us updated in the Discord channel. Generally, you should comment in the chat when you make an issue or pull request, and then link to it. Make a mention (@*name*) of someone when you comment on their issue/pull request, then link to it. For example:

> Hey @dogi, just commented on your issue: [https://github.com/treehouses/treehouses.github.io/issues/2](https://github.com/treehouses/treehouses.github.io/issues/2)

This good etiquette helps streamline communication between internship candidates and staff members alike! Feel free to look through the chat for more examples.

You may want to include clarifying *images* with your messages. To add an image in the chat, either drag and drop or copy and paste it into the messaging area.

Below is the preview of our Gitter chat room. [Click here](https://gitter.im/treehouses/Lobby/) for the full Gitter chat page. We also encourage the use of Gitter chat apps for Windows, macOS, Linux, Android and iPhone, visit the download [page here](https://gitter.im/apps).

## Gitter Chat Room Preview


<iframe src="https://gitter.im/treehouses/Lobby/~embed" style="width: 100%;border:none;height:70vh;"></iframe>
We also encourage the use of Discord apps for Windows, macOS, Linux, Android and iPhone, visit the download [page here](https://discord.com/download).
4 changes: 2 additions & 2 deletions pages/vi/dockertutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ A few common Docker CLI commands you might need for working with `treehouses` ar

Compose is a tool for defining and running multi-container Docker applications. With Compose, you use a YAML file to configure your application’s [services](https://docs.docker.com/get-started/part3/#about-services). Then, with a single command, you create and start all the services from your configuration. You can read more about Docker Compose at [Overview of Docker Compose](https://docs.docker.com/compose/overview/).

**NOTE**: At the end of this step, when you have completed all the sections and executed the `docker-compose --version` command go to the Gitter [chat](https://gitter.im/treehouses/Lobby) and post which version of docker you are running.
**NOTE**: At the end of this step, when you have completed all the sections and executed the `docker-compose --version` command, go to the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274) and post which version of docker you are running.
" @/all I'm on step 4 - Docker Tutorial, I am running `docker version` and `docker compose version` "

---
#### Return to [First Steps](firststeps.md#Step_4_-_System_Tutorial)
#### Return to [First Steps](firststeps.md#Step_4_-_System_Tutorial)
4 changes: 2 additions & 2 deletions pages/vi/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#### Q4: What are the hours of the internship?

+ This is an intensive internship that requires 16 hours of work each week. Work with your fellow interns and keep us updated in the [Gitter chat](https://gitter.im/treehouses/Lobby).
+ This is an intensive internship that requires 16 hours of work each week. Work with your fellow interns and keep us updated in [our Discord server](https://discord.com/channels/1079980988421132369).
+ The reason we have a 16 hour minimal commitment per week is that things are moving forward quickly and it might be hard for virtual interns to catch up with changes. Basically, we would have a few hours of Google Hangout sessions per week where everyone shares their screen, discusses problems, and works on issues together. Then the rest of the time is for catching up with the changes and working on issues assigned.

#### Q5: Is this a paid internship?
Expand All @@ -45,7 +45,7 @@

#### Q6: What happens after the initial steps?

+ The initial steps are meant to introduce potential interns to the Treehouses system and begin assigning you assignments! To be more clear: the initial 10 steps are a vetting process to determine whether or not people are fit for the internship, so consider it an interview for the internship. Once you have completed the 10 steps and are approved, you have officially joined the OLE interns team! We’ll add you to the interns Gitter chatroom and assign you to a team. You and your team will be working on an assignment, and we’ll switch up the assignments each week.
+ The initial steps are meant to introduce potential interns to the Treehouses system and begin assigning you assignments! To be more clear: the initial 10 steps are a vetting process to determine whether or not people are fit for the internship, so consider it an interview for the internship. Once you have completed the 10 steps and are approved, you have officially joined the OLE interns team! We’ll add you to the interns Discord channel and assign you to a team. You and your team will be working on an assignment, and we’ll switch up the assignments each week.

#### Q7: If I'm an international student, how soon can I get my paperwork required by my visa?

Expand Down
Loading