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

Issue 783 rename repo name #785

Merged
merged 18 commits into from Feb 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6ff72f2
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 19, 2017
b2e11f9
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 19, 2017
f6b6d27
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 20, 2017
24da525
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 22, 2017
91e7c24
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 24, 2017
d45ea41
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 26, 2017
9c5aeec
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Nov 26, 2017
7da54f1
Merge branch 'staging' into upstream/staging
railsstudent Dec 9, 2017
1c49f3c
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Dec 9, 2017
f81c773
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Dec 17, 2017
a2765c8
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Dec 21, 2017
8ca2fcd
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Dec 24, 2017
acb6097
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Jan 1, 2018
d070d70
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Jan 13, 2018
aa9600d
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Jan 13, 2018
4e9d8a1
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Jan 16, 2018
d470a03
Merge remote-tracking branch 'upstream/staging' into staging
railsstudent Feb 3, 2018
ffd7450
Replace codebuddiesdotorg to codebuddies
railsstudent Feb 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -4,4 +4,4 @@ Describe the big picture of your changes here to communicate to the maintainers

Note that we are unlikely to accept pull requests that add features without prior discussion. The best way to propose a feature is to open an issue first and discuss your ideas there before implementing them.

Always follow the [contribution guidelines](https://github.com/codebuddiesdotorg/codebuddies/blob/master/contributing.md) when submitting a pull request.
Always follow the [contribution guidelines](https://github.com/codebuddies/codebuddies/blob/master/contributing.md) when submitting a pull request.
6 changes: 3 additions & 3 deletions client/templates/home/footer.html
Expand Up @@ -23,7 +23,7 @@
<a href="/about">{{_ "about"}}</a>
<a href="/faq">{{_ "faq"}}</a>
<a href="/slack">{{_ "slack"}}</a>
<a href="https://github.com/codebuddiesdotorg/codebuddies" target="_blank">Github</a>
<a href="https://github.com/codebuddies/codebuddies" target="_blank">Github</a>
<a href="https://www.facebook.com/groups/TOPSTUDYGROUP/" target="_blank">Facebook Group</a>
<a href="https://medium.com/codebuddies" target="_blank">Medium Publication</a>
<a href="https://opencollective.com/codebuddies" target="_blank">Open Collective</a>
Expand All @@ -33,7 +33,7 @@
<div class="footer-social">
<p><strong>CONNECT WITH US</strong></p>
<span class="footer-icons">
<a href="https://github.com/codebuddiesdotorg/codebuddies" target="_blank"><i class="fa fa-github"></i></a>
<a href="https://github.com/codebuddies/codebuddies" target="_blank"><i class="fa fa-github"></i></a>
<a href="https://codebuddies.slack.com" target="_blank"><i class="fa fa-slack"></i></a>
<a href="https://twitter.com/codebuddiesmeet" target="_blank"><i class="fa fa-twitter"></i></a>
<a href="https://www.facebook.com/groups/TOPSTUDYGROUP/" target="_blank"><i class="fa fa-facebook"></i></a>
Expand All @@ -43,7 +43,7 @@
<div class="col-md-2"> <!-- column 5 -->
<div class="footer-sponsor">
<p><strong>SPONSOR US</strong></p>
<p>Our project is free and <strong><a href="https://github.com/codebuddiesdotorg/codebuddies" target="_blank">open-sourced</a></strong>. Help keep this project alive by <a class="sponsor" href="http://opencollective.com/codebuddies" target="_blank"><strong>donating to our Open Collective</strong>.</a></p>
<p>Our project is free and <strong><a href="https://github.com/codebuddies/codebuddies" target="_blank">open-sourced</a></strong>. Help keep this project alive by <a class="sponsor" href="http://opencollective.com/codebuddies" target="_blank"><strong>donating to our Open Collective</strong>.</a></p>
<p>Built By Cool People Around The World!</p>
<a href="/privacy">Privacy Policy</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/templates/home/home_logged_out.html
Expand Up @@ -7,7 +7,7 @@
<div id="intro">
<h2>Learn and chat about code!</h2>
<p class="intro">CodeBuddies is a community of 3600+ code learners who help each other through conversations on <strong>Slack</strong> and peer-to-peer organized <strong>study groups</strong> and <strong>virtual hangouts</strong>.</p>
<p>The project is free, <a href="https://github.com/codebuddiesdotorg/codebuddies" target="_blank" class="link">open-sourced</a>, and built by a fantastic team of core volunteer contributors.</p>
<p>The project is free, <a href="https://github.com/codebuddies/codebuddies" target="_blank" class="link">open-sourced</a>, and built by a fantastic team of core volunteer contributors.</p>
<div class="join-slack">
<div class="slack-invite">
<script async defer src="https://codebuddiesmeet.herokuapp.com/slackin.js?large"></script>
Expand Down Expand Up @@ -39,7 +39,7 @@ <h2>Peer-to-peer organized study groups</h2>
<p>Have a learning goal, like finishing a MOOC course or finding study partners with whom to work on code exercises together? You can start a <a href="/study-groups">study group</a> to find study partners with similar goals. Within each group, you can join a 24/7 hangout, log your current status ("I'm on Ch. 5!"), log your learnings/accomplishments, and schedule hangouts for that group.</p>
<h2>Peer-to-peer organized virtual hangouts</h2>
<p>Joining or starting a screensharing hangout is a fun way to learn a programming or web development skill quicker, and anyone can schedule one.</p>
<p>As a community, we tend to keep the video camera turned off by default and mainly rely on voice (if it's not a "silent" hangout) and the chat box. Screensharing is useful, but always optional. Be aware that once you stop screen sharing, you will have to manually turn off your video feed. Our hangouts are a safe space and everyone abides by a <a href="https://github.com/codebuddiesdotorg/codebuddies/blob/release/CODE_OF_CONDUCT.md" target="_blank">Code of Conduct</a>.</p>
<p>As a community, we tend to keep the video camera turned off by default and mainly rely on voice (if it's not a "silent" hangout) and the chat box. Screensharing is useful, but always optional. Be aware that once you stop screen sharing, you will have to manually turn off your video feed. Our hangouts are a safe space and everyone abides by a <a href="https://github.com/codebuddies/codebuddies/blob/release/CODE_OF_CONDUCT.md" target="_blank">Code of Conduct</a>.</p>
<img src="/images/hangout-example-1.gif" width="100%"/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/templates/nav/header.html
Expand Up @@ -29,7 +29,7 @@
<i class="fa fa-slack fa-fw" aria-hidden="true"></i>{{_ "slack"}}
</a></li>
<li role="separator" class="divider"></li>
<li><a href="https://github.com/codebuddiesdotorg/codebuddies" target="_blank">
<li><a href="https://github.com/codebuddies/codebuddies" target="_blank">
<i class="fa fa-github fa-fw" aria-hidden="true"></i>Github
<i class="fa fa-external-link fa-fw" aria-hidden="true"></i>
</a></li>
Expand Down
6 changes: 3 additions & 3 deletions client/templates/other/about.html
Expand Up @@ -57,17 +57,17 @@ <h3>Why we built this</h3>
</div>
<div class="col-md-6">
<h3>How we built this</h3>
<p> This project is 100% built by volunteers in the community. We created a Google Doc with specs, volunteers stepped up to talk design and create mockups, more volunteers built the foundations of the codebase, and more continually step up to help with our <a href="https://github.com/codebuddiesdotorg/codebuddies/" target="_blank">Github issues</a>. In addition, volunteers keep our <a href="http://codebuddies.slack.com" target="_blank">Slack chatroom</a> alive, moderating the chat, sharing useful links and discounts, and answering each other's coding-related questions.</p>
<p> This project is 100% built by volunteers in the community. We created a Google Doc with specs, volunteers stepped up to talk design and create mockups, more volunteers built the foundations of the codebase, and more continually step up to help with our <a href="https://github.com/codebuddies/codebuddies/" target="_blank">Github issues</a>. In addition, volunteers keep our <a href="http://codebuddies.slack.com" target="_blank">Slack chatroom</a> alive, moderating the chat, sharing useful links and discounts, and answering each other's coding-related questions.</p>
</div>
</div>
<div class="row">
<div class="col-md-6">
<h3>Our Pledge</h3>
<p>In the interest of fostering an open and welcoming environment, we as community members, 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. <a href="https://github.com/codebuddiesdotorg/codebuddies/blob/master/CODE_OF_CONDUCT.md" target="_blank">Read our code of conduct.</a></p>
<p>In the interest of fostering an open and welcoming environment, we as community members, 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. <a href="https://github.com/codebuddies/codebuddies/blob/master/CODE_OF_CONDUCT.md" target="_blank">Read our code of conduct.</a></p>
</div>
<div class="col-md-6">
<h3>We are open-sourced</h3>
<p>This website is <strong>100%</strong> community-built and open-sourced on Github. Come say hi and <a href="https://github.com/codebuddiesdotorg/codebuddies/blob/master/contributing.md" target="_blank">contribute to this project</a> if you want to help!
<p>This website is <strong>100%</strong> community-built and open-sourced on Github. Come say hi and <a href="https://github.com/codebuddies/codebuddies/blob/master/contributing.md" target="_blank">contribute to this project</a> if you want to help!
</p>
<h3>We are fully transparent</h3>
<p>This project operates in full transparency as a member of the Open Collective. Please help support our monthly server costsby becoming a <a href="http://opencollective.com/codebuddies" target="_blank">sponsor or backer</a>. You can help keep this project alive!</p>
Expand Down
10 changes: 5 additions & 5 deletions client/templates/other/faq.html
Expand Up @@ -20,15 +20,15 @@ <h3>Helpful Links</h3>
<ul>
<li><a href="http://codebuddies.slack.com" target="_blank">Slack</a> (<a href="http://codebuddiesmeet.herokuapp.com" target="_blank" >Get your invite</a>)</li>
<li><a href="https://www.facebook.com/groups/TOPSTUDYGROUP/" target="_blank">Facebook Group</a></li>
<li><a href="https://github.com/codebuddiesdotorg/codebuddies">Github</a> - <a href="https://github.com/codebuddiesdotorg/codebuddies/blob/master/contributing.md" target="_blank">Contributing.md</a>, <a href="https://github.com/codebuddiesdotorg/codebuddies/pulls" target="_blank">Pull Requests</a>
<li><a href="https://github.com/codebuddies/codebuddies">Github</a> - <a href="https://github.com/codebuddies/codebuddies/blob/master/contributing.md" target="_blank">Contributing.md</a>, <a href="https://github.com/codebuddies/codebuddies/pulls" target="_blank">Pull Requests</a>
</li>
<li><a href="http://twitter.com/codebuddiesmeet" target="_blank">@codebuddiesmeet</a></li>
<li><a href="http://opencollective.com/codebuddies">Open Collective</a></li>
</ul>
</div>
<div class="col-md-8">
<h3>When was this site created? Why did you all work together to build this site?</h3>
<p>The very first iteration of CodeBuddies (a static splash page linking to Google Groups) launched in June 2014. The second iteration launched a few months afterwards. The <a href="http://github.com/codebuddiesdotorg/codebuddies" target="_blank">codebase</a> that our current site runs on had its first commit on January 6th, 2016 and has been built entirely by volunteers.</p>
<p>The very first iteration of CodeBuddies (a static splash page linking to Google Groups) launched in June 2014. The second iteration launched a few months afterwards. The <a href="http://github.com/codebuddies/codebuddies" target="_blank">codebase</a> that our current site runs on had its first commit on January 6th, 2016 and has been built entirely by volunteers.</p>
<p>Our community spends a lot of time helping each other on Slack, but it's hard to schedule study times in advance in a chatroom, and it's also hard to know who else is online possibly working on the same thing at the same time. This website solves those issues by letting anyone start a virtual hangout to meet with others who might want to study with them.</p>
<p>We're sort of like a meetup.com -- except we only meet virtually (leading to experiences where four different timezones are represented in a single hangout), and we're all about helping each other learn faster.</p>
<h3>Outside of hangouts, where can I ask questions and chat with others in the community?</h3>
Expand All @@ -50,10 +50,10 @@ <h3> <i class="fa fa-lightbulb-o" aria-hidden="true"></i> What are the "learning
<h3>Why the emphasis on hangouts?</h3>
<p>We've discovered that the act of scheduling times to study is a good way to motivate ourselves to learn new things faster. Plus, learning with others and being able to talk through a tutorial or project or some snippet makes learning a LOT more fun. </p>
<h3>How is this project funded?</h3>
<p>We're a community of people who enjoy helping each other and are passionate about learning, not a legal entity. This project operates in full transparency as a member of the <a href="http://opencollective.com/codebuddies" target="_blank">Open Collective</a>. Please help support our monthly server costs by becoming a <a href="http://opencollective.com/codebuddies" target="_blank">sponsor or backer</a>. You can help keep this project alive! If you'd like to contribute in other ways (helping with outreach to new sponsors, community management, the Medium publication, contributing to bug fixes and new features on <a href="http://github.com/codebuddiesdotorg/codebuddies" target="_blank">Github</a> etc.), please say hello in the #codebuddies-meta channel.</p>
<p>We're a community of people who enjoy helping each other and are passionate about learning, not a legal entity. This project operates in full transparency as a member of the <a href="http://opencollective.com/codebuddies" target="_blank">Open Collective</a>. Please help support our monthly server costs by becoming a <a href="http://opencollective.com/codebuddies" target="_blank">sponsor or backer</a>. You can help keep this project alive! If you'd like to contribute in other ways (helping with outreach to new sponsors, community management, the Medium publication, contributing to bug fixes and new features on <a href="http://github.com/codebuddies/codebuddies" target="_blank">Github</a> etc.), please say hello in the #codebuddies-meta channel.</p>
<h3>Do you have a community code of conduct?</h3>
<p>Yes. See <a href="https://github.com/codebuddiesdotorg/codebuddies/blob/master/CODE_OF_CONDUCT.md"> this.</a></p>
<p>Yes. See <a href="https://github.com/codebuddies/codebuddies/blob/master/CODE_OF_CONDUCT.md"> this.</a></p>

<h3>What is the Slack Etiquette in this community?</h3>
<h4>General Rules to Follow</h4>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion client/templates/other/hangout-faq.html
Expand Up @@ -43,7 +43,7 @@ <h4>How do I get my Hangout noticed?</h4>
<p>Our community is most active on Slack; we recommend that you figure out a time that works for at least one other study partner, and then schedule the Hangout for that time. When you've created the Hangout, feel free to share a link to it in any relevant Slack channel so that others who didn't see it can join.</p>
<h4>When a Hangout is in progress, what are some general tips?</h4>
<ul>
<li>Hangouts are a safe space for learning with participants of all levels. Please follow our community's <a href="https://github.com/codebuddiesdotorg/codebuddies/blob/master/CODE_OF_CONDUCT.md" target="_blank">Code of Conduct</a>.</li>
<li>Hangouts are a safe space for learning with participants of all levels. Please follow our community's <a href="https://github.com/codebuddies/codebuddies/blob/master/CODE_OF_CONDUCT.md" target="_blank">Code of Conduct</a>.</li>
<li><strong>It's all right to join a Hangout late, or to be a silent observer.</strong> You're not interrupting! If you'd rather not speak, please remember to type "hello" in the chatbox so that the other participants in the Hangout knows you're there and observing.</li>
<li>You can use <a href="http://codebuddies.slack.com" target="_blank">Slack</a> OR the Hangout chat box to chat and type questions.</li>
<li>Screensharing is always optional, but it's a useful tool for preventing ourselves from getting distracted by Facebook or YouTube during a <i class="fa fa-microphone-slash text-danger-color type"></i> <strong>Silent</strong> Hangout, or for tracking where everyone is at in a tutorial, or for debugging someone's issue more easily during a <i class="fa fa-user text-warning-color type"></i> <strong>Teaching</strong> or <i class="fa fa-users text-success-color type"></i> <strong>Collaboration</strong> Hangout.</li>
Expand Down
2 changes: 1 addition & 1 deletion client/templates/other/slack.html
Expand Up @@ -27,7 +27,7 @@ <h3>Quick Links</h3>
<ul>
<li><a href="http://codebuddies.slack.com" target="_blank">Slack</a> (<a href="http://codebuddiesmeet.herokuapp.com" target="_blank" >Get your invite</a>)</li>
<li><a href="https://www.facebook.com/groups/TOPSTUDYGROUP/" target="_blank">Facebook Group</a></li>
<li><a href="https://github.com/codebuddiesdotorg/codebuddies">Github</a> - <a href="http://docs.codebuddies.org" target="_blank">Documentation</a> | <a href="https://github.com/codebuddiesdotorg/codebuddies/pulls" target="_blank">Pull Requests</a>
<li><a href="https://github.com/codebuddies/codebuddies">Github</a> - <a href="http://docs.codebuddies.org" target="_blank">Documentation</a> | <a href="https://github.com/codebuddies/codebuddies/pulls" target="_blank">Pull Requests</a>
</li>
<li><a href="http://twitter.com/codebuddiesmeet" target="_blank">Twitter</a></li>
<li><a href="http://opencollective.com/codebuddies">Open Collective</a></li>
Expand Down
2 changes: 1 addition & 1 deletion client/templates/other/sponsor-us.html
Expand Up @@ -4,7 +4,7 @@
<div class="col-md-12 text-center">
<div class="col-md-6 col-md-offset-3">
<h2>Help us keep this project alive!</h2>
<p id="explain">This website is 100% community-built (<a href="https://github.com/codebuddiesdotorg/codebuddies" target="_blank"><i class="fa fa-github"></i></a>) and relies on sponsors. Our hosting costs are $30/month. By choosing to be the sponsor of a month, you will receive our unlimited gratitude and a spot in the Hall of Fame below.</p>
<p id="explain">This website is 100% community-built (<a href="https://github.com/codebuddies/codebuddies" target="_blank"><i class="fa fa-github"></i></a>) and relies on sponsors. Our hosting costs are $30/month. By choosing to be the sponsor of a month, you will receive our unlimited gratitude and a spot in the Hall of Fame below.</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/templates/other/terms-of-service.html
Expand Up @@ -30,7 +30,7 @@ <h3>Links To Other Web Sites</h3>
<p>We strongly advise you to read the terms and conditions and privacy policies of any third-party web sites or services that you visit.</p>

<h3>Adherence to our Code of Conduct</h3>
<p>As a member of the CodeBuddies community, you agree to adhere to our community <a href="https://github.com/codebuddiesdotorg/codebuddies/blob/master/CODE_OF_CONDUCT.md" target="_blank">Code of Conduct</a>.</p>
<p>As a member of the CodeBuddies community, you agree to adhere to our community <a href="https://github.com/codebuddies/codebuddies/blob/master/CODE_OF_CONDUCT.md" target="_blank">Code of Conduct</a>.</p>


<h3>Termination</h3>
Expand Down
2 changes: 1 addition & 1 deletion client/templates/profile/profile-edit/profile-edit.html
Expand Up @@ -27,7 +27,7 @@
</div>
<div class="form-group dynamic">
<label for="GitHub">GitHub</label>
<input type="text" class="form-control" name="github" placeholder="codebuddiesdotorg" value="{{profile.social.github}}">
<input type="text" class="form-control" name="github" placeholder="codebuddies" value="{{profile.social.github}}">
</div>
</div>
<div class="col-md-6" style="padding-right: 0;">
Expand Down