This repository has been archived by the owner on Jan 3, 2018. It is now read-only.
Merging all changes done since November 2013 tag. #460
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Knit R intermediate bootcamp
…ome common mistakes.
Git relational structure refactor
This commit updates the table of contents to reflect the body text. Removes * Instructors and Sponsors * Other Lesson Material Adds * Page Content * Lesson Material * Site Map Also includes a minor formatting improvement, pushing the FAQ section on to a new line.
…eaks up some more long lines.
Update TOC
Using a bullet list for the table of contents
* origin/pr/346: convert print statement to print function
…ls won't have to regenerate them. 2. Modifying .gitignore to reflect this. 3. Updating the Makefile to run Jekyll exactly once.
Avoid talk about Mercurial at Git lesson
…ot remove lessons with convience function qplot
Telling people not to use a deprecated ipython option
…ructors Adding links to videos for instructors
…dows-installer * 'bc-namespaced-python' of git://tremily.us/swc-setup-windows-installer: swc-windows-installer.py: Install the sqlite3 shell swc-windows-installer.py: Generalize msysGit download link swc-windows-installer.py: Force UNIX-style \n line endings for ~/nano.rc swc-windows-installer.py: Use POSIX paths for ~/nano.rc swc-windows-installer.py: Use '~' in ~/nano.rc includes swc-windows-installer.py: Rename ~/.nanorc to ~/nano.rc swc-windows-installer.py: Install nano source syntax highlighters Conflicts: setup/swc-windows-installer.py This resolves a conflict in the Windows installer comments between my branch and changes from #389 [1]. Joon felt like we should match our suggested bootcamp installation instructions (which recommend the limited Git for Windows), but I prefer the more generic msysGit (as I explain in 4fe28c0, swc-windows-installer.py: Generalize msysGit download link, 2014-03-27). Ethan feels like it isn't a big deal either way, so I'm going with my version ;). [1]: #389
ggplot2 lesson for teaching swc assignment
Worked example of working with climate data (wrap-up to novice Python lesson)
Moving ggplot2 example into extras directory
2. Removing book.md during `make tidy`.
Simplifying Makefile and adding documentation.
update ggplot2 example README after adding ggplot examples
Avoiding confusing terminology
|
On Fri, Apr 25, 2014 at 08:35:15AM -0700, Greg Wilson wrote:
A pull request like this is basically impossible to review ;). I'll |
gvwilson
pushed a commit
that referenced
this pull request
Apr 25, 2014
Merging all changes done since November 2013 tag.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges all the changes made to
mastersince the November 2013 tag intogh-pagesfor use in upcoming bootcamps.