Permalink
Commits on Mar 5, 2012
  1. Center pause text.

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

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

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

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

    reset preso width after going full-page
    goncalossilva committed Mar 4, 2012
Commits on Mar 2, 2012
  1. presenter view: fix advancing of incremental bullet slides

    There are some global state variables that aren't correctly getting
    initialized in the presenter view. Since I'm on a tight time budget at
    the moment, just hackily forward the state from the presentation view
    to the presenter view, which fixes the defect.
    durin42 committed Mar 2, 2012
  2. presenter view: give the spawned slides window the ability to move ou…

    …r location
    
    This means that you can open the presenter view and have it spawn a
    slides window, but then make the slides window fullscreen instead of
    the presenter view (which can be a background window on another
    display). I didn't test it very much, but it seems to work well enough.
    
    This uses the horrible hack of setting an attribute on the slide
    window because otherwise the reference back to the parent window was
    sometimes (but not always) getting clobbered when showoff.js loaded in
    the child window.
    durin42 committed Feb 15, 2012
Commits on Feb 10, 2012
  1. Skip copying paths that reference external assets

    (Allows the use of google fonts with @import)
    amiel committed Feb 10, 2012
Commits on Feb 2, 2012
  1. Fixing link in README.

    steveklabnik committed Feb 2, 2012
Commits on Jan 10, 2012
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

    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
  2. Merge branch 'master' into templating

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

    * 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
    grundprinzip committed Nov 21, 2011
Commits on Nov 20, 2011
  1. 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. Merge branch 'replace-bluecloth' of https://github.com/a-team/showoff

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

    Conflicts:
    	lib/showoff.rb
    goncalossilva committed Nov 20, 2011
  4. 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. 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