Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jamesshore/lets_code_javascript
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: william-s/lets_code_javascript
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 4 files changed
  • 1 contributor

Commits on Aug 22, 2012

  1. Created a basic package.json and outlined steps for finishing task

    @william-s
    william-s committed Aug 22, 2012
    Configuration menu
    Copy the full SHA
    9e23de6 View commit details
    Browse the repository at this point in the history

  2. cheat and update version number to integrate, update todo

    @william-s
    william-s committed Aug 22, 2012
    Configuration menu
    Copy the full SHA
    83ce549 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into integration 

    # By William Sherer (2) and James Shore (1)
* master:
  cheat and update version number to integrate, update todo
  Created a basic package.json and outlined steps for finishing task
  Updated to-do list
    @william-s
    william-s committed Aug 22, 2012
    Configuration menu
    Copy the full SHA
    c862403 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2012

  1. Merging changes from upstream/master (episode 17-19)

    @william-s
    william-s committed Aug 23, 2012
    Configuration menu
    Copy the full SHA
    beda741 View commit details
    Browse the repository at this point in the history

  2. Relax node version to 0.8.5

    @william-s
    william-s committed Aug 23, 2012
    Configuration menu
    Copy the full SHA
    dcb65cc View commit details
    Browse the repository at this point in the history

  3. Bump version, todos and clean up

    @william-s
    william-s committed Aug 23, 2012
    Configuration menu
    Copy the full SHA
    fe38ee6 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2012

  1. quick update to todo

    @william-s
    william-s committed Sep 1, 2012
    Configuration menu
    Copy the full SHA
    e69f9ce View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2012

  1. Merge 'upstream/integration' - ep 22 

    Conflicts:
	Jakefile.js
	src/server/_server_test.js
	src/server/server.js
	todo.txt
    @william-s
    william-s committed Sep 4, 2012
    Configuration menu
    Copy the full SHA
    6c15ab5 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2012

  1. Merge 'upstream/integration' ep 27

    @william-s
    william-s committed Sep 12, 2012
    Configuration menu
    Copy the full SHA
    eafa04b View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2012

  1. Merge changes up to ep 32, start of FE dev

    @william-s
    william-s committed Oct 15, 2012
    Configuration menu
    Copy the full SHA
    a26acd0 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2012

  1. Minor todo change

    @william-s
    william-s committed Nov 14, 2012
    Configuration menu
    Copy the full SHA
    fb2ac5c View commit details
    Browse the repository at this point in the history

  2. Merge upstream through episode 50

    @william-s
    william-s committed Nov 14, 2012
    Configuration menu
    Copy the full SHA
    1dfef86 View commit details
    Browse the repository at this point in the history
Loading