diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index a8e70a0b4..bb8f98535 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -26,7 +26,7 @@ If you'd like to make and test changes locally (and see how they would look if m - [Install Ruby](https://www.ruby-lang.org/en/documentation/installation/) - [ ] Run `script/setup` - [ ] Run `script/server`. - - When successful, the script will initiate a local server at `http://127.0.0.1:4000/on-demand`. + - When successful, the script will initiate a local server at `http://127.0.0.1:4000/`. ### Questions? - Leave a comment on this issue! Make sure to use @ mentions if you want a specific person's attention! diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5361d0f15..cb2cb5303 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,29 +2,6 @@ :tada: Thank you for taking the time to contribute and for seeking out these instructions. We :heart: community contributions to these materials. -### Table of Contents - -[Code of Conduct](#code-of-conduct) - -[I just want to see the published resources!](https://services.github.com/on-demand/) - -[What should I know before I contribute?](#what-should-i-know-before-i-contribute?) -- [The goal of these resources](#the-goal-of-these-resources) -- [Types of contributions we love](#types-of-contributions-we-love) - -[How to contribute](#how-to-contribute) -- [Report a bug](#report-a-bug) -- [Translate existing resources](#translate-existing-resources) -- [Contribute a new resource or course](#contribute-something-new) -- [Not sure where to start?](#not-sure-where-to-start?) - -[Step-by-step contribution guide](#step-by-step-contribution-guide) -- [Our content philosophy](#our-content-philosophy) -- [Content structure](#content-structure) -- [Writing new content](#writing-new-content) -- [Styling content](#styling-content) -- [Building and testing](#building-and-testing) -
## Code of Conduct @@ -37,10 +14,9 @@ This project and everyone who participates in it is governed by the [Contributor ### The goal of these resources -These materials are designed to help those new to Git, GitHub and software development as a whole. By using these resources, we hope users will: +These materials are designed to help those new to Git, GitHub and software development as a whole. By using these cheatsheets, we hope users will: - Feel welcome and become active contributors in the open source community -- Complete hands-on activities and receive immediate support from [Teacherbot](https://github.com/teacher-bot/teacherbot), members of the community, and [GitHub's Training team](community.md/#github-trainers) - Learn best practices for using Git, GitHub and other GitHub supported projects such as Electron, Atom, etc - Learn how to use the applications within GitHub's ecosystem to build better software @@ -48,8 +24,8 @@ These materials are designed to help those new to Git, GitHub and software devel We're always looking for contributions to help improve these resources. This includes: -- Improving the existing classes and resources -- Translations of existing resources such as the [cheatsheets](/downloads/) into new languages +- Improving the existing cheatsheets +- Translations of existing cheatsheets into new languages - Adding new classes or resources aligned with the [goals](#the-goal-of-these-resources)
@@ -58,13 +34,13 @@ We're always looking for contributions to help improve these resources. This inc ### Report a bug -Oops, thanks for finding that! If you know how to fix it, please feel free to fork the repository and submit a change via Pull Request (Not sure how to do that? [We have a course for you](https://services.github.com/on-demand/)). +Oops, thanks for finding that! If you know how to fix it, please feel free to fork the repository and submit a change via Pull Request. If you aren't sure how to fix it or just don't have time, we invite you to open a [new Issue](https://github.com/github/training-kit/issues/new). Please be sure to provide information so we can recreate the error. ### Translate existing resources -Several community members have been kind enough to translate the [Git Cheat Sheets](https://github.com/github/training-kit/tree/master/downloads) into various languages. At this time, we are only set up to serve the cheat sheets in various languages (but maybe you can help us change that :wink:) If you are planning to contribute a translation, please do the following: +Several community members have been kind enough to translate the Git Cheat Sheets into various languages. At this time, we are only set up to serve the cheat sheets in various languages (but maybe you can help us change that :wink:) If you are planning to contribute a translation, please do the following: - Fork this repository - Create a new folder in the [downloads directory](https://github.com/github/training-kit/tree/master/downloads) using the standard abbreviation for the language you are providing. @@ -89,48 +65,6 @@ If you just want to help out, but don't have a particular change in mind, check
-## Step-by-step contribution guide - -### Our content philosophy - -We are eager to create materials that are easy to use and follow! To that end, here are a few guidelines we ask you to keep in mind: - -- We focus on providing friendly and clear, step-by-step instructions. -- Courses should include a project repository that allows each students to complete an activity. -- We focus on minimalism in our instructions, giving the learner the opportunity to study the concept in greater detail with the Tell Me Why feature. -- We appeal to multiple learning styles. Some learners like to read, some like to watch videos, and others just want a recipe. - -### Content structure - -This repository contains two major collections: [on-demand training courses](https://services.github.com/on-demand/) and listings of [our favorite resources](/resources). We help users navigate these collections sequentially with the [learning path](/resources/learning-path). - -#### On-demand course structure - -Adding an on-demand course requires you to do the following: - -- Add a folder in the [paths directory](/paths) based on the course name -- Add the course pages in the new folder you created. For an example of a sequential course, check out the [Introduction to GitHub course](/paths/intro-to-github). For a non-sequential course, check out [Git Out of Trouble](/paths/git-trouble) -- Add the course to the `main` navigation in [_data/navigation.yml](_data/navigation.yml) and add your course navigation in a new section at the end of the files - -### Writing new content - -If you are contributing content, stay consistent with the existing courses by following these guidelines. - -- Vocabulary is italicized to help learners identify their importance and help with cognition. - - Example: A *query* is a request for specific information. -- Button names are bolded to indicate they should be clicked. - - Example: Accept the filler text and click **Commit Changes**. -- Names of repositories, files, branches, variables, or user handles are wrapped in \`backticks\`. - - Example: Initialize the repository with a `README.md` file. -- Code that the learner should type, copy, or execute should be in a fenced code block: - - Example: To see the version of your Git installation, type: - - git --version -- Use given names for complicated concepts, and then explain them. After you've explained them once, use only the given name. - - Example: Any Electron app has 2 types of processes: the *main process*, initialized by `package.json`, and a *renderer process* generated by each web page [...] Running `src/index.js` runs the app's main process. -- Use relevant descriptions of your links, and avoid "click here". - - Example: On GitHub.com, [create a new repository](https://github.com/new). - ### Styling content This site uses GitHub's CSS toolkit called [Primer](https://github.com/primer/primer-css). It's easy to use, and if your contribution requires some design or front-end work you should check out the [Primer Docs](http://primercss.io/). @@ -144,6 +78,5 @@ To build of the materials do the following: 1. Run `script/setup` 1. Run `sass --watch assets/_scss/main.scss:assets/css/main.css` to compile the SCSS 1. Run `script/server` - - When successful, the script will initiate a local server at `http://127.0.0.1:4000/on-demand`. - - The `/on-demand/` directory is a result of the [`baseurl` variable](https://byparker.com/blog/2014/clearing-up-confusion-around-baseurl/) provided by Jekyll. If you'd like to serve your site under a different directory, change it in [`_config.yml`](https://github.com/github/training-kit/blob/contrib-guide/_config.yml). + - When successful, the script will initiate a local server at `http://127.0.0.1:4000/`. 1. Simply paste that into your favorite web-browser and you will be ready to test diff --git a/Gemfile b/Gemfile index 66dc6b85d..90b7e1d5b 100644 --- a/Gemfile +++ b/Gemfile @@ -3,4 +3,5 @@ source "https://rubygems.org" gem 'github-pages' gem 'html-proofer' gem 'rack-contrib', '~> 1.1.0' -gem 'rake' \ No newline at end of file +gem 'rake' +gem 'jekyll-octicons' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 54b3c32b0..ddd8d6f57 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -134,6 +134,9 @@ GEM jekyll-mentions (1.4.1) html-pipeline (~> 2.3) jekyll (~> 3.0) + jekyll-octicons (8.5.0) + jekyll (~> 3.1) + octicons (= 8.5.0) jekyll-optional-front-matter (0.3.0) jekyll (~> 3.0) jekyll-paginate (1.1.0) @@ -217,6 +220,8 @@ GEM multipart-post (2.0.0) nokogiri (1.10.1) mini_portile2 (~> 2.4.0) + octicons (8.5.0) + nokogiri (>= 1.6.3.1) octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) parallel (1.14.0) @@ -260,6 +265,7 @@ PLATFORMS DEPENDENCIES github-pages html-proofer + jekyll-octicons rack-contrib (~> 1.1.0) rake diff --git a/README.md b/README.md index 1a9e37c43..0ed753184 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,19 @@ -![servicesbanner](https://cloud.githubusercontent.com/assets/13326548/21035994/ad40c19c-bd77-11e6-97fa-78b068050c05.jpg) - [![Build Status](https://travis-ci.org/github/training-kit.svg?branch=master)](https://travis-ci.org/github/training-kit) -# GitHub Training Kit -### Home of GitHub's On-Demand training - -This repository contains the completely open source on-demand training hosted at https://services.github.com/on-demand/. These materials are provided under a [_Creative Commons License_ license](https://github.com/github/training-kit/blob/master/LICENSE). +# GitHub Training Kit: Cheatsheets ## We :heart: Contributors Like You! **We’re eager to work with you**, our user community to improve these materials and develop new ones. Please check out our [CONTRIBUTING guide](https://github.com/github/training-kit/blob/master/CONTRIBUTING.md) for more information on getting started. +## Looking for a resource that was once housed in training-kit? + +This repository currently contains the Git and GitHub Cheatsheets. If you're looking for a project that used to be housed here, such as On-Demand training, reading lists, videos, and book recommendations, see [this commit](https://github.com/github/training-kit/tree/4fbf180e980ef973ba4cc4b8ef3d5f278ddc8c08) in the repository's history. + ## Projects Used in Training-Kit - We use [Jekyll](https://jekyllrb.com/) and [Markdown](https://guides.github.com/features/mastering-markdown/). - Our content is styled using the [Primer CSS toolkit](https://github.com/primer/primer-css). -- The corner badge of an Octocat is from [tholman.com](http://tholman.com/github-corners/) ## Packaging for Viewing Behind Your Firewall @@ -32,7 +30,7 @@ If you'd like to have a copy of the files to be served from a web server inside Site content is licensed under [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/). CC-BY-4.0 gives you permission to use content for almost any purpose but does not grant you any trademark permissions, so long as you note the license and give credit, such as follows: > Content based on -> services.github.com/on-demand/ +> github.github.com/training-kit/ > used under the > CC-BY-4.0 > license. diff --git a/_config.yml b/_config.yml index 01fa88154..a267fd6df 100644 --- a/_config.yml +++ b/_config.yml @@ -7,12 +7,12 @@ email: services@github.com # Site Settings locale : "en-US" # Keep original, do not replace -title : "On Demand Training" +title : "GitHub Cheatsheets" title_separator : "-" name : "GitHub, Inc." -description : "You're in control. We're with you along the way." -baseurl : "/on-demand" # the subpath of your site, e.g. "/blog" -gh_repo : +description : +baseurl : # the subpath of your site, e.g. "/blog" +gh_repo : github/training-kit teaser : # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png" breadcrumbs : true # true, false (default) words_per_minute : 200 @@ -56,6 +56,7 @@ plugins: - jekyll-feed - jemoji - jekyll-redirect-from + - jekyll-octicons exclude: - bin @@ -94,4 +95,4 @@ defaults: values: lang: "en" redirect_to: - - https://lab.github.com + - https://lab.github.com \ No newline at end of file diff --git a/_data/navigation.yml b/_data/navigation.yml deleted file mode 100644 index 3306f573f..000000000 --- a/_data/navigation.yml +++ /dev/null @@ -1,341 +0,0 @@ -banner: - en: - title: On Demand Training - url: / - es: - title: Aprende a tu ritmo - url: /es/ - -main: - en: - - title: Resources - url: /resources/ - - title: Learning Path - url: /resources/learning-path/ - - title: Upcoming Events - abs: https://services.github.com/#upcoming-events - - title: Customized Training - abs: https://services.github.com/customized-training - - es: - - title: Resources - url: /resources/ - - title: Itinerario de aprendizaje - url: /resources/learning-path/es/ - - title: Upcoming Events - abs: https://services.github.com/#upcoming-events - - title: Customized Training - abs: https://services.github.com/customized-training - -# When creating new sidebar navs, remember the url in this document needs to match the url assigned in the permalink field. - -intro-nav: - - title: "Introduction to GitHub" - url: /intro-to-github/ - - title: "Create a GitHub Account" - url: /intro-to-github/create-github-account - - title: "Join the Class Repository" - url: /intro-to-github/join-class-repository - - title: "Explore the GitHub Repository" - url: /intro-to-github/explore-github-repository - - title: "Use GitHub Flow" - url: /intro-to-github/use-github-flow - - title: "Create a Branch" - url: /intro-to-github/create-a-branch - - title: "Find Your Coordinates" - url: /intro-to-github/find-your-coordinates - - title: "Work on GitHub" - url: /intro-to-github/work-on-github - - title: "Create a Pull Request" - url: /intro-to-github/create-pull-request - - title: "Collaborate on GitHub" - url: /intro-to-github/collaborate-on-github - - title: "Edit Files on GitHub" - url: /intro-to-github/edit-files-on-github - - title: "Merge Your Pull Request" - url: /intro-to-github/merge-pull-request - - title: "You Completed the GitHub Flow" - url: /intro-to-github/you-completed-github-flow - - -intro-nav-es: - - title: "Introducción a GitHub" - url: /intro-to-github/es/ - - title: "Crear cuenta GitHub" - url: /intro-to-github/es/crear-cuenta-github - - title: "Únete al repositorio de la clase" - url: /intro-to-github/es/unete-repo-clase - - title: "Explora el repositorio GitHub" - url: /intro-to-github/es/explora-repositorio - - title: "Utiliza el flujo de trabajo GitHub" - url: /intro-to-github/es/flujo-github - - title: "Creando una rama o branch" - url: /intro-to-github/es/creando-rama-branch - - title: "Busca tus coordenadas" - url: /intro-to-github/es/buscar-coordenadas - - title: "Trabajar en GitHub" - url: /intro-to-github/es/trabajar-en-github - - title: "Crear un Pull Request" - url: /intro-to-github/es/crear-pull-request - - title: "Colaborar en GitHub" - url: /intro-to-github/es/colaborar-en-github - - title: "Editar archivos en GitHub" - url: /intro-to-github/es/editar-en-github - - title: "Hacer Merge de tu Pull Request" - url: /intro-to-github/es/merge-pull-requests - - title: "Has completado el Flujo GitHub" - url: /intro-to-github/es/celebrar - -github-desktop-nav: - - title: "GitHub Pages & GitHub Desktop" - url: /github-desktop/ - - title: "Install GitHub Desktop" - url: /github-desktop/install-github-desktop - - title: "Create the Remote Repository on GitHub" - url: /github-desktop/create-remote-repository - - title: "Choose a GitHub Pages Theme" - url: /github-desktop/choose-github-pages-theme - - title: "Clone the Repository with GitHub Desktop" - url: /github-desktop/clone-repository-github-desktop - - title: "Create Local Branches With GitHub Desktop" - url: /github-desktop/create-branches-github-desktop - - title: "Make Local Changes With GitHub Desktop" - url: /github-desktop/make-changes-github-desktop - - title: "Add Local Commits With GitHub Desktop" - url: /github-desktop/add-commits-github-desktop - - title: "Open a Pull Request With GitHub Desktop" - url: /github-desktop/pull-request-github-desktop - - title: "Merge Your Pull Request on GitHub" - url: /github-desktop/merge-pull-request-github - - title: "View Your GitHub Pages Site" - url: /github-desktop/view-github-pages-site - - title: "Push to GitHub with GitHub Desktop" - url: /github-desktop/push-with-github-desktop - - title: "Add Your GitHub Pages Site to the Showcase" - url: /github-desktop/add-github-pages-site-showcase - - title: "Review the Local GitHub Flow" - url: /github-desktop/review-github-flow - - title: "Push to GitHub & Create a Pull Request" - url: /github-desktop/push-pull-request-github-desktop - - title: "Collaborate With GitHub Pull Requests" - url: /github-desktop/collaborate-github-pull-requests - - title: "Merge Your Pull Request on GitHub" - url: /github-desktop/merge-pull-request-showcase - -github-desktop-nav-es: - - title: "GitHub Pages y GitHub Desktop" - url: /github-desktop/es/ - - title: "Instalar GitHub Desktop" - url: /github-desktop/es/instalar-github-desktop - - title: "Crear el repositorio remoto en GitHub" - url: /github-desktop/es/crear-repo-remoto - - title: "Elegir un tema de GitHub Pages" - url: /github-desktop/es/elegir-tema-github-pages - - title: "Clonar el repositorio con GitHub Desktop" - url: /github-desktop/es/clonar-repositorio-github-desktop - - title: "Crear branches en local con GitHub Desktop" - url: /github-desktop/es/crear-branches-github-desktop - - title: "Hacer cambios en local con GitHub Desktop" - url: /github-desktop/es/hacer-cambios-github-desktop - - title: "Añadir commits locales con GitHub Desktop" - url: /github-desktop/es/nuevos-commits-github-desktop - - title: "Abrir un Pull Request con GitHub Desktop" - url: /github-desktop/es/pull-request-github-desktop - - title: "Hacer merge de tu Pull Request en GitHub" - url: /github-desktop/es/merge-pull-request-github - - title: "Ver tu sitio hecho con GitHub Pages" - url: /github-desktop/es/ver-sitio-github-pages - - title: "Hacer Push a GitHub con GitHub Desktop" - url: /github-desktop/es/push-con-github-desktop - - title: "Añadir tu sitio hecho con GitHub Pages al Escaparate" - url: /github-desktop/es/añadir-github-pages-escaparate - - title: "Revisar el Flujo GitHub local" - url: /github-desktop/es/revisar-github-flow - - title: "Push a GitHub y crear un Pull Request" - url: /github-desktop/es/push-pull-request-github-desktop - - title: "Colaborar con Pull Requests en GitHub" - url: /github-desktop/es/colaborar-github-pull-requests - - title: "Hacer merge de tu Pull Request en GitHub" - url: /github-desktop/es/merge-pull-request-showcase - -github-cli: - - title: "GitHub Pages & Git in the Command Line" - url: /github-cli/ - - title: "Git Configuration" - url: /github-cli/git-configuration - - title: "Create the Remote Repository on GitHub" - url: /github-cli/create-remote-repository - - title: "Choose a GitHub Pages Theme" - url: /github-cli/choose-github-pages-theme - - title: "Clone the Repository Using the Command Line" - url: /github-cli/clone-repo-cli - - title: "Create Local Branches With Git" - url: /github-cli/create-branches-git - - title: "Make Local Changes With Git" - url: /github-cli/make-local-changes-git - - title: "Add Local Commits With Git" - url: /github-cli/add-commits-git - - title: "Open a Pull Request on GitHub" - url: /github-cli/open-pull-request-github - - title: "Merge Your Pull Request on GitHub" - url: /github-cli/merge-pull-request-github - - title: "View Your GitHub Pages Site" - url: /github-cli/view-github-pages-site - - title: "Git Push & Git Pull" - url: /github-cli/git-push-git-pull - - title: "Add Your GitHub Pages Site to the Showcase" - url: /github-cli/add-github-pages-site-showcase - - title: "Review the Local GitHub Flow in the Command Line" - url: /github-cli/github-flow-cli - - title: "Review Pushing and Opening Pull Requests" - url: /github-cli/git-push-open-pull-request - - title: "Collaborate With GitHub Pull Requests" - url: /github-cli/collaborate-github-pull-requests - - title: "Merge Your Pull Request on GitHub" - url: /github-cli/merge-pull-request-github-showcase - -advanced: - - title: "Welcome to Git Out Of Trouble" - url: /git-trouble/ - - title: "Set Up Your Git Scenario Environment" - url: /git-trouble/git-set-up - - title: "Git Trouble Scenarios" - url: /git-trouble/git-scenarios - children: - - title: "Too Many (small) Git Commits" - url: /git-trouble/too-many-commits - - title: "Git Commit Message Sucks" - url: /git-trouble/git-commit-message - - title: "Git Committed to Wrong Branch" - url: /git-trouble/git-commit-wrong-branch - - title: "Accidental Git Commit" - url: /git-trouble/accidental-git-commit - - title: "Just Make it Go Away - Breaking Things With Git" - url: /git-trouble/breaking-things-with-git - -windows: - - title: "Welcome to GitHub for Windows Users" - url: /windows/ - - title: "Get Started" - url: /windows/getting-started - children: - - title: "Install Git" - url: /windows/installing-git - - title: "Configure Git" - url: /windows/configure-git - - title: "Configure Line Endings" - url: /windows/git-crlf - - title: "Store Your Password" - url: /windows/git-credentials - - title: "Editors" - url: /windows/editors - children: - - title: "vi Basics" - url: /windows/vi-basics - - title: "Configure Other Editors" - url: /windows/configure-editors - - title: "Visual Studio Integration" - url: /windows/visual-studio - children: - - title: "Install the GitHub Extension" - url: /windows/install-visual-studio - - title: "Start a Project" - url: /windows/vs-start-project - - title: "Make a Commit" - url: /windows/vs-make-commit - - title: "Sharing and Receiving Changes" - url: /windows/vs-push-changes - - title: "What is Sync?" - url: /windows/vs-sync - - title: "Congratulations" - url: /windows/congrats - - -github-graphql: - - title: "Introduction to GraphQL" - url: /graphql/ - - title: "Use GraphQL for the First Time" - url: /graphql/first-use - - title: "Build a Query" - url: /graphql/first-query - - title: "Grab a Query's Response" - url: /graphql/query-info - - title: "Use a Query to Find Specific Information" - url: /graphql/another-query - - title: "Create a Mutation" - url: /graphql/mutation - - -create-an-app-in-electron: - - title: "Get Started with Electron" - url: /electron/create-an-app/ - - title: "Create your app" - url: /electron/create-an-app/create-your-app/ - - title: "Push your project to GitHub" - url: /electron/create-an-app/push-your-project-to-github/ - - title: "Create your App's Files" - url: /electron/create-an-app/create-your-apps-files/ - - title: "Run Your First Electron App" - url: /electron/create-an-app/run-your-first-electron-app/ - - title: "Add your index.html" - url: /electron/create-an-app/add-your-index-html/ - - title: "Add CSS" - url: /electron/create-an-app/add-css/ - - title: "Add JavaScript" - url: /electron/create-an-app/add-javascript/ - - title: "Celebrate" - url: /electron/create-an-app/celebrate/ - - -electron-package-your-app: - - title: "Package Your App for Downloads" - url: /electron/package-your-app/ - - title: "Use electron-packager" - url: /electron/package-your-app/use-electron-packager/ - - title: "Add an icon" - url: /electron/package-your-app/add-an-icon/ - - title: "Test Your App" - url: /electron/package-your-app/test-your-app/ - - title: "Celebrate" - url: /electron/package-your-app/celebrate/ - - - -electron-share-your-app: - - title: "Share Your App" - url: /electron/share-your-app/ - - title: "List on App Stores" - url: /electron/share-your-app/list-on-app-stores/ - - title: "Share on Websites" - url: /electron/share-your-app/share-on-websites/ - - title: "Celebrate" - url: /electron/share-your-app/celebrate/ - -merge-conflicts: - - title: "Managing Merge Conflicts" - url: /merge-conflicts/ - - title: "Set Up the Repository" - url: /merge-conflicts/setup/ - - title: "A Normal Merge" - url: /merge-conflicts/normal-merge/ - - title: "Merge Conflict Description" - url: /merge-conflicts/mc-description/ - - title: "Your First Conflict" - url: /merge-conflicts/first-conflict/ - - title: "Skatetocat's Simple Conflict" - url: /merge-conflicts/example-01/ - - title: "Shoptocat and Supportcat Help" - url: /merge-conflicts/example-02/ - - title: "Momtocat and Poptocat Lend a Hand" - url: /merge-conflicts/example-03/ - - title: "What Next?" - url: /merge-conflicts/what-next/ - - title: "Using GUIs to Handle Merge Conflicts" - url: /merge-conflicts/ide-intro/ - children: - - title: "Atom" - url: /merge-conflicts/ide-atom/ - - title: "Visual Studio Code" - url: /merge-conflicts/ide-vs-code/ - - title: "GitHub Extension for Visual Studio" - url: /merge-conflicts/ide-vs-ext/ diff --git a/_data/ui-text.yml b/_data/ui-text.yml deleted file mode 100644 index 6958a46ce..000000000 --- a/_data/ui-text.yml +++ /dev/null @@ -1,88 +0,0 @@ -# User interface text and labels - -# English (default) -# ----------------- -en: &DEFAULT_EN - name : "English" - page : "Page" - pagination_previous : "Previous" - pagination_next : "Next" - breadcrumb_home_label : "Home" - breadcrumb_separator : "/" - toc_label : "On This Page" - ext_link_label : "Direct Link" - less_than : "less than" - minute_read : "minute read" - minutes_read : "minutes read" - share_on_label : "Share on" - meta_label : - tags_label : "Tags:" - categories_label : "Categories:" - date_label : "Updated:" - comments_label : "Leave a Comment" - more_label : "Learn More" - related_label : "You May Also Enjoy" - follow_label : "Follow:" - feed_label : "Feed" - powered_by : "Powered by" - website_label : "Website" - email_label : "Email" - recent_posts : "Recent Posts" - didnt-push : "I didn't push" - pushed : "I pushed" - refresh : "I need a refresher" - show-me-how : "Show me how" - troubleshooting : "Help me troubleshoot" - tell-me-why : "Tell me why" - get-help : "Get Help" - stuck : "Stuck? Open an issue in the repository for this class and mention @githubteacher for help from one of the GitHub trainers!" - continue : "Continue" -en-US: - <<: *DEFAULT_EN -en-UK: - <<: *DEFAULT_EN - -# Spanish -# -------------- -es: &DEFAULT_ES - name : "Español" - page : "Página" - pagination_previous : "Anterior" - pagination_next : "Siguiente" - breadcrumb_home_label : "Inicio" - breadcrumb_separator : "/" - toc_label : "Contenidos" - ext_link_label : "Enlace" - less_than : "menos de" - minute_read : "minuto de lectura" - minutes_read : "minutos de lectura" - share_on_label : "Compartir" - meta_label : - tags_label : "Etiquetas:" - categories_label : "Categorías:" - date_label : "Actualizado:" - comments_label : "Comentar" - more_label : "Ver más" - related_label : "Podrías ver también" - follow_label : "Seguir:" - feed_label : "Feed" - powered_by : "Powered by" - website_label : "Sitio web" - email_label : "Email" - recent_posts : "Entradas recientes" - didnt-push : "No hice push" - pushed : "Hice push" - refresh : "Necesito un recordatorio" - show-me-how : "Enséñame cómo" - troubleshooting : "Ayúdame a resolver" - tell-me-why : "Dime por qué" - get-help : "Pide Ayuda" - stuck : "¿Atascado? Abre un tema (issue) en el repositorio para esta clase y menciona a @githubteacher para obtener ayuda de uno de los instructores de GitHub." - continue : "Continuar" -es-ES: - <<: *DEFAULT_ES -es-CO: - <<: *DEFAULT_ES - -# Another locale -# -------------- diff --git a/_includes/activity/gh-pages/02-create-profile.md b/_includes/activity/gh-pages/02-create-profile.md deleted file mode 100644 index 54fcffb94..000000000 --- a/_includes/activity/gh-pages/02-create-profile.md +++ /dev/null @@ -1,34 +0,0 @@ -{% capture activity-text %} -# Activity: Create a Profile Page - -Follow the steps below to update your public profile page! - -Don't worry if you don't want to put your actual information up online. It's OK to just make stuff up. But if you do want to create an actual portfolio, we'd recommend doing that here! - -1. On your personal repo, create a new branch named `profile-info` -2. Edit the `content.md` file located in the `/_index/` folder. - - Add a new image - - Add your name - - Add a title - - Add bio information -3. Commit the changes you made to the `content.md` file. -4. Edit the `_config.yml` file by changing the following: - - title - - email - - twitter - - github - - description fields -5. Change the `baseurl:` to the **name of your GitHub repo**. -6. Change the `url:` to `http://username.github.io`, where `username` is your GitHub username. -7. Create a Pull Request comparing the `profile-info` branch to the base branch `gh-pages`. -8. Merge the Pull Request. -9. Look at your creation at `http://username.github.io/repo-name`. - -{% endcapture %} - -
- {{ activity-text | markdownify }} -
- -Need help? **Open an issue** [in our class repository](https://github.com/githubschool/on-demand-github-pages/issues/new) for answers from GitHub trainers! -{: .notice--success} diff --git a/_includes/activity/gh-pages/03-create-new-page.md b/_includes/activity/gh-pages/03-create-new-page.md deleted file mode 100644 index 604a79982..000000000 --- a/_includes/activity/gh-pages/03-create-new-page.md +++ /dev/null @@ -1,19 +0,0 @@ -{% capture activity-text %} -# Activity: Create a New Page - -Time to add our work history as a page to our Jekyll site. - -1. Create a new branch off the ```gh-pages``` branch named ```work-history```. -2. In the ```_pages``` folder, create a **new** file named ```work-history.md```. -3. Add your work history to the file and click ```Commit```. If you'd like, you can copy and paste the work history we provided earlier in the course. -4. Create a **pull request** selecting ```gh-pages``` as the **base** and ```work-history``` as the **compare**. -5. Merge the **pull request**. -6. Navigate to your website to see the changes you just made. -{% endcapture %} - -
- {{ activity-text | markdownify }} -
- -Need help? **Open an issue** [in our class repository](https://github.com/githubschool/on-demand-github-pages/issues/new) for answers from GitHub trainers! -{: .notice--success} diff --git a/_includes/activity/gh-pages/04-more-content.md b/_includes/activity/gh-pages/04-more-content.md deleted file mode 100644 index 2ccf4be04..000000000 --- a/_includes/activity/gh-pages/04-more-content.md +++ /dev/null @@ -1,28 +0,0 @@ -{% capture activity-text %} -# Activity: Additional Challenges - -Below are some projects that you can take on that will challenge your templating skills. We're leaving them more open-ended instead of giving you step-by-step instructions, so feel free to ask a mentor if you need help. - -### Add Nav Links - -"Edit your project so that you can have pages which have a `title:` element but which don't show up in the nav bar. You'll need to come up with a system (a mentor can help) and edit the `_includes/header.html` page, as well as the front matter in all of your site pages." - -### Work History with Style - -Earlier you created a Work History page. This isn't very well formatted though. Try using CSS and templates to clean up the page. If you create a Work History template you can wrap the content in a new div, and then format the elements using CSS so that formatting only applies to that page. - -### Collections - -You might also look into the "collections" functionality in Jekyll. This would let you create a different markdown file (and front matter data) for each job description. How might this make formatting the page easier? - - - - -{% endcapture %} - -
- {{ activity-text | markdownify }} -
- -Need help? **Open an issue** [in our class repository](https://github.com/githubschool/on-demand-github-pages/issues/new) for answers from GitHub trainers! -{: .notice--success} diff --git a/_includes/activity/github-CLI/clisurvey.md b/_includes/activity/github-CLI/clisurvey.md deleted file mode 100644 index 152a301d7..000000000 --- a/_includes/activity/github-CLI/clisurvey.md +++ /dev/null @@ -1,2 +0,0 @@ -## We Love Feedback :heart: - Please take _literally less than a minute_ to let us know what you think of this course. You may also choose to opt-in for updates on future classes. [Start Survey](http://www.surveygizmo.com/s3/3288550/cli)! diff --git a/_includes/activity/github-CLI/git-diff.md b/_includes/activity/github-CLI/git-diff.md deleted file mode 100644 index d3aa6b3fc..000000000 --- a/_includes/activity/github-CLI/git-diff.md +++ /dev/null @@ -1,7 +0,0 @@ -# Git Diff - -1. Type `git diff`. Let's start with `git diff` without any options. This command compares the changes you have made in the working directory with the staged version of the file. -1. Type `git diff --staged`. When you add the `--staged` option, `git diff` will compare the staged version with the most recent committed version of the file. -1. Type `git diff HEAD`. When you add `HEAD` after the `git diff` command, git combines the changes in your working and staging areas and compares them with the version of the file that is currently designated as the `HEAD`. In most cases, this is the most recent commit in the history of the file. -1. Type `git diff --color-words`. The default for `git diff` is to compare lines of change, but sometimes this is not helpful when we have only made a small change. We can add the option `--color-words` to get a word-by-word comparison instead of the line level comparison. -1. When you are finished, `commit` your file changes. diff --git a/_includes/activity/github-CLI/git-log.md b/_includes/activity/github-CLI/git-log.md deleted file mode 100644 index cecddc1db..000000000 --- a/_includes/activity/github-CLI/git-log.md +++ /dev/null @@ -1,11 +0,0 @@ -To see the history of commits, use the command `git log`. It provides a list of all of the commits made on our branch with the most recent commit first. You aren't stuck with the default behavior - try these log commands to view history in different ways. - -1. Type `git log`. -1. Press `q`. You can press the up or down arrows or press enter to view additional log entries. Type q to quit viewing the log and return to the command prompt. -1. Type `git log -5` to only see the last 5 commits. -1. Type `git log --oneline`. -1. Type `git log --oneline --graph`. -1. Type `git log --oneline --graph --decorate`. -1. Type `git log --oneline --graph --decorate --all`. -1. Type `git log --stat`. -1. Type `git log --patch`. diff --git a/_includes/activity/github-desktop-es/01-crear-repositorio.md b/_includes/activity/github-desktop-es/01-crear-repositorio.md deleted file mode 100644 index f80cbe96b..000000000 --- a/_includes/activity/github-desktop-es/01-crear-repositorio.md +++ /dev/null @@ -1,18 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -Ahora que tienes instalado localmente todo lo que necesitas para trabajar con Git y GitHub, vamos a crear el repositorio que alojará tu nuevo sitio web. - -![gif of following the directions below]({{ site.baseurl }}/images/gifs/github-desktop/create-repo.gif) - -1. En GitHub.com, [crea un nuevo repositorio](https://github.com/new). -1. Nombra tu repositorio `TU-USUARIO.GITHUB.IO` - - > El nombre de tu repositorio será parte del enlace a tu sitio web. Si utilizas la convención para el nombre descrita, tu sitio web se servirá en esa URL. - -1. Introduce una descripción para tu repositorio. -1. Escoge visibilidad **Public**. - - > Recomendamos que crees un repositorio público. Los repositorios públicos son gratis. Incluso si seleccionas un repositorio privado, tu sitio web publicado será público. - -1. Selecciona **Initialize this repository with a README**. -1. Haz clic en **Create repository**. diff --git a/_includes/activity/github-desktop-es/07-merge-pull-request.md b/_includes/activity/github-desktop-es/07-merge-pull-request.md deleted file mode 100644 index 3a52f7cfd..000000000 --- a/_includes/activity/github-desktop-es/07-merge-pull-request.md +++ /dev/null @@ -1,8 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -Dado que este repositorio es tuyo, probablemente no tienes a nadie con quien colaborar (todavía). Adelante, haz merge de tu Pull Request ahora. - -![gif of following the directions below]({{ site.baseurl }}/images/gifs/github-desktop/merge-pr.gif) - -1. En GitHub.com, navega hasta el Pull Request que acabas de abrir. -2. Haz scroll hasta abajo y haz clic en el gran botón verde que dice **Merge Pull Request**. diff --git a/_includes/activity/github-desktop-es/12-anadir-repo-clase.md b/_includes/activity/github-desktop-es/12-anadir-repo-clase.md deleted file mode 100644 index 675c98092..000000000 --- a/_includes/activity/github-desktop-es/12-anadir-repo-clase.md +++ /dev/null @@ -1,5 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -1. Visita el [repositorio de la clase](https://github.com/githubschool/on-demand-github-pages/). -1. Haz clic en la pestaña **Issues**. -1. Solicita acceso para push mediante la [creación de un Issue](https://github.com/githubschool/on-demand-github-pages/issues/). diff --git a/_includes/activity/github-desktop-es/15-colaborar-prs.md b/_includes/activity/github-desktop-es/15-colaborar-prs.md deleted file mode 100644 index 50a010ae2..000000000 --- a/_includes/activity/github-desktop-es/15-colaborar-prs.md +++ /dev/null @@ -1,7 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -Ahora es momento de que colabores con otros estudiantes que están siguiendo esta clase alrededor de todo el mundo :earth_americas:. - -1. En el [repositorio de la clase en GitHub.com](https://github.com/githubschool/on-demand-github-pages/), navega a la [pestaña Pull Requests](https://github.com/githubschool/on-demand-github-pages/pulls). -2. Echa un vistazo a los otros pull requests. ¿Parecen buenos cambios, con los tests de CI aprobados? ¡Siéntete libre de enviar un mensaje de ánimo! -3. En tu pull request, espera a ver si el branch pasa los tests de Travis CI y está listo para hacer merge. diff --git a/_includes/activity/github-desktop-es/16-merge-pr.md b/_includes/activity/github-desktop-es/16-merge-pr.md deleted file mode 100644 index caf116bc8..000000000 --- a/_includes/activity/github-desktop-es/16-merge-pr.md +++ /dev/null @@ -1,19 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -Ahora que tus tests han pasado, hagamos clic en el gran botón verde para añadir tu sitio a nuestro directorio. - -![gif of following the directions below]({{ site.baseurl }}/images/gifs/github-desktop/merge.gif) - -1. En GitHub.com, comprueba que los tests están pasando. -2. Haz clic en **Merge**. -3. Haz clic en **Confirm Merge**. -4. Elimina el branch. - - -## :tada: ¡Enhorabuena! - -Una vez que hayas hecho merge de tu pull request, ¡has completado el flujo de trabajo GitHub! Actualiza esta página para ver tu incorporación a nuestro gráfico de contribuciones. - -
-
-
diff --git a/_includes/activity/github-desktop-es/desktopsurvey.md b/_includes/activity/github-desktop-es/desktopsurvey.md deleted file mode 100644 index 2c3395535..000000000 --- a/_includes/activity/github-desktop-es/desktopsurvey.md +++ /dev/null @@ -1,2 +0,0 @@ -## Nos encanta el feedback :heart: - Por favor tómate _literalmente menos de un minuto_ para hacernos saber qué te ha parecido este curso. También puedes optar por apuntarte para recibir actualizaciones sobre clases futuras. [Empezar encuesta](http://www.surveygizmo.com/s3/3288550/desktop)! diff --git a/_includes/activity/github-desktop-es/elegir-tema.md b/_includes/activity/github-desktop-es/elegir-tema.md deleted file mode 100644 index 7fbc78b21..000000000 --- a/_includes/activity/github-desktop-es/elegir-tema.md +++ /dev/null @@ -1,15 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -Este curso utilizará GitHub Pages para crear tu sitio web. Para inicializar GitHub Pages necesitamos seguir algunos pasos más: - -![gif of following the directions below]({{ site.baseurl }}/images/gifs/github-desktop/choose-a-theme.gif) - -1. En tu recientemente creado repositorio, haz clic en la pestaña **Settings**. -1. Navega hasta la sección GitHub Pages. -1. Haz clic en **Choose a theme**. -1. Decide qué tema te gustaría usar, y haz clic en **Select theme**. - - > Si no te gustan los temas disponibles, más adelante en el curso veremos cómo puedes crear un sitio web sin usar un tema de GitHub Pages. - -1. Acepta el texto de relleno navegando hasta la parte inferior de la página y haz clic en **Commit Changes**. -1. Tu sitio está publicado en: `USUARIO.github.io/NOMBREREPO`. diff --git a/_includes/activity/github-desktop/01-create-repository.md b/_includes/activity/github-desktop/01-create-repository.md deleted file mode 100644 index 2c102f9a6..000000000 --- a/_includes/activity/github-desktop/01-create-repository.md +++ /dev/null @@ -1,18 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -Now that you have what you need for Git and GitHub installed locally, let's create the repository that will hold your new website. - -![gif of following the directions below](../images/gifs/github-desktop/create-repo.gif) - -1. On GitHub.com, [create a new repository](https://github.com/new). -1. Name your repository `YOUR-USERNAME.GITHUB.IO` - - > The name of your repository will be part of the link to your website. If you use the naming convention we described, your web site will be served at that URL. - -1. Enter a description for your repository. -1. Choose **Public** visibility. - - > We recommend you create a public repository. Public repositories are free. Even if you select a private repository, your published website will be public. - -1. Select **Initialize this repository with a README**. -1. Click **Create repository**. diff --git a/_includes/activity/github-desktop/07-merge-pull-request.md b/_includes/activity/github-desktop/07-merge-pull-request.md deleted file mode 100644 index 70df9c5ab..000000000 --- a/_includes/activity/github-desktop/07-merge-pull-request.md +++ /dev/null @@ -1,8 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -Since this is your repository, you probably don't have anyone to collaborate with (yet). Go ahead and merge your Pull Request now. - -![gif of following the directions below](../images/gifs/github-desktop/merge-pr.gif) - -1. On GitHub.com, navigate to the Pull Request that you just opened. -1. Scroll down and click the big green **Merge Pull Request** button. diff --git a/_includes/activity/github-desktop/12-add-class-repo.md b/_includes/activity/github-desktop/12-add-class-repo.md deleted file mode 100644 index 2511b6365..000000000 --- a/_includes/activity/github-desktop/12-add-class-repo.md +++ /dev/null @@ -1,5 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -1. Visit the [class repository](https://github.com/githubschool/on-demand-github-pages/). -1. Click the **Issues** tab. -1. Request push access by [creating an Issue](https://github.com/githubschool/on-demand-github-pages/issues/). diff --git a/_includes/activity/github-desktop/15-collaborate-prs.md b/_includes/activity/github-desktop/15-collaborate-prs.md deleted file mode 100644 index 4bd8201fd..000000000 --- a/_includes/activity/github-desktop/15-collaborate-prs.md +++ /dev/null @@ -1,7 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -It's now time to collaborate with other learners taking this class around the world :earth_americas:. - -1. In the [class repository on GitHub.com](https://github.com/githubschool/on-demand-github-pages/), navigate to the [Pull Requests tab](https://github.com/githubschool/on-demand-github-pages/pulls). -1. Look through other pull requests. Do they look like good changes, with CI passing? Feel free to post an encouraging message! -1. In your own pull request, wait to see if the branch passes the Travis CI tests and is ready to merge. diff --git a/_includes/activity/github-desktop/16-merge-pr.md b/_includes/activity/github-desktop/16-merge-pr.md deleted file mode 100644 index 1b9e765a7..000000000 --- a/_includes/activity/github-desktop/16-merge-pr.md +++ /dev/null @@ -1,18 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -Now that your tests have passed, let's click the big green button to add your site to our directory! - -![gif of following the directions below](../images/gifs/github-desktop/merge.gif) - -1. On GitHub.com, check to ensure the tests are passing. -1. Click on **Merge**. -1. Click **Confirm Merge**. -1. Delete the branch. - -## :tada: Congratulations! - -Once you have merged your pull request, you have completed the GitHub workflow! Refresh this page to see your addition to our contribution graph! - -
-
-
diff --git a/_includes/activity/github-desktop/choose-a-theme.md b/_includes/activity/github-desktop/choose-a-theme.md deleted file mode 100644 index d4f19b6cf..000000000 --- a/_includes/activity/github-desktop/choose-a-theme.md +++ /dev/null @@ -1,16 +0,0 @@ -[//]: # "This is used in both the CLI and Desktop course" - -This course is going to use GitHub Pages to create your website. To initialize GitHub Pages we need to perform a few more steps: - -![gif of following the directions below](../images/gifs/github-desktop/choose-a-theme.gif) - - -1. In your newly created repository, click the **Settings** tab. -1. Scroll down to the GitHub Pages section. -1. Click **Choose a theme**. -1. Decide which theme you would like to use, and click **Select theme**. - - > If you don't like the themes available, later in the course we identify how you can build a website without using a GitHub Pages theme. - -1. Accept the filler text by scrolling to the bottom of the page and click on **Commit Changes**. -1. Your site is published at: `USERNAME.github.io/REPONAME`. diff --git a/_includes/activity/github-desktop/desktopsurvey.md b/_includes/activity/github-desktop/desktopsurvey.md deleted file mode 100644 index 031a20c04..000000000 --- a/_includes/activity/github-desktop/desktopsurvey.md +++ /dev/null @@ -1,2 +0,0 @@ -## We Love Feedback :heart: - Please take _literally less than a minute_ to let us know what you think of this course. You may also choose to opt-in for updates on future classes. [Start Survey](https://www.surveygizmo.com/s3/3288550/desktop)! diff --git a/_includes/activity/intro-to-github-es/00-crear-cuenta-github.md b/_includes/activity/intro-to-github-es/00-crear-cuenta-github.md deleted file mode 100644 index 04884acb4..000000000 --- a/_includes/activity/intro-to-github-es/00-crear-cuenta-github.md +++ /dev/null @@ -1,12 +0,0 @@ -Para esta clase, necesitarás una cuenta en GitHub.com. - -Si ya tienes una cuenta en GitHub.com estás listo para empezar. Si no, puedes obtener tu cuenta gratuita siguiendo estos pasos: - -![gif of the following directions]({{site.baseurl}}/images/gifs/intro/sign-in.gif) - -1. Accede a [GitHub.com](https://github.com) e introduce un nombre de usuario, dirección de correo electrónico y contraseña en los campos correspondientes, y haz clic en **Sign up for GitHub**. -1. Selecciona la opción **Unlimited public repositories for free** (Repositorios gratuitos ilimitados). -1. Recibirás un correo de verificación en la dirección indicada. -1. Haz clic en el enlace que recibirás en ese correo para completar el proceso de verificación. - -Si te estás preguntado a dónde ir desde aquí, haz clic en **Dime por qué** para un rápido tour de tu panel de usuario. diff --git a/_includes/activity/intro-to-github-es/01-unirte-repo-intro.md b/_includes/activity/intro-to-github-es/01-unirte-repo-intro.md deleted file mode 100644 index b3767265d..000000000 --- a/_includes/activity/intro-to-github-es/01-unirte-repo-intro.md +++ /dev/null @@ -1,7 +0,0 @@ -¡Es hora de ensuciarse las manos! Utiliza estos pasos para acceder a nuestro proyecto compartido: - -![gif of the directions]({{site.baseurl}}/images/gifs/intro/join-repo-make-issue-introduction.gif) - -1. Entra en tu cuenta GitHub. -1. Navega hasta nuestro [proyecto compartido](https://github.com/githubschool/open-enrollment-classes-introduction-to-github/issues/) y haz clic en el botón **New issue**. -1. Introduce un título para tu issue y haz clic en **Submit new issue**. El usuario GitHubTeacher te añadirá automágicamente a nuestro proyecto como colaborador. \ No newline at end of file diff --git a/_includes/activity/intro-to-github-es/02-gestionar-notificaciones.md b/_includes/activity/intro-to-github-es/02-gestionar-notificaciones.md deleted file mode 100644 index 088ef5354..000000000 --- a/_includes/activity/intro-to-github-es/02-gestionar-notificaciones.md +++ /dev/null @@ -1,4 +0,0 @@ -GitHub defaults to over communication and lets you decide what you do and do not want to receive: - -1. Scroll to the top of issue #927. -2. On the right side of the issue, click **Unsubscribe** to stop getting email notifications from this discussion. diff --git a/_includes/activity/intro-to-github-es/03-crear-branch.md b/_includes/activity/intro-to-github-es/03-crear-branch.md deleted file mode 100644 index c56c89d12..000000000 --- a/_includes/activity/intro-to-github-es/03-crear-branch.md +++ /dev/null @@ -1,10 +0,0 @@ -Es hora de que crees un branch (o rama) que utilizarás para añadir tu pin al mapa. Así es como se hace: - -![gif of directions]({{site.baseurl}}/images/gifs/intro/create-branch-intro.gif) - -1. Navega a la pestaña Code en el repositorio de la clase. -2. Haz clic en el desplegable titulado **Branch: master**. -3. En el campo, introduce este nombre único para tu branch: `usuario-ciudad` utilizando tu nombre de usuario y tu ciudad. -4. Haz clic en **Create branch: usuario-ciudad** o presiona Enter para crear tu branch. - -> Cuando empiezas a escribir en el campo branch, debería mostrarse un botón azul. Si no lo hace, no eres aún un colaborador en el proyecto y tienes que crear un issue [aquí](https://github.com/githubschool/open-enrollment-classes-introduction-to-github/issues/). diff --git a/_includes/activity/intro-to-github-es/04-crear-archivo-en-github.md b/_includes/activity/intro-to-github-es/04-crear-archivo-en-github.md deleted file mode 100644 index 288adbc64..000000000 --- a/_includes/activity/intro-to-github-es/04-crear-archivo-en-github.md +++ /dev/null @@ -1,16 +0,0 @@ -Es momento de añadir tu archivo al repositorio: - -![gif of directions]({{site.baseurl}}/images/gifs/intro/working-on-github.gif) - -1. En tu nuevo branch, añade un archivo nuevo con el nombre `_pins/TU-USUARIO.json`. -1. Introduce el siguiente contenido en tu archivo: - - --- - githubHandle: TU-USUARIO - latitude: TU-LATITUD - longitude: TU-LONGITUD - --- - - -1. Navega hasta la parte inferior e introduce un mensaje de commit que describa tu aportación. -1. Haz commit de tu cambio a tu branch. diff --git a/_includes/activity/intro-to-github-es/05-crear-pull-request.md b/_includes/activity/intro-to-github-es/05-crear-pull-request.md deleted file mode 100644 index 24c3c6e99..000000000 --- a/_includes/activity/intro-to-github-es/05-crear-pull-request.md +++ /dev/null @@ -1,20 +0,0 @@ -Ahora que has creado un archivo, vas a crear un Pull Request para mostrar los cambios que propones a las demás personas que están completando este proyecto: - -![gif of directions]({{site.baseurl}}/images/gifs/intro/pull-request-intro.gif) - -1. Navega hasta la pestaña Pull Requests. -2. Haz clic en `New Pull Request`. -3. En el desplegable **base**, selecciona `master`. -4. En el desplegable **compare**, selecciona tu branch. -5. Haz clic en **Create pull request**. -6. Puedes dejar el título por defecto o hacerlo más descriptivo. -7. Utilizando [formato markdown](https://guides.github.com/features/mastering-markdown/) para explicar el trabajo que has hecho en tu branch: - - Resume el cambio propuesto. - - Menciona al equipo de formadores usando `@githubteacher`. - - Utiliza la palabra clave `closes` seguida inmediatamente por el número de tu issue (ej. `closes #3`) para indicar a qué Issue se refiere este Pull Request. Cuando haces esto, el issue se cerrará automáticamente cuando se haga merge del pull request. - - > Los mensajes de Pull Request son una excelente oportunidad para describir los cambios realizados en el proyecto. Por ejemplo, podrías también incluir información explicando el tipo de feedback que te gustaría que te aportaran los demás u ofreciendo a tus colaboradores una idea de tu planificación temporal para el trabajo. - -8. Haz clic en **Preview** para ver qué aspecto tendrá el Pull Request. -9. Asígnate el pull request a ti mismo haciendo clic en **assign to yourself** en la sección Assignees. -10. Haz clic en `Create pull request`. diff --git a/_includes/activity/intro-to-github-es/05a-colaborar-en-pull-request.md b/_includes/activity/intro-to-github-es/05a-colaborar-en-pull-request.md deleted file mode 100644 index 034b2c274..000000000 --- a/_includes/activity/intro-to-github-es/05a-colaborar-en-pull-request.md +++ /dev/null @@ -1,6 +0,0 @@ -:tada: ¡Enhorabuena! Has creado tu Pull Request. Ahora es momento de ponerte el sombrero de colaborador e ir a ayudar a los demás. - -![gif of directions]({{site.baseurl}}/images/gifs/intro/collaborate.gif) - -1. Ahora que se ha creado tu pull request, vuelve a la lista de pull requests para encontrar un pull request abierto -- que no sea el tuyo. -2. Ofrece feedback :loudspeaker: y motivación :tada:. diff --git a/_includes/activity/intro-to-github-es/06-merge-un-pr.md b/_includes/activity/intro-to-github-es/06-merge-un-pr.md deleted file mode 100644 index f14750ea5..000000000 --- a/_includes/activity/intro-to-github-es/06-merge-un-pr.md +++ /dev/null @@ -1,9 +0,0 @@ -Si todas tus comprobaciones están pasando y no tienes ningún cambio solicitado por otros estudiantes, adelante, puedes hacer merge de tu pull request: - -![gif of directions]({{site.baseurl}}/images/gifs/intro/merge-intro.gif) - -1. Abre tu [Pull Request](https://github.com/githubschool/open-enrollment-classes-introduction-to-github/pulls) para hacer merge. -1. Navega hasta la parte inferior del Pull Request y haz clic en el botón **Merge pull request**. -1. Puedes aceptar el mensaje por defecto para el merge commit. -1. Haz clic en **Confirm merge**. -1. Haz clic en **Delete branch** para eliminar el branch, dado que ya no contiene una tarea o variación en la que se esté trabajando. diff --git a/_includes/activity/intro-to-github/00-create-github-account.md b/_includes/activity/intro-to-github/00-create-github-account.md deleted file mode 100644 index a18d17f56..000000000 --- a/_includes/activity/intro-to-github/00-create-github-account.md +++ /dev/null @@ -1,12 +0,0 @@ -For this class, you will need an account on GitHub.com. - -If you already have a Github.com account you are ready to get started. Otherwise, you can set up your free account by following these steps: - -![gif of the following directions](../images/gifs/intro/sign-in.gif) - -1. Access [GitHub.com](https://github.com) and click and enter a username, email address, and password in the supplied field and click **Sign up for GitHub**. -1. Select the **Unlimited public repositories for free** option. -1. You will receive a verification email at the address provided. -1. Click the emailed link to complete the verification process. - -If you are wondering where to go from here, click **Tell me why** for a quick tour of your dashboard. diff --git a/_includes/activity/intro-to-github/01-join-intro-repo.md b/_includes/activity/intro-to-github/01-join-intro-repo.md deleted file mode 100644 index f8f09200c..000000000 --- a/_includes/activity/intro-to-github/01-join-intro-repo.md +++ /dev/null @@ -1,7 +0,0 @@ -It's time to get your hands dirty! Use these steps to access our shared project: - -![gif of the directions]({{site.baseurl}}/images/gifs/intro/join-repo-make-issue-introduction.gif) - -1. Sign in with your GitHub account. -1. Navigate to our [shared project](https://github.com/githubschool/open-enrollment-classes-introduction-to-github/issues/) and click the **New issue** button. -1. Enter a title for your issue and click **Submit new issue**. The GitHubTeacher user will auto-magically add you to our project as a collaborator. diff --git a/_includes/activity/intro-to-github/02-manage-notifications.md b/_includes/activity/intro-to-github/02-manage-notifications.md deleted file mode 100644 index 088ef5354..000000000 --- a/_includes/activity/intro-to-github/02-manage-notifications.md +++ /dev/null @@ -1,4 +0,0 @@ -GitHub defaults to over communication and lets you decide what you do and do not want to receive: - -1. Scroll to the top of issue #927. -2. On the right side of the issue, click **Unsubscribe** to stop getting email notifications from this discussion. diff --git a/_includes/activity/intro-to-github/03-create-branch.md b/_includes/activity/intro-to-github/03-create-branch.md deleted file mode 100644 index c5acd49e8..000000000 --- a/_includes/activity/intro-to-github/03-create-branch.md +++ /dev/null @@ -1,10 +0,0 @@ -It is time to create the branch you will use to add your pin to the map. Here's how you do it: - -![gif of directions](../images/gifs/intro/create-branch-intro.gif) - -1. Navigate to the Code tab in the class repository. -2. Click the drop-down titled **Branch: master**. -3. In the field, enter this unique name for your branch: `your-username-your-city`. -4. Click **Create branch: your-username-your-city** or press the Enter key to create your branch. - -> When you begin typing in the branch field, a blue button should display, if it doesn't, you aren't a collaborator on the project and need to create an issue [here](https://github.com/githubschool/open-enrollment-classes-introduction-to-github/issues/). diff --git a/_includes/activity/intro-to-github/04-create-a-file-on-github.md b/_includes/activity/intro-to-github/04-create-a-file-on-github.md deleted file mode 100644 index 3c2be9f9f..000000000 --- a/_includes/activity/intro-to-github/04-create-a-file-on-github.md +++ /dev/null @@ -1,16 +0,0 @@ -It's time to add your file to the repository: - -![gif of directions](../images/gifs/intro/working-on-github.gif) - -1. In your new branch, add a new file named: `_pins/YOUR-USERNAME.json`. -1. Enter the following content into your file: - - --- - githubHandle: YOUR-USERNAME - latitude: YOUR_LATITUDE - longitude: YOUR_LONGITUDE - --- - - -1. Scroll down and enter a commit message that describes your addition. -1. Commit your change to your branch. diff --git a/_includes/activity/intro-to-github/05-create-a-pull-request.md b/_includes/activity/intro-to-github/05-create-a-pull-request.md deleted file mode 100644 index dea2ecbf4..000000000 --- a/_includes/activity/intro-to-github/05-create-a-pull-request.md +++ /dev/null @@ -1,20 +0,0 @@ -Now that you have created a file, you will create a Pull Request to show your proposed changes to others who are completing this project: - -![gif of directions](../images/gifs/intro/pull-request-intro.gif) - -1. Navigate to the Pull Requests tab. -2. Click `New Pull Request`. -3. In the **base** dropdown, choose `master`. -4. In the **compare** dropdown, choose your branch. -5. Click **Create pull request**. -6. You can leave the default title or make it more descriptive. -7. Use [markdown formatting](https://guides.github.com/features/mastering-markdown/) to explain the work you have done on your branch. - - Summarize your proposed change. - - Mention the training team using `@githubteacher`. - - Use the keywords `closes` immediately followed by your issue number (e.g. `closes #3`)to note which Issue the Pull Request is addressing. When you do this, the issue will be automatically closed when the pull request is merged. - - > Pull Request messages are an excellent opportunity for you to describe the changes you have made to the project. For example, you could also include information explaining the type of feedback you'd like others to give you or providing collaborators an idea of your timeline. - -8. Click **Preview** to see how your Pull Request will look. -9. Assign the pull request to yourself by clicking **assign to yourself** in the Assignees section. -10. Click `Create pull request`. diff --git a/_includes/activity/intro-to-github/05a-collaborate-on-pull-request.md b/_includes/activity/intro-to-github/05a-collaborate-on-pull-request.md deleted file mode 100644 index cddaaa191..000000000 --- a/_includes/activity/intro-to-github/05a-collaborate-on-pull-request.md +++ /dev/null @@ -1,6 +0,0 @@ -:tada: Congratulations! You have created your Pull Request. Now it is time to put your collaborator hat on and go help others! - -![gif of directions](../images/gifs/intro/collaborate.gif) - -1. Now that your pull request has been created, go back to the pull request list to find an open pull request -- other than your own. -1. Provide feedback :loudspeaker: and motivation :tada:. diff --git a/_includes/activity/intro-to-github/06-merge-a-pr.md b/_includes/activity/intro-to-github/06-merge-a-pr.md deleted file mode 100644 index 49b5bbb9d..000000000 --- a/_includes/activity/intro-to-github/06-merge-a-pr.md +++ /dev/null @@ -1,9 +0,0 @@ -If all of your checks are passing and you do not have any requested changes from other students, you can go ahead and merge your pull request: - -![gif of directions](../images/gifs/intro/merge-intro.gif) - -1. Open your [Pull Request](https://github.com/githubschool/open-enrollment-classes-introduction-to-github/pulls) to be merged. -1. Scroll to the bottom of the Pull Request and click the **Merge pull request** button. -1. You can accept the default merge commit message. -1. Click **Confirm merge**. -1. Click **Delete branch** to delete the branch, as it no longer contains unique work. diff --git a/_includes/analytics-providers/custom.html b/_includes/analytics-providers/custom.html deleted file mode 100644 index c34b97ad9..000000000 --- a/_includes/analytics-providers/custom.html +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/_includes/analytics-providers/google-universal.html b/_includes/analytics-providers/google-universal.html deleted file mode 100644 index 3ada6e36c..000000000 --- a/_includes/analytics-providers/google-universal.html +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/_includes/archive-single.html b/_includes/archive-single.html deleted file mode 100644 index 397258ab5..000000000 --- a/_includes/archive-single.html +++ /dev/null @@ -1,34 +0,0 @@ -{% include base_path %} - -{% if post.header.teaser %} - {% capture teaser %}{{ post.header.teaser }}{% endcapture %} -{% else %} - {% capture teaser %}{{ site.teaser }}{% endcapture %} -{% endif %} - -
- {% if post.link %} - - {% else %} - - {% endif %} -
- {% if include.type == "grid" and teaser != blank %} -
- -
- {% endif %} -

{% if post.id %}{{ post.title | markdownify | remove: "

" | remove: "

" }}{% else %}{{ post.title }}{% endif %}{% if post.link %}{% endif %}

- {% if post.read_time %} -

{% include read-time.html %}

- {% endif %} - {% if post.excerpt %}

{{ post.excerpt | markdownify | strip_html | truncate: 160 }}

{% endif %} -
- -
diff --git a/_includes/attention.html b/_includes/attention.html deleted file mode 100644 index e2544de10..000000000 --- a/_includes/attention.html +++ /dev/null @@ -1,7 +0,0 @@ -{% if page.attention_message %} -
-
- {{page.attention_message | markdownify}} -
-
-{% endif %} diff --git a/_includes/author-profile.html b/_includes/author-profile.html deleted file mode 100644 index 5efe4c84b..000000000 --- a/_includes/author-profile.html +++ /dev/null @@ -1,102 +0,0 @@ -{% include base_path %} - -{% if page.author %} - {% assign author = site.data.authors[page.author] %}{% else %}{% assign author = site.author %} -{% endif %} - -
- -
- {% if author.avatar contains "://" %} - {{ author.name }} - {% else %} - {{ author.name }} - {% endif %} -
- -
-

{{ author.name }}

- {% if author.bio %}

{{ author.bio }}

{% endif %} -
- -
- - -
-
diff --git a/_includes/blue-hero.html b/_includes/blue-hero.html deleted file mode 100644 index acd54de34..000000000 --- a/_includes/blue-hero.html +++ /dev/null @@ -1,25 +0,0 @@ -
-
-

- {% if paginator %} - {{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page }} {{ paginator.page }}{% endunless %} - {% else %} - {{ page.title | default: site.title | markdownify | remove: "

" | remove: "

" }} - {% endif %} -

- {% if page.excerpt %} -

{{ page.excerpt | markdownify | remove: "

" | remove: "

" }}

- {% endif %} - {% if site.read_time and page.read_time %} -

{% include read-time.html %}

- {% endif %} - {% if page.header.cta_url %} -

{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label }}

- {% endif %} - {% include translation_buttons.html %} -
- {% if page.header.caption %} - {{ page.header.caption | markdownify | remove: "

" | remove: "

" }} - {% endif %} - -
diff --git a/_includes/browser-upgrade.html b/_includes/browser-upgrade.html deleted file mode 100644 index e8d8b2625..000000000 --- a/_includes/browser-upgrade.html +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/_includes/category-list.html b/_includes/category-list.html deleted file mode 100644 index 173d6b873..000000000 --- a/_includes/category-list.html +++ /dev/null @@ -1,30 +0,0 @@ -{% include base_path %} - -{% include base_path %} - -{% case site.category_archive.type %} - {% when "liquid" %} - {% assign path_type = "#" %} - {% when "jekyll-archives" %} - {% assign path_type = nil %} -{% endcase %} - -{% if site.category_archive.path %} - {% comment %} - - - {% endcomment %} - {% capture page_categories %}{% for category in page.categories %}{{ category | downcase }}#{{ category }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %} - {% assign category_hashes = (page_categories | split: ',' | sort:0) %} - -

- {{ site.data.ui-text[site.locale].categories_label }} - - {% for hash in category_hashes %} - {% assign keyValue = hash | split: '#' %} - {% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} - {% unless forloop.last %}, {% endunless %} - {% endfor %} - -

-{% endif %} diff --git a/_includes/comments-providers/custom.html b/_includes/comments-providers/custom.html deleted file mode 100644 index 90993691e..000000000 --- a/_includes/comments-providers/custom.html +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/_includes/comments-providers/discourse.html b/_includes/comments-providers/discourse.html deleted file mode 100644 index bd9c3332a..000000000 --- a/_includes/comments-providers/discourse.html +++ /dev/null @@ -1,14 +0,0 @@ -{% if site.comments.discourse.server %} -{% include base_path %} -{% capture canonical %}{{ site.baseurl }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %} - - -{% endif %} \ No newline at end of file diff --git a/_includes/comments-providers/disqus.html b/_includes/comments-providers/disqus.html deleted file mode 100644 index b80be9efd..000000000 --- a/_includes/comments-providers/disqus.html +++ /dev/null @@ -1,22 +0,0 @@ -{% if site.comments.disqus.shortname %} - - -{% endif %} diff --git a/_includes/comments-providers/facebook.html b/_includes/comments-providers/facebook.html deleted file mode 100644 index 009dc1c6c..000000000 --- a/_includes/comments-providers/facebook.html +++ /dev/null @@ -1,8 +0,0 @@ -
- \ No newline at end of file diff --git a/_includes/comments-providers/google-plus.html b/_includes/comments-providers/google-plus.html deleted file mode 100644 index cd582c3dd..000000000 --- a/_includes/comments-providers/google-plus.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/_includes/comments.html b/_includes/comments.html deleted file mode 100644 index b59742398..000000000 --- a/_includes/comments.html +++ /dev/null @@ -1,15 +0,0 @@ -{% include base_path %} - -
-

{{ site.data.ui-text[site.locale].comments_label }}

- {% case site.comments.provider %} - {% when "disqus" %} -
- {% when "facebook" %} -
- {% when "google-plus" %} -
Loading Google+ Comments ...
- {% when "custom" %} -
- {% endcase %} -
\ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html index aefe1cb01..be5aa4b55 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,10 +1,10 @@