another_project.git
10 years agoMerge pull request #229 from github/chat-slide-tweak gh-pages
Jordan McCullough [Sun, 10 Nov 2013 20:56:15 +0000 (12:56 -0800)]
Merge pull request #229 from github/chat-slide-tweak

Make "chat" link title editable on preroll bumper

10 years agoMake chat link fied editable
jordanmccullough [Fri, 8 Nov 2013 10:24:29 +0000 (10:24 +0000)]
Make chat link fied editable

10 years agoAppForum 2013
Tim Berglund [Wed, 6 Nov 2013 15:56:25 +0000 (16:56 +0100)]
AppForum 2013

10 years agoMotorola AppForum 2013
Tim Berglund [Wed, 6 Nov 2013 14:12:05 +0000 (15:12 +0100)]
Motorola AppForum 2013

10 years agoWJAX 2013 workshop
Tim Berglund [Mon, 4 Nov 2013 15:59:31 +0000 (16:59 +0100)]
WJAX 2013 workshop

10 years agoReston NFJS class notes
Tim Berglund [Mon, 4 Nov 2013 15:59:24 +0000 (16:59 +0100)]
Reston NFJS class notes

10 years agoMerge pull request #228 from randomecho/copyedit-classnotes-oct30-transcript
Matthew McCullough [Fri, 1 Nov 2013 03:40:35 +0000 (20:40 -0700)]
Merge pull request #228 from randomecho/copyedit-classnotes-oct30-transcript

Clean up Oct 30 class notes transcript, more of a Q&A format

10 years agoClean up Oct 30 class notes transcript, more of a Q&A format
Soon Van [Fri, 1 Nov 2013 01:34:09 +0000 (21:34 -0400)]
Clean up Oct 30 class notes transcript, more of a Q&A format

- Added direct link to Drive By Contributions video
- Fenced code blocks don't seem to render well,
  went back to Markdown four-space indents
- Break up a debugging issue with SSL certificates into
  bit question & answer pairs

Filled in the answers/question for:

- What `git remote -v` does
- User vs Organisation accounts
- What diverged means
- Difference between pull and fetch

Dropped questions

- Best practices on open sourcing on GitHub
- Where to turn for consulting services after a repo FUBAR
- Starting conversations with a Pull Request
- Connecting GitHub client to a different remote

10 years agoAdd CCSC workshop placeholder class note
Jordan McCullough [Fri, 1 Nov 2013 01:04:31 +0000 (21:04 -0400)]
Add CCSC workshop placeholder class note

10 years agoSparkFun notes
Tim Berglund [Thu, 31 Oct 2013 22:14:41 +0000 (16:14 -0600)]
SparkFun notes

10 years agoPublic foundations class notes on 2013-10-30
Matthew McCullough [Thu, 31 Oct 2013 03:54:39 +0000 (21:54 -0600)]
Public foundations class notes on 2013-10-30

10 years agoPublic foundations class notes on 2013-10-30
Matthew McCullough [Thu, 31 Oct 2013 03:54:39 +0000 (21:54 -0600)]
Public foundations class notes on 2013-10-30

10 years agoMerge pull request #227 from randomecho/226-front-matter-oct28-match
Matthew McCullough [Tue, 29 Oct 2013 02:09:44 +0000 (19:09 -0700)]
Merge pull request #227 from randomecho/226-front-matter-oct28-match

Fix Oct 28 path & eventdate front matter to match title & date

10 years agoFix Oct 28 path & eventdate front matter to match title & date
Soon Van [Tue, 29 Oct 2013 01:18:43 +0000 (21:18 -0400)]
Fix Oct 28 path & eventdate front matter to match title & date

10 years agoFix title for CLI on Oct. 28 event classnotes
Jordan McCullough [Mon, 28 Oct 2013 21:28:06 +0000 (22:28 +0100)]
Fix title for CLI on Oct. 28 event classnotes

10 years agoMerge pull request #226 from github/oct-28-private-event
Jordan McCullough [Mon, 28 Oct 2013 21:21:27 +0000 (14:21 -0700)]
Merge pull request #226 from github/oct-28-private-event

Add Oct. 28, 2013 class notes

10 years agoAdd Oct. 28, 2013 class notes
GitHub Teacher [Mon, 28 Oct 2013 21:14:46 +0000 (22:14 +0100)]
Add Oct. 28, 2013 class notes

10 years agoMerge pull request #224 from github/slide-yaml-cleanup
Matthew McCullough [Mon, 28 Oct 2013 19:09:15 +0000 (12:09 -0700)]
Merge pull request #224 from github/slide-yaml-cleanup

Remove "categories" unused YAML

10 years agoMerge pull request #225 from github/tekkub-patch-1
Matthew McCullough [Mon, 28 Oct 2013 03:26:53 +0000 (20:26 -0700)]
Merge pull request #225 from github/tekkub-patch-1

Don't email support on CI builds

10 years agoSwitch jordan@ to trainingteam@
Matthew McCullough [Mon, 28 Oct 2013 00:18:53 +0000 (18:18 -0600)]
Switch jordan@ to trainingteam@

10 years agoDon't email support
Tekkub [Mon, 28 Oct 2013 00:16:10 +0000 (18:16 -0600)]
Don't email support

10 years agoRemove "categories" unused YAML from all slide markdown
jordanmccullough [Mon, 21 Oct 2013 23:41:43 +0000 (16:41 -0700)]
Remove "categories" unused YAML from all slide markdown

10 years agoNFJS Minneapolis Fall 2013
Tim Berglund [Tue, 15 Oct 2013 05:27:58 +0000 (06:27 +0100)]
NFJS Minneapolis Fall 2013

10 years agoDublin Public Workshop
Tim Berglund [Tue, 15 Oct 2013 05:27:46 +0000 (06:27 +0100)]
Dublin Public Workshop

10 years agoMerge pull request #222 from randomecho/fix-backticks-classnotes-20131009-adv-git...
Matthew McCullough [Sat, 12 Oct 2013 02:17:35 +0000 (19:17 -0700)]
Merge pull request #222 from randomecho/fix-backticks-classnotes-20131009-adv-git-class

Missing backticks in 2013-10-09 classnotes; Fix some bullets

10 years agoMissing backticks in 2013-10-09 classnotes; Fix some bullets
Soon Van [Fri, 11 Oct 2013 23:39:31 +0000 (19:39 -0400)]
Missing backticks in 2013-10-09 classnotes; Fix some bullets

Also rewrote the Ed Note to be an example as it read like
an example case already.

10 years agoMerge pull request #221 from github/diagram-source-update
Jordan McCullough [Fri, 11 Oct 2013 23:02:04 +0000 (16:02 -0700)]
Merge pull request #221 from github/diagram-source-update

Add "What is a commit" AI source diagram

10 years agoPrivate GHE Preview
Tim Berglund [Fri, 11 Oct 2013 16:56:01 +0000 (10:56 -0600)]
Private GHE Preview

10 years agoFix spelling error in Commit diagram PNG
jordanmccullough [Fri, 11 Oct 2013 00:23:15 +0000 (18:23 -0600)]
Fix spelling error in Commit diagram PNG

10 years agoFix spelling error in Commit diagram source
jordanmccullough [Fri, 11 Oct 2013 00:21:52 +0000 (18:21 -0600)]
Fix spelling error in Commit diagram source

10 years agoAdd "What is a commit" AI source diagram
jordanmccullough [Thu, 10 Oct 2013 23:29:06 +0000 (17:29 -0600)]
Add "What is a commit" AI source diagram

10 years agoCompleted advanced class notes
Matthew McCullough [Wed, 9 Oct 2013 22:36:05 +0000 (16:36 -0600)]
Completed advanced class notes

