Permalink
Commits on Mar 5, 2012
  1. Merge branch 'tests-run-without-pdfkit-or-rmagick-installed' of https…

    goncalossilva committed Mar 5, 2012
    …://github.com/alexch/showoff into alexch-tests-run-without-pdfkit-or-rmagick-installed
    
    Conflicts:
    	test/basic_test.rb
  2. Center pause text.

    goncalossilva committed Mar 5, 2012
  3. Merge branch 'feature-pause-screen' of https://github.com/kbl/showoff

    goncalossilva committed Mar 5, 2012
    …into kbl-feature-pause-screen
    
    Conflicts:
    	example/showoff.json
    	lib/showoff.rb
  4. Merge branch 'markdown_config' of https://github.com/grundprinzip/sho…

    goncalossilva committed Mar 5, 2012
    …woff into grundprinzip-markdown_config
    
    Conflicts:
    	lib/showoff_utils.rb
  5. Merge pull request #149 from grundprinzip/templating

    goncalossilva committed Mar 5, 2012
    Templating + Fixes for Static and PDF Generation
Commits on Mar 4, 2012
  1. Merge pull request #126 from justone/reset_after_full_page

    goncalossilva committed Mar 4, 2012
    reset preso width after going full-page
Commits on Dec 15, 2011
  1. getting pause msg setting property

    kbl committed Dec 15, 2011
  2. toggling only pause screen

    kbl committed Dec 15, 2011
  3. styling for pause screen

    kbl committed Dec 15, 2011
  4. pause screen keybinding sketch

    kbl committed Dec 15, 2011
Commits on Nov 23, 2011
Commits on Nov 21, 2011
  1. Fix PDF Options Bug

    grundprinzip committed Nov 21, 2011
    The pdf_options call in ShowOff::pdf was missing the working directory for the current presentation. Adding this call revealed a bug in get_config_options about non-existing keys.
    
    * added settings.pres_dir to ShowOffUtils::showoff_pdf_options
    * fixed default value bug in ShowOffUtils::get_config_option
  2. Merge branch 'master' into templating

    grundprinzip committed Nov 21, 2011
    Conflicts:
    	lib/showoff.rb
  3. Making markdown engine configurable per slideshow

    grundprinzip committed Nov 21, 2011
    * allows to configure the markdown engine in the showoff.json
    * allows to use math mode for slides if applicable
    * documentation on how to use other markdown engines
Commits on Nov 20, 2011
  1. Merge branch 'asset_path_version_public_folder' of https://github.com…

    goncalossilva committed Nov 20, 2011
    …/grundprinzip/showoff into grundprinzip-asset_path_version_public_folder
    
    Conflicts:
    	lib/showoff.rb
  2. Merge branch 'replace-bluecloth' of https://github.com/a-team/showoff

    goncalossilva committed Nov 20, 2011
    …into a-team-replace-bluecloth
    
    Conflicts:
    	Gemfile
  3. Merge branch 'master' of github.com:schacon/showoff

    goncalossilva committed Nov 20, 2011
    Conflicts:
    	lib/showoff.rb
  4. Merge branch 'deprecation-warnings' of https://github.com/a-team/showoff

    goncalossilva committed Nov 20, 2011
     into a-team-deprecation-warnings
Commits on Nov 19, 2011
  1. Tests + Asset Path fixes

    grundprinzip committed Nov 19, 2011
    I could not execute the tests because of the following reasons:
    
    1) the get_options() method did not handle the fact that sometimes there is no config file
    2) my sinatra version requires public to be not a member variable
    
    In Addition I could not execute the showoff executable from the trunk since it uses ShowOff::VERSION, but one of the previous merges of a pull request made this to SHOWOFF_VERSION
  2. Merging schacon/master

    grundprinzip committed Nov 19, 2011
Commits on Nov 18, 2011