Permalink
Commits on Nov 21, 2011
  1. @goncalossilva
  2. @grundprinzip

    Fix PDF Options Bug

    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
    grundprinzip committed Nov 21, 2011
Commits on Nov 20, 2011
  1. @goncalossilva

    Merge branch 'asset_path_version_public_folder' of https://github.com…

    …/grundprinzip/showoff into grundprinzip-asset_path_version_public_folder
    
    Conflicts:
    	lib/showoff.rb
    goncalossilva committed Nov 20, 2011
  2. @goncalossilva

    Merge branch 'replace-bluecloth' of https://github.com/a-team/showoff

    …into a-team-replace-bluecloth
    
    Conflicts:
    	Gemfile
    goncalossilva committed Nov 20, 2011
  3. @goncalossilva

    Merge branch 'master' of github.com:schacon/showoff

    Conflicts:
    	lib/showoff.rb
    goncalossilva committed Nov 20, 2011
  4. @goncalossilva

    Merge branch 'deprecation-warnings' of https://github.com/a-team/showoff

     into a-team-deprecation-warnings
    goncalossilva committed Nov 20, 2011
Commits on Nov 19, 2011
  1. @grundprinzip

    Tests + Asset Path fixes

    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
    grundprinzip committed Nov 19, 2011
Commits on Nov 18, 2011
  1. @goncalossilva
  2. @goncalossilva
Commits on Nov 17, 2011
  1. @goncalossilva

    Merge pull request #144 from andersjanmyr/hack_to_get_static_to_work_…

    …again
    
    Get the logger instance var from showoff instance
    goncalossilva committed Nov 17, 2011
  2. @goncalossilva

    Merge pull request #146 from goncalossilva/master

    cursor:pointer when hovering executable code blocks
    goncalossilva committed Nov 17, 2011
  3. @goncalossilva

    Merge pull request #136 from jcoglan/master

    Make ShowOff compatible with Rack::URLMap
    goncalossilva committed Nov 17, 2011
  4. @goncalossilva

    Merge pull request #132 from bgentry/master

    Add showoff:incr event for incrementing items on a slide. Fix gemspec loading issues
    goncalossilva committed Nov 17, 2011
  5. @goncalossilva

    Merge pull request #130 from rkh/patch-1

    Allow irb prompt for commandline slides
    goncalossilva committed Nov 17, 2011
  6. @goncalossilva
  7. @goncalossilva

    Merge pull request #112 from kdmsnr/pdf_options

    use showoff.json to set PDFKit options
    goncalossilva committed Nov 17, 2011
Commits on Oct 22, 2011
  1. @andersjanmyr
Commits on Oct 8, 2011
  1. @timfel
  2. @timfel

    use recent sinatra

    timfel committed Oct 8, 2011
  3. @timfel

    update sinatra version, so we can use tilt and it's preferred markdow…

    …n engine redcloth instead of bluecloth
    timfel committed Oct 8, 2011
Commits on Oct 1, 2011
  1. @jcoglan
Commits on Sep 28, 2011
  1. @schacon

    Merge pull request #135 from langalex/patch-1

    Add info about presenter notes to readme.
    schacon committed Sep 28, 2011
  2. @langalex

    add info about presenter notes.

    langalex committed Sep 28, 2011
Commits on Sep 26, 2011
  1. @bgentry

    Move VERSION to a separate file to fix issues with Sinatra loading du…

    …ring gemspec evaluation
    bgentry committed Sep 26, 2011
  2. @bgentry
  3. @bgentry

    Add showoff:incr event

    bgentry committed Sep 26, 2011
  4. @bgentry
Commits on Sep 22, 2011
  1. @rkh
Commits on Sep 13, 2011
  1. @schacon

    builtin timer in presenter view

    schacon committed Sep 13, 2011
Commits on Sep 12, 2011
  1. @schacon
  2. @schacon

    Merge pull request #123 from jfinkels/no-temp-files

    fixed regression caused by ee20a61 which
    schacon committed Sep 12, 2011
  3. @jfinkels

    fixed regression caused by ee20a61 which re-enabled reading of emacs …

    …temporary files (i.e. ending in .md~) as presentation files
    jfinkels committed Sep 12, 2011
  4. @schacon

    0.7 so soon? yes.

    schacon committed Sep 12, 2011
  5. @schacon

    forgot the image repo

    schacon committed Sep 12, 2011
  6. @schacon

    test for github gen

    schacon committed Sep 12, 2011