10 years ago2013-10-09 advanced class notes almost done
Matthew McCullough [Wed, 9 Oct 2013 20:26:00 +0000 (14:26 -0600)]
2013-10-09 advanced class notes almost done

10 years agoUpdate October 10 Advanced Class Notes YAML
jordanmccullough [Wed, 9 Oct 2013 14:54:18 +0000 (08:54 -0600)]
Update October 10 Advanced Class Notes YAML

10 years ago2013-10-09 Advanced Class Notes stub
Matthew McCullough [Wed, 9 Oct 2013 14:49:35 +0000 (08:49 -0600)]
2013-10-09 Advanced Class Notes stub

10 years agoMerge pull request #220 from github/tag-image-slides
Jordan McCullough [Wed, 9 Oct 2013 01:24:55 +0000 (18:24 -0700)]
Merge pull request #220 from github/tag-image-slides

Add support for diagram / fragment-only slide deck layout

10 years agoSimplify diagram-only template
jordanmccullough [Tue, 8 Oct 2013 22:05:05 +0000 (16:05 -0600)]
Simplify diagram-only template

10 years agoAdd back stylesheet for diagram layout when defined
jordanmccullough [Tue, 8 Oct 2013 21:41:05 +0000 (15:41 -0600)]
Add back stylesheet for diagram layout when defined

10 years agoFix title chapter slide with diagram only slides
jordanmccullough [Tue, 8 Oct 2013 21:40:06 +0000 (15:40 -0600)]
Fix title chapter slide with diagram only slides

10 years agoAdd Foundations Diagram-only deck
jordanmccullough [Tue, 8 Oct 2013 18:32:07 +0000 (12:32 -0600)]
Add Foundations Diagram-only deck

10 years agoAdd diagram-only layout support
jordanmccullough [Tue, 8 Oct 2013 18:27:03 +0000 (12:27 -0600)]
Add diagram-only layout support

10 years agoImplement slide tags to support diagram-only deck layouts
Matthew McCullough [Mon, 7 Oct 2013 16:53:58 +0000 (10:53 -0600)]
Implement slide tags to support diagram-only deck layouts

10 years agoMerge pull request #219 from mgriffin/fix_page_links
Matthew McCullough [Sun, 6 Oct 2013 22:32:13 +0000 (15:32 -0700)]
Merge pull request #219 from mgriffin/fix_page_links

Fixes the links back to the source pages

10 years agoFixes the links back to the source pages
Mike Griffin [Sun, 6 Oct 2013 17:07:09 +0000 (18:07 +0100)]
Fixes the links back to the source pages

They were all set to the wrong date.
The other languages page also had the wrong name

10 years agoMerge pull request #218 from mgriffin/patch-1
Brent Beer [Sun, 6 Oct 2013 00:13:59 +0000 (17:13 -0700)]
Merge pull request #218 from mgriffin/patch-1

Fixes the link back to the source of the page

10 years agoFixes the link back to the source of the page
Mike Griffin [Sun, 6 Oct 2013 00:05:34 +0000 (01:05 +0100)]
Fixes the link back to the source of the page

10 years agoMerge pull request #217 from github/bumper-feedback-link
Jordan McCullough [Wed, 2 Oct 2013 20:11:09 +0000 (13:11 -0700)]
Merge pull request #217 from github/bumper-feedback-link

Update Preroll and End Bumpers

10 years agoUpdate Stack Overflow link with tags in URL
jordanmccullough [Wed, 2 Oct 2013 20:09:37 +0000 (14:09 -0600)]
Update Stack Overflow link with tags in URL

10 years agoUpdate StackOverflow spelling with space
jordanmccullough [Wed, 2 Oct 2013 18:24:17 +0000 (12:24 -0600)]
Update StackOverflow spelling with space

10 years agoMove Office Hours and Questions link from Preroll to Goodbye bumper
jordanmccullough [Wed, 2 Oct 2013 16:50:15 +0000 (10:50 -0600)]
Move Office Hours and Questions link from Preroll to Goodbye bumper

