Skip to content
New issue

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

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Giant Merge #150

Closed
wants to merge 23 commits into from
Closed

Giant Merge #150

wants to merge 23 commits into from

Conversation

grundprinzip
Copy link
Contributor

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 23 commits September 22, 2011 16:33
@rkh
Allow irb prompt for commandline slides
2c06683
@timfel
update sinatra version, so we can use tilt and it's preferred markdow…
313aff7 
…n engine redcloth instead of bluecloth
@timfel
use recent sinatra
4ddf2f4
@timfel
#options and #public are deprecated, use #settings and #public_folder…
5b8e113 
… instead
@grundprinzip
Fixing print CSS
96d510d 
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.
@grundprinzip
Templates
04dd4eb 
* allow templates to be configurable
* allow default template to be not present
* parsing of slide options
@grundprinzip
Templates for Statics and PDFs
ce08379 
* fixing positioning of a slide when using the onepage.css
@grundprinzip
Documentation for Templates
a838d8c
@grundprinzip
Proper formating for documentation
bad2a58
@grundprinzip
Documentation and Replacements
ea6046a 
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.
@grundprinzip
Fixing syntax highlighting in static mode and PDF output
00f52a9
@grundprinzip
Removing old init stuff
f6a82a4
@grundprinzip
Avoiding error if no @languages specified
e900701
@grundprinzip
Fixing bad logger variable in static mode
2b76bc2
@grundprinzip
Merge remote-tracking branch 'timfel/replace-bluecloth' into altmaster
a5abc87
@grundprinzip
Cleanup
53e6df7 
* Merging removal of deprecation warnings
* Adjusting code to use settings instead of options
@grundprinzip
Fixing failing tests
e685821
@grundprinzip
Merge branch 'templating' into altmaster
ec8122d 
Conflicts:
	lib/showoff.rb
@grundprinzip
Merge remote-tracking branch 'rkh/patch-1' into altmaster
1792680
@grundprinzip
Making PDF options configurable from the config file
3a68eaf
@grundprinzip
CSS reset for pages after full-page was shown
8c2c10e
@grundprinzip
Added example to example slides as required by CONTRIB.txt
2f42a88
@grundprinzip
Merge branch 'templating' into altmaster
0eaf2a0 
Conflicts:
	lib/showoff.rb
@grundprinzip
Copy link
Contributor Author

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
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@grundprinzip @rkh @timfel