1005 Commits

Author SHA1 Message Date
Jon Frisby
5f7dee2caa Update clean/clobber tasks to get JS assets and be more informative about what's going on. 2013-04-10 09:58:04 -07:00
Brandon Mathis
21cd6de44a Sinatra now correctly returns code 404 when a page is not found. Closes #1198 2013-04-09 16:35:54 -05:00
Brandon Mathis
5ef1705a33 updated classic theme configuration to support the latest pagination updates 2013-04-09 14:45:16 -05:00
Brandon Mathis
2a647fa804 Updated Jekyll (1.0.0.beta4) and other gems. Added new pagination_path feature to blog index template 2013-04-09 14:42:37 -05:00
Brandon Mathis
96f80ccfc2 Fixed typo in regex for pygments code 2013-04-09 12:11:50 -05:00
Brandon Mathis
845c34cecf Added github.io support 2013-04-09 12:03:47 -05:00
Brandon Mathis
269bc27acb Allow any non-whitespace character in language types for pygments code highlighting. Addresses #1166 2013-04-09 09:20:45 -05:00
Brandon Mathis
f17e6cb15d removed unncessary pagination plugin 2013-04-09 09:14:05 -05:00
Parker Moore
ee6f68526d :dependencies => :globals in :require_js configuration 2013-04-05 18:28:25 +02:00
Parker Moore
84aa44b77d Configuration[:require_js][:globals] wasn't named such. renamed to fix 2013-04-05 16:45:37 +02:00
Parker Moore
d3606e20b6 Update to Jekyll v1.0.0.beta3. 2013-04-05 16:44:55 +02:00
Brandon Mathis
f4d68f82d3 Added update_configs task to update configurations for a theme 2013-04-03 19:59:13 -05:00
Parker Moore
1a4b0f24f3 Use rspec for testing 2013-04-03 01:27:03 +02:00
Parker Moore
f4368e7ccc Merge pull request #1174 from MrJoy/config_singleton_take3
Make Octopress only load its configs once per process.
2013-04-02 16:10:25 -07:00
Brandon Mathis
b1d7550556 Updates to javascript
- Changed require.yml config from dependencies to globals (more obvious what it means)
- Updated js_asset_manager to work with new require.yml
- Fixed a few bugs in octopress.js related to mobile nave and flash movies.
2013-04-02 16:24:13 -05:00
Parker Moore
9f3407906e Merge pull request #1176 from MrJoy/update_dependencies_take2
Updating deps.  Notable changes:
2013-04-02 13:33:26 -07:00
Parker Moore
f430bd82da Merge pull request #1115 from imathis/colorize
Colorize Terminal Errors/Warnings
2013-04-02 11:53:31 -07:00
Jon Frisby
b5dc3367de Updating deps. Notable changes:
chunky_png:
* Fixed an error n 4-bit resampling code.

fast-stemmer:
* Fixed to work with compilers other than gcc.

fssm:
* Remove deprecation message.
* Fix to work with JRuby.

haml:
* Fix for line numbers reported from exceptions in nested blocks.

kramdown:
* BREAKING CHANGE: Code language is now specified via .language-CODELANG instead of lang='CODELANG'
  * See this page for explanation: http://kramdown.rubyforge.org/news.html
2013-04-01 22:20:37 -07:00
Jon Frisby
f642675c89 Make Octopress only load its configs once per process. 2013-04-01 21:40:59 -07:00
Parker Moore
72837700f9 Merge pull request #1164 from xuhdev/patch-2
Ignore assets.old
2013-04-01 12:30:32 -07:00
Hong Xu
550b2af6be Ignore assets.old 2013-03-29 11:32:37 -07:00
Parker Moore
759b19908e Merge pull request #1124 from imathis/jekyll-1.0
Integrate Jekyll 1.0
2013-03-26 05:12:56 -07:00
Parker Moore
8505d8b38e Use Comparable#max like a real rubyist. C'mon guys. 2013-03-25 17:04:33 +01:00
Parker Moore
5d6537c602 Using the paginaton generator from Jekyll's repo. 2013-03-25 16:57:09 +01:00
Parker Moore
4f222317bd IncludeTag is now namespaced under the Jekyll::Tags module. 2013-03-25 16:56:44 +01:00
Parker Moore
e5be488267 Merge pull request #1140 from sursh/2.1
Change kill signal so grandchildren processes end.
2013-03-25 07:12:40 -07:00
Parker Moore
ed08359d90 Merge pull request #1142 from willchan/SchemeRelativeFixes2.1
Fix disqus to use scheme relative URLs
2013-03-25 06:45:16 -07:00
Parker Moore
cb0c6b7b86 Use Jekyll::Site's new helper method to instantiate subclasses of a constant 2013-03-25 09:20:34 +01:00
William Chan
bdc5bbd869 Fix disqus to use scheme relative URLs 2013-03-23 06:51:16 +00:00
Sasha Laundy
2ca93cf4c3 Change kill signal so grandchildren processes end. 2013-03-22 20:59:14 -04:00
Parker Moore
b28fc09372 Merge pull request #1137 from willchan/SchemeRelativeFixes2.1
Scheme relative fixes
2013-03-21 10:21:33 -07:00
William Chan
ec4c9d57cd Use scheme relative URLs. 2013-03-21 16:20:01 +00:00
William Chan
e0dacd6870 Don't expand scheme relative urls 2013-03-21 16:15:13 +00:00
Parker Moore
5f40449500 Print stack trace from Jekyll in development mode. 2013-03-20 23:54:18 +01:00
Parker Moore
8aa23ebe65 Using Jekyll beta2. 2013-03-20 23:43:18 +01:00
Brandon Mathis
eadf386cec Improved UX for setup_github_pages task a bit more (these things are important). 2013-03-19 00:13:29 -05:00
Brandon Mathis
a106f549ae Merge pull request #1128 from xuhdev/patch-1
Ignore /source/javascripts/build/
2013-03-18 14:21:05 -07:00
Hong Xu
0bb54fbdf5 Ignore /source/javascripts/build/ 2013-03-18 11:25:56 -07:00
Brandon Mathis
940064cac6 Ensure that Octopress.env can be set by ENV, _config/defaults/jekyll.yml and _config/site.yml 2013-03-18 02:00:30 -05:00
Brandon Mathis
463e4a7656 Moved javascript generation out of js_assets plugin and into generate task 2013-03-18 01:59:46 -05:00
Joe Lencioni
d3525f0769 Allow scss line comments in development
These line comments point to the original source file for each selector
in the compiled scss files, which is very helpful when working with your
styles. Allowing them to be rendered in development should make theme
development much easier.
2013-03-18 01:32:30 -05:00
Joe Lencioni
d483912e4b Improve previewing
Previewing is typically done to verify a change to content, a plugin, or
a theme. In most of these cases, the person previewing will want to
re-generate before previewing. This commit adds a call to the `generate`
task from within the `preview` task to ensure that the newest content
will be previewed.

Additionally, since previewing is often done to verify changes to
themes, it can be helpful to be able to see un-minified assets. This
commit also sets a default value of 'development' to the `OCTOPRESS_ENV`
environment value, which is used when making decisions as to how assets
are compiled. This currently prevents the minification of the compiled
scss.

I also trimmed some trailing whitespace in the Rakefile.
2013-03-18 01:32:30 -05:00
Brandon Mathis
fa105ce68d Fixed spacing and wording on rake setup_github_pages task feedback 2013-03-18 01:14:23 -05:00
Brandon Mathis
56660dea6b Improvements to setup_github_pages task:
- Fixes issues with undefined variables
- Task feedback has been improved with colorized output and better wording.
- Configs are written to site.yml if necessary
- Help urls for custom domains have been updated

Fixes #1015
2013-03-18 01:06:29 -05:00
Brandon Mathis
39fca91b69 fixed example comments in image_tag plugin 2013-03-17 23:56:46 -05:00
Brandon Mathis
6d4526d340 Video tag plugin now supports relative urls. Closes #1127 2013-03-17 23:52:35 -05:00
Brandon Mathis
4f9fcbb886 Now image tag plugin supports relative urls. Improvements to alk attr and title attr support. Closes #724 2013-03-17 23:52:12 -05:00
Brandon Mathis
4dfdfb80c2 Fix: task set_root_dir now works properly and outputs rewritten configuration on success 2013-03-17 23:46:53 -05:00
Brandon Mathis
50e6a1ed04 Fixed issue where rake update would recursively copy stylesheets/custom 2013-03-17 23:46:53 -05:00
Parker Moore
f7d571ebb4 Merge branch '2.1' of github.com:imathis/octopress into 2.1
* '2.1' of github.com:imathis/octopress:
  Updating the classic theme should work again
2013-03-17 15:27:53 +01:00