Clean up opening slide with logo and chatroom only. Avoids distraction
of starting information overload. End bumper includes Training class
link and Stackoverflow link.

10 years agoMove preroll chapter to bumpers directory
jordanmccullough [Wed, 2 Oct 2013 16:30:54 +0000 (10:30 -0600)]
Move preroll chapter to bumpers directory

Prevents oversight of where preroll bumper resides when stored
within the Foundations section despite preroll used throughout
many slide decks.

10 years agoMerge pull request #214 from github/hydeslide-plugin-update
Tim Berglund [Tue, 1 Oct 2013 16:44:31 +0000 (09:44 -0700)]
Merge pull request #214 from github/hydeslide-plugin-update

Update HydeSlides plugin version

10 years agoMerge pull request #215 from github/commit-diagram-upgrade
Tim Berglund [Tue, 1 Oct 2013 16:42:16 +0000 (09:42 -0700)]
Merge pull request #215 from github/commit-diagram-upgrade

Update Commit Structure diagram with all fields in commit object

10 years agoMerge pull request #212 from github/octocat-mark-update
Tim Berglund [Tue, 1 Oct 2013 16:41:15 +0000 (09:41 -0700)]
Merge pull request #212 from github/octocat-mark-update

Update GitHub Octocat Mark PNG with new branding

10 years agoMerge pull request #216 from github/slide-content-corrections
Tim Berglund [Tue, 1 Oct 2013 16:32:40 +0000 (09:32 -0700)]
Merge pull request #216 from github/slide-content-corrections

Revised Commit Shorthand Examples

10 years agoRevised Commit shorthand examples to match slide deck terminal style
jordanmccullough [Mon, 30 Sep 2013 22:23:47 +0000 (16:23 -0600)]
Revised Commit shorthand examples to match slide deck terminal style

Updated shorthand reference of ancestor and parent with clearer
examples and descriptions.

10 years agoReverse merge to update TravisCI configuration
jordanmccullough [Mon, 30 Sep 2013 19:56:36 +0000 (13:56 -0600)]
Reverse merge to update TravisCI configuration

10 years agoUpdate Commit Structure diagram with all fields in commit object
jordanmccullough [Mon, 30 Sep 2013 19:48:28 +0000 (13:48 -0600)]
Update Commit Structure diagram with all fields in commit object

10 years agoReverse merge of Master to capture Travis CI configuration
jordanmccullough [Mon, 30 Sep 2013 19:35:23 +0000 (13:35 -0600)]
Reverse merge of Master to capture Travis CI configuration

10 years agoUpdate HydeSlides plugin version
jordanmccullough [Mon, 30 Sep 2013 16:54:14 +0000 (10:54 -0600)]
Update HydeSlides plugin version

Resolves `?` key help dialog display and previously uncaught
JavaScript errors on initialization and objects are undefined

10 years agoMerge pull request #213 from github/travis
Aidan Feldman [Mon, 30 Sep 2013 16:32:15 +0000 (09:32 -0700)]
Merge pull request #213 from github/travis

Fix Travis build

10 years agoadd travis config
Aidan Feldman [Mon, 30 Sep 2013 16:18:16 +0000 (12:18 -0400)]
add travis config

10 years agolock ruby version
Aidan Feldman [Mon, 30 Sep 2013 16:17:52 +0000 (12:17 -0400)]
lock ruby version

10 years agoupgrade github-pages gem
Aidan Feldman [Mon, 30 Sep 2013 16:17:28 +0000 (12:17 -0400)]
upgrade github-pages gem

10 years agoUpdate GitHub Octocat Mark PNG with new branding, adjust position
jordanmccullough [Mon, 30 Sep 2013 15:43:43 +0000 (09:43 -0600)]
Update GitHub Octocat Mark PNG with new branding, adjust position

