Skip to content
This repository has been archived by the owner on Aug 5, 2020. It is now read-only.

V2.0 swift jazzcat merge #117

Merged
merged 11 commits into from Mar 21, 2013
Merged

V2.0 swift jazzcat merge #117

merged 11 commits into from Mar 21, 2013

Commits on Mar 20, 2013

  1. Merge move to inline scripts by default and enable()-time loader gene… 

    …ration into jazzcat.
    Roman Rudenko committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    2d8b2e9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v2.0' into v2.0-swift-jazzcat-merge 

    Conflicts:
	tests/old/index.html
    @jansepar
    jansepar committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    fe7e442 View commit details
    Browse the repository at this point in the history

  3. Cleaning up merge, but Roman's regular expression is not functioning.… 

    … Committing and passing onto him to fix.

Merge branch 'v2.0-swift-feature-branch' into v2.0-swift-jazzcat-merge

Conflicts:
	src/jazzcat.js
    @jansepar
    jansepar committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    fa630ac View commit details
    Browse the repository at this point in the history

  4. Some jazzcat cleanup, fixing swift example

    @jansepar
    jansepar committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    2f1794e View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2013

  1. Fix Jazzcat thx to Roman!

    @jansepar
    jansepar committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    973cc1c View commit details
    Browse the repository at this point in the history

  2. Bringing in old jazzcat tests. 4/6 pass for now.

    @jansepar
    jansepar committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    380e48d View commit details
    Browse the repository at this point in the history

  3. Migrating existing 1.1 jazzcat tests into 2.0.

    @jansepar
    jansepar committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    fb288e6 View commit details
    Browse the repository at this point in the history

  4. Some initial work on cold cache test.

    @jansepar
    jansepar committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    aa7fc30 View commit details
    Browse the repository at this point in the history

  5. Remove debugger

    @jansepar
    jansepar committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    547eaba View commit details
    Browse the repository at this point in the history

  6. Sorry Zepto, I forgot to add you. It was me, not you.

    @jansepar
    jansepar committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    636a52f View commit details
    Browse the repository at this point in the history

  7. Fixing cold cache test in a way that bring shame upon my village. The… 

    …se tests will need some love in the future, but for now, at least the cover the basics.
    @jansepar
    jansepar committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    49bec13 View commit details
    Browse the repository at this point in the history