Commits on May 17, 2012
  1. @goncalossilva

    Merge pull request #183 from jcoglan/master

    Running under nginx+passenger throws an encoding error
    goncalossilva committed May 17, 2012
  2. @jcoglan
  3. @jcoglan
Commits on May 13, 2012
  1. @jcoglan
Commits on May 10, 2012
  1. @russellb
Commits on Mar 9, 2012
  1. @goncalossilva

    Merge pull request #174 from matschaffer/master

    Avoid trying to load images from FS root.
    goncalossilva committed Mar 9, 2012
  2. @matschaffer
Commits on Mar 6, 2012
  1. @goncalossilva
  2. @goncalossilva
  3. @goncalossilva

    Merge pull request #170 from durin42/fix-incremental-slides-on-presen…

    …ter-view
    
    Fix incremental slides on presenter view
    goncalossilva committed Mar 5, 2012
  4. @goncalossilva

    Merge pull request #169 from durin42/control-presenter-from-slides

    presenter view: give the spawned slides window the ability to move our location
    goncalossilva committed Mar 5, 2012
  5. @goncalossilva
  6. @goncalossilva
  7. @goncalossilva

    Fix #167.

    goncalossilva committed Mar 6, 2012
Commits on Mar 5, 2012
  1. @goncalossilva
  2. @goncalossilva
  3. @goncalossilva
  4. @goncalossilva
  5. @goncalossilva
  6. @goncalossilva
  7. @goncalossilva
  8. @goncalossilva

    Indentation.

    goncalossilva committed Mar 5, 2012
  9. @goncalossilva
  10. @goncalossilva

    Merge branch 'master' of https://github.com/amiel/showoff into amiel-…

    …master
    
    Conflicts:
    	lib/showoff.rb
    goncalossilva committed Mar 5, 2012
  11. @goncalossilva

    Merge branch 'patch-1' of https://github.com/steveklabnik/showoff int…

    …o steveklabnik-patch-1
    
    Conflicts:
    	README.rdoc
    goncalossilva committed Mar 5, 2012
  12. @goncalossilva

    Whitespace.

    goncalossilva committed Mar 5, 2012
  13. @goncalossilva
  14. @goncalossilva
  15. @goncalossilva
  16. @goncalossilva
  17. @goncalossilva

    Merge pull request #158 from byroot/fix-css-parsing

    Better Regexp for extracting urls from css files
    goncalossilva committed Mar 5, 2012
  18. @goncalossilva
  19. @goncalossilva

    Merge branch 'tests-run-without-pdfkit-or-rmagick-installed' of https…

    …://github.com/alexch/showoff into alexch-tests-run-without-pdfkit-or-rmagick-installed
    
    Conflicts:
    	test/basic_test.rb
    goncalossilva committed Mar 5, 2012
  20. @goncalossilva
  21. @goncalossilva

    Center pause text.

    goncalossilva committed Mar 5, 2012