Permalink
Commits on Jan 24, 2012
Commits on Jan 9, 2012
  1. Merge pull request #6 from rossbruniges/master

    Pedantic but now valid HTML
    committed Jan 9, 2012
Commits on Dec 7, 2011
  1. 1. Fixed waitForMedia bug

    2. Updated r.js and require.js
    3. Fixed build system for previewer by renaming previewer.js to main.js
    committed Dec 7, 2011
  2. Fixed has() in build.js

    committed Dec 7, 2011
  3. 1. Added wrappers

    2. Fixed build file paths
    3. Makefile creates build dir
    4. gitignore for bulid dir
    committed Dec 7, 2011
  4. 1. Added make/build files for previewer

    2. As per Jon's request, removed old Makefile (thanks git)
    committed Dec 7, 2011
  5. 1. Added special attributes to scripts inserted by require bootstrap …

    …script.
    
    2. Stripped scripts out of previewer export accordingly.
    committed Dec 7, 2011
Commits on Dec 6, 2011
  1. Merge branch 't174'

    committed Dec 6, 2011
  2. fixed UI button locking

    committed Dec 6, 2011
  3. 1. Got rid of duplicate load-failed popup spawn.

    2. Fixed event manager recursive event firing failure (kind of a hack).
    3. Two routes for failed loads implemented.
    committed Dec 6, 2011
  4. Missing comma

    committed Dec 6, 2011
  5. 1. Merge remote-tracking branch 'cadecairos/t174b' into merge-t174

    2. Different model for template media timeouts
    3. Updated everything to conform to that model.
    
    Conflicts:
    	butter/src/previewer/media.js
    committed Dec 6, 2011
  6. Merge branch 't109'

    committed Dec 6, 2011
Commits on Dec 5, 2011
  1. error handling for audio and video elements getting bad src attribute…

    …s when creating a new project [#174]
    cadecairos committed Dec 5, 2011