Replaced classic Octocat Mark with new "small" variant Octocat
Mark for GitHub slide deck theme. Logo now appears in upper right
for better alignment and avoids overlap of any slide deck content.

10 years agoMerge pull request #204 from github/diagram-update-theme-fix
Jordan McCullough [Fri, 27 Sep 2013 18:08:40 +0000 (11:08 -0700)]
Merge pull request #204 from github/diagram-update-theme-fix

Diagram Overhaul and Stylesheet Fixes

10 years agoInclude Commit Structure diagram tree paths
jordanmccullough [Thu, 26 Sep 2013 16:11:26 +0000 (10:11 -0600)]
Include Commit Structure diagram tree paths

10 years agoRMR Git Workshop
Tim Berglund [Wed, 25 Sep 2013 20:59:43 +0000 (14:59 -0600)]
RMR Git Workshop

10 years agoUpdate What is a Commit diagram to flat look
jordanmccullough [Wed, 25 Sep 2013 03:23:11 +0000 (21:23 -0600)]
Update What is a Commit diagram to flat look

10 years agoRemove deprecated miscellaneous diagrams
jordanmccullough [Wed, 25 Sep 2013 02:07:40 +0000 (20:07 -0600)]
Remove deprecated miscellaneous diagrams

10 years agoRemove deprecated Diff diagram
jordanmccullough [Wed, 25 Sep 2013 02:07:18 +0000 (20:07 -0600)]
Remove deprecated Diff diagram

10 years agoRemove deprecated Three Stage diagram
jordanmccullough [Wed, 25 Sep 2013 02:07:03 +0000 (20:07 -0600)]
Remove deprecated Three Stage diagram

10 years agoRemove deprecated Tracking diagram
jordanmccullough [Wed, 25 Sep 2013 02:06:39 +0000 (20:06 -0600)]
Remove deprecated Tracking diagram

10 years agoRemove deprecated Remotes diagram
jordanmccullough [Wed, 25 Sep 2013 02:06:11 +0000 (20:06 -0600)]
Remove deprecated Remotes diagram

10 years agoRemove deprecated alternate Rebase diagram
jordanmccullough [Wed, 25 Sep 2013 02:05:57 +0000 (20:05 -0600)]
Remove deprecated alternate Rebase diagram

10 years agoRemove deprecated Merge diagrams
jordanmccullough [Wed, 25 Sep 2013 02:05:31 +0000 (20:05 -0600)]
Remove deprecated Merge diagrams

10 years agoRemove deprecated Rebase diagram
jordanmccullough [Wed, 25 Sep 2013 02:04:50 +0000 (20:04 -0600)]
Remove deprecated Rebase diagram

10 years agoRemove deprecated Fast Forward diagram
jordanmccullough [Wed, 25 Sep 2013 02:04:33 +0000 (20:04 -0600)]
Remove deprecated Fast Forward diagram

10 years agoAdd additional build-step for Commit Three Stage diagram
jordanmccullough [Wed, 25 Sep 2013 01:58:35 +0000 (19:58 -0600)]
Add additional build-step for Commit Three Stage diagram

10 years agoUpdate Rm-Mv diagram with two visual examples
jordanmccullough [Wed, 25 Sep 2013 01:50:51 +0000 (19:50 -0600)]
Update Rm-Mv diagram with two visual examples

Add Rm-Mv State of Tracking simple diagram flat look and change
title to thorough step-through "map" of tracking states.

10 years agoRefine Rm-Mv flat-look diagram with clearer state transitions
jordanmccullough [Tue, 24 Sep 2013 23:37:30 +0000 (17:37 -0600)]
Refine Rm-Mv flat-look diagram with clearer state transitions

10 years agoSeptember free class notes
Tim Berglund [Tue, 24 Sep 2013 21:30:49 +0000 (15:30 -0600)]
September free class notes

