Permalink
Commits on Aug 30, 2010
Commits on Aug 12, 2010
  1. No commit message

    brettgaylor committed Aug 12, 2010
Commits on Aug 9, 2010
  1. No commit message

    brettgaylor committed Aug 9, 2010
Commits on Aug 4, 2010
  1. added demo dir

    annasob committed Aug 4, 2010
  2. Merge branch '0.1' of github.com:annasob/popcorn-js

    Conflicts:
    	index.html
    annasob committed Aug 4, 2010
  3. No commit message

    brettgaylor committed Aug 4, 2010
Commits on Aug 2, 2010
  1. updated video link

    annasob committed Aug 2, 2010
Commits on Jul 7, 2010
  1. corrected some words

    annasob committed Jul 7, 2010
  2. added the rest of the transcript from scott and myself together with …

    …annas work
    Daniel Hodgin committed Jul 7, 2010
  3. added transcript from 3:09-3:58

    Daniel Hodgin committed Jul 7, 2010
Commits on Jul 6, 2010
  1. added more subtitles

    annasob committed Jul 6, 2010
  2. Merge branch '1px' of http://github.com/ScottDowne/popcorn-js into 0.1

    Conflicts:
    	index.html
    annasob committed Jul 6, 2010
  3. Merge commit '861bc3c4f27d07d8' into 0.1

    Conflicts:
    	index.html
    annasob committed Jul 6, 2010
  4. Merge branch '75' of http://github.com/ScottDowne/popcorn-js into 0.1

    Conflicts:
    	index.html
    annasob committed Jul 6, 2010
  5. Merge branch '73' of http://github.com/ScottDowne/popcorn-js into 0.1

    Conflicts:
    	index.html
    	popcorn.js
    	xml/webMadeMovies.xml
    annasob committed Jul 6, 2010
  6. Merge branch 'flickrfix' of http://github.com/ScottDowne/popcorn-js i…

    …nto 0.1
    
    Conflicts:
    	index.html
    	xml/webMadeMovies.xml
    annasob committed Jul 6, 2010
  7. Merge branch 'overlaylinkage' of http://github.com/ScottDowne/popcorn-js

     into 0.1
    
    Conflicts:
    	xml/webMadeMovies.xml
    annasob committed Jul 6, 2010
  8. Merge branch 'noGoogle' of http://github.com/ScottDowne/popcorn-js in…

    …to 0.1
    
    Conflicts:
    	index.html
    	xml/webMadeMovies.xml
    Anna Sob committed Jul 6, 2010
  9. updated video link

    annasob committed with Anna Sob Jul 6, 2010
  10. dynamic loading of images, can still override with new image in xml. …

    …overlay fade in and out
    ScottDowne committed Jul 6, 2010
Commits on Jul 5, 2010
  1. colour overlay on divs

    ScottDowne committed Jul 5, 2010
  2. merged in flickr name #73

    dhodgin committed Jul 5, 2010
  3. #77 #78 #79 all links open in new tab, subtitle formatting, and subti…

    …tles on by default
    dhodgin committed Jul 5, 2010
  4. added title to flickr

    ScottDowne committed Jul 5, 2010
Commits on Jul 2, 2010