Permalink
Commits on Feb 2, 2012
  1. Fixing link in README.

    steveklabnik committed Feb 2, 2012
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
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
Commits on Nov 18, 2011
Commits on Nov 17, 2011
  1. Merge pull request #144 from andersjanmyr/hack_to_get_static_to_work_…

    goncalossilva committed Nov 17, 2011
    …again
    
    Get the logger instance var from showoff instance
  2. Merge pull request #146 from goncalossilva/master

    goncalossilva committed Nov 17, 2011
    cursor:pointer when hovering executable code blocks
  3. Merge pull request #136 from jcoglan/master

    goncalossilva committed Nov 17, 2011
    Make ShowOff compatible with Rack::URLMap
  4. Merge pull request #132 from bgentry/master

    goncalossilva committed Nov 17, 2011
    Add showoff:incr event for incrementing items on a slide. Fix gemspec loading issues
  5. Merge pull request #130 from rkh/patch-1

    goncalossilva committed Nov 17, 2011
    Allow irb prompt for commandline slides
  6. Merge pull request #112 from kdmsnr/pdf_options

    goncalossilva committed Nov 17, 2011
    use showoff.json to set PDFKit options
Commits on Oct 22, 2011
Commits on Oct 8, 2011
  1. use recent sinatra

    timfel committed Oct 8, 2011
  2. update sinatra version, so we can use tilt and it's preferred markdow…

    timfel committed Oct 8, 2011
    …n engine redcloth instead of bluecloth
Commits on Oct 1, 2011
Commits on Sep 28, 2011
  1. Merge pull request #135 from langalex/patch-1

    schacon committed Sep 28, 2011
    Add info about presenter notes to readme.
Commits on Sep 26, 2011
  1. Move VERSION to a separate file to fix issues with Sinatra loading du…

    bgentry committed Sep 26, 2011
    …ring gemspec evaluation
  2. Add showoff:incr event

    bgentry committed Sep 26, 2011
Commits on Sep 22, 2011
Commits on Sep 13, 2011
Commits on Sep 12, 2011
  1. Merge pull request #123 from jfinkels/no-temp-files

    schacon committed Sep 12, 2011
    fixed regression caused by ee20a61 which
  2. fixed regression caused by ee20a61 which re-enabled reading of emacs …

    jfinkels committed Sep 12, 2011
    …temporary files (i.e. ending in .md~) as presentation files
  3. 0.7 so soon? yes.

    schacon committed Sep 12, 2011
  4. forgot the image repo

    schacon committed Sep 12, 2011