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: codecombat/codecombat
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: yaur/codecombat
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.
  • 4 commits
  • 0 files changed
  • 1 contributor

Commits on Jan 29, 2015

  1. move removeScheme to core utils because this exact problem exists in … 

    …other

parts of the code
    @yaur
    yaur committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    9e5881b View commit details
    Browse the repository at this point in the history

  2. don't let AJAX requests get cached

    @yaur
    yaur committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    13690cd View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2015

  1. disable ajax caching globally

    @yaur
    yaur committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    870cbdb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/codecombat/codecombat 

    Conflicts:
	app/views/play/menu/GuideView.coffee
    @yaur
    yaur committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    ca41f91 View commit details
    Browse the repository at this point in the history
Loading