10 years agoReverse merge to resolve out-of-date conflicts
jordanmccullough [Tue, 24 Sep 2013 19:52:51 +0000 (13:52 -0600)]
Reverse merge to resolve out-of-date conflicts

10 years agoMerge pull request #209 from github/diagram-source-files
Aidan Feldman [Tue, 24 Sep 2013 18:25:32 +0000 (11:25 -0700)]
Merge pull request #209 from github/diagram-source-files

Add "flat look" Illustrator file source

10 years agoAdd AI files for flat-look diagrams
jordanmccullough [Mon, 23 Sep 2013 21:00:45 +0000 (15:00 -0600)]
Add AI files for flat-look diagrams

10 years agoMerge branch 'gh-pages' into diagram-update-theme-fix
jordanmccullough [Tue, 24 Sep 2013 16:13:33 +0000 (10:13 -0600)]
Merge branch 'gh-pages' into diagram-update-theme-fix

Reverse merge to update out-of-date branch.

10 years agoUpdate States of Tracking diagrams with flat look
jordanmccullough [Tue, 24 Sep 2013 16:01:08 +0000 (10:01 -0600)]
Update States of Tracking diagrams with flat look

10 years agoUpdate Diff diagrams with flat look
jordanmccullough [Tue, 24 Sep 2013 04:20:54 +0000 (22:20 -0600)]
Update Diff diagrams with flat look

10 years agoUpdate Commit Three Stage Thinking diagram with flat look
jordanmccullough [Tue, 24 Sep 2013 03:42:30 +0000 (21:42 -0600)]
Update Commit Three Stage Thinking diagram with flat look

10 years agoUpdate Remotes diagram with flat look
jordanmccullough [Tue, 24 Sep 2013 02:17:02 +0000 (20:17 -0600)]
Update Remotes diagram with flat look

10 years agoMerge pull request #208 from github/foundations-title-corrections
Jordan McCullough [Mon, 23 Sep 2013 21:47:13 +0000 (14:47 -0700)]
Merge pull request #208 from github/foundations-title-corrections

Foundations Slide Deck Title Improvements

10 years agoRename RM-MV markdown filename for improved slide titles
jordanmccullough [Mon, 23 Sep 2013 21:20:06 +0000 (15:20 -0600)]
Rename RM-MV markdown filename for improved slide titles

10 years agoRename Rebase markdown filenames for improved slide titles
jordanmccullough [Mon, 23 Sep 2013 21:19:36 +0000 (15:19 -0600)]
Rename Rebase markdown filenames for improved slide titles

10 years agoRename Branch markdown filenames for improved slide titles
jordanmccullough [Mon, 23 Sep 2013 21:19:07 +0000 (15:19 -0600)]
Rename Branch markdown filenames for improved slide titles

10 years agoUpdate Rebase Interactive diagram with flat look
jordanmccullough [Mon, 23 Sep 2013 20:55:32 +0000 (14:55 -0600)]
Update Rebase Interactive diagram with flat look

10 years agoUpdate Rebase branch diagram with flat look
jordanmccullough [Mon, 23 Sep 2013 19:51:43 +0000 (13:51 -0600)]
Update Rebase branch diagram with flat look

10 years agoRevise Fast Forward Merge final step as clean-line graph
jordanmccullough [Mon, 23 Sep 2013 15:46:39 +0000 (09:46 -0600)]
Revise Fast Forward Merge final step as clean-line graph

10 years agoNFJS Atlanta Notes
Tim Berglund [Sun, 22 Sep 2013 12:14:17 +0000 (06:14 -0600)]
NFJS Atlanta Notes

10 years agoof course skalnik :muscle: :dash:
GitHub Student [Sun, 22 Sep 2013 02:29:46 +0000 (19:29 -0700)]
of course skalnik :muscle: :dash:

10 years agobaruco workshop
GitHub Student [Sun, 22 Sep 2013 02:23:43 +0000 (19:23 -0700)]
baruco workshop