Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Giant Merge #150

Closed
wants to merge 23 commits into
from

Conversation

Projects
None yet
3 participants
Contributor

grundprinzip commented Nov 14, 2011

In case you want to merge the fixes and improvements from
#149, #143, #144, #139, #140, #130, #112, #126

this is the merged tree with all changes. :)

rkh and others added some commits Sep 22, 2011

@rkh rkh Allow irb prompt for commandline slides 2c06683
@timfel timfel update sinatra version, so we can use tilt and it's preferred markdow…
…n engine redcloth instead of bluecloth
313aff7
@timfel timfel #options and #public are deprecated, use #settings and #public_folder…
… instead
5b8e113
@timfel timfel use recent sinatra 4ddf2f4
@grundprinzip grundprinzip Fixing print CSS
When printing the CSS file paths need to be rewritten
to match the absolute URIs used in PDFKit. In addition, it
is required to configure the print media style or 
the output will be buggy. 

In print mode, the position of the slide needs to be 
set explicitly to "relavtive" or more explict styling 
in the slide container will fail in print mode.
96d510d
@grundprinzip grundprinzip Templates
* allow templates to be configurable
* allow default template to be not present
* parsing of slide options
04dd4eb
@grundprinzip grundprinzip Templates for Statics and PDFs
* fixing positioning of a slide when using the onepage.css
ce08379
@grundprinzip grundprinzip Documentation for Templates a838d8c
@grundprinzip grundprinzip Proper formating for documentation bad2a58
@grundprinzip grundprinzip Documentation and Replacements
Replaced the ###CONTENT### string with something 
that does not break in Markdown :). Furthermore now
multiple replacements can be used in the slides, the 
documentation is in the README.
ea6046a
@grundprinzip grundprinzip Fixing syntax highlighting in static mode and PDF output 00f52a9
@grundprinzip grundprinzip Removing old init stuff f6a82a4
@grundprinzip grundprinzip Avoiding error if no @languages specified e900701
@grundprinzip grundprinzip Fixing bad logger variable in static mode 2b76bc2
@grundprinzip grundprinzip Merge remote-tracking branch 'timfel/replace-bluecloth' into altmaster a5abc87
@grundprinzip grundprinzip Cleanup
* Merging removal of deprecation warnings
* Adjusting code to use settings instead of options
53e6df7
@grundprinzip grundprinzip Fixing failing tests e685821
@grundprinzip grundprinzip Merge branch 'templating' into altmaster
Conflicts:
	lib/showoff.rb
ec8122d
@grundprinzip grundprinzip Merge remote-tracking branch 'rkh/patch-1' into altmaster 1792680
@grundprinzip grundprinzip Making PDF options configurable from the config file 3a68eaf
@grundprinzip grundprinzip CSS reset for pages after full-page was shown 8c2c10e
@grundprinzip grundprinzip Added example to example slides as required by CONTRIB.txt 2f42a88
@grundprinzip grundprinzip Merge branch 'templating' into altmaster
Conflicts:
	lib/showoff.rb
0eaf2a0
Contributor

grundprinzip commented Nov 18, 2011

Since some of the changes were already pulled, I will close this request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment