Commit Graph

5415 Commits

Author SHA1 Message Date
ChaYoung You
7db9397a9d Remove trailing whitespace 2015-02-22 20:27:15 +09:00
Parker Moore
c40272cebd Update history to reflect merge of #3492 [ci skip] 2015-02-21 14:45:42 -08:00
Parker Moore
26acb3f9d9 Merge pull request #3492 from jekyll/upgrade-tests
Upgrade tests to use Minitest
2015-02-21 14:45:27 -08:00
Parker Moore
7ad0597bff Make our own Minitest::Test subclass for further subclassing 2015-02-21 00:33:47 -08:00
Parker Moore
ace1b6b8d2 Migrate the integration tests to minitest, too 2015-02-21 00:31:25 -08:00
Parker Moore
52c4ce2a5a Finish of moving the unit tests over to Minitest 2015-02-21 00:31:07 -08:00
Parker Moore
4b59eb4175 Fix the test inheritance for the tests. 2015-02-20 13:35:02 -08:00
Parker Moore
d2b19963c1 Move from Test::Unit to Minitest. 2015-02-20 13:34:51 -08:00
Parker Moore
e240bbb1bf Update history to reflect merge of #3477 [ci skip] 2015-02-18 11:17:50 -08:00
Parker Moore
04430b2c17 Merge pull request #3477 from kleinfreund/patch-1 2015-02-18 11:17:26 -08:00
Parker Moore
80f64dea89 Update history to reflect merge of #3479 [ci skip] 2015-02-18 11:14:26 -08:00
Parker Moore
29534469c3 Merge pull request #3479 from tuzhucheng/update_doc_pagination_path 2015-02-18 11:13:36 -08:00
Michael Tu
705fdfb23d Add a '/' to paginate_path
If this '/' is not present, then the second pagination code snippet
under the "Render the paginated Posts" section will have a bug.

Let's say my page 1 is located at host:port/blog/index.html and my
paginate_path setting in _config.yml is "blog/page:num/". The
observation if the paginate_path does not start with a '/' is that the href generated for the page numbers will have 2 'blogs', i.e. for page 2 the href will
incorrectly appear as 'host:port/blog/blog/page2' instead of just
'host:port/blog/page2'.
2015-02-18 03:13:57 -05:00
Philipp Rudloff
cd1326d457 Update LICENSE to 2015.
The future is now.
2015-02-17 22:17:25 +01:00
Parker Moore
1beee0d59d Update history to reflect merge of #3475 [ci skip] 2015-02-17 13:12:27 -08:00
Parker Moore
4d0cb3345f Merge pull request #3475 from markphelps/master
Fix wording in code snippet highlighting section
2015-02-17 13:11:59 -08:00
Mark Phelps
9a0db42436 Updating Rogue description text based on feedback. 2015-02-17 15:27:15 -05:00
Mark Phelps
dbead70168 Fix wording in code snippet highlighting section 2015-02-17 08:17:45 -05:00
Alfred Xing
9caa47d164 Update history to reflect merge of #3466 [ci skip] 2015-02-16 16:25:21 -08:00
Alfred Xing
05dc4df7e4 Merge pull request #3466 from MartinRogalla/twitterLinkUpdate
Change Twitter link to link directly to @jekyllrb.
2015-02-16 16:24:54 -08:00
Alfred Xing
7fb3b096c3 Update history to reflect merge of #3464 [ci skip] 2015-02-16 13:05:15 -08:00
Alfred Xing
32cc745142 Merge pull request #3464 from willnorris/rebuild
write .jekyll-metadata even on full_rebuild
2015-02-16 13:03:45 -08:00
Martin Jorn Rogalla
9f22749ebb Change twitter link to link directly to @jekyllrb.
Changed the link on the help page to directly link to the Twitter
@jekyllrb account.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-02-15 12:51:18 +01:00
Will Norris
6e89c1c02b write .jekyll-metadata even on full_rebuild
For a full rebuild, we certainly don't want to *read* from
.jeykll-metadata, but we should still write it.  Otherwise, a subsequent
incremental build would have to do a full rebuild again since there is
no metadata file to start from.
2015-02-14 22:43:43 -08:00
Alfred Xing
fa6981fb8c Update history to reflect merge of #3457 [ci skip] 2015-02-14 10:33:36 -08:00
Alfred Xing
5f38430304 Merge pull request #3457 from penibelst/jch 2015-02-14 10:33:01 -08:00
Anatol Broder
22759edf3e Change the link 2015-02-14 14:50:35 +01:00
Parker Moore
00ec13c11b Update history to reflect merge of #3456 [ci skip] 2015-02-14 01:35:00 -08:00
Parker Moore
9b50fc9f3b Merge pull request #3456 from willnorris/draft 2015-02-14 01:34:31 -08:00
Will Norris
58dc1f77e9 add draft? method to identify if Post is a draft 2015-02-14 00:01:27 -08:00
Parker Moore
461ea2f147 Update history to reflect merge of #3455 [ci skip] 2015-02-13 20:53:18 -08:00
Parker Moore
30b42c4700 Merge pull request #3455 from jekyll/read-csv-data-with-proper-encoding 2015-02-13 20:52:34 -08:00
Parker Moore
c6d5a913f1 Site#read_data_file: read CSV's with proper file encoding
Fixes #3451.
2015-02-13 19:39:15 -08:00
Parker Moore
712d8d617d Update history to reflect merge of #3452 [ci skip] 2015-02-13 17:07:33 -08:00
Parker Moore
7c9ad82b2a Merge pull request #3452 from rtomayko/serve-strip-html-suffix 2015-02-13 17:05:22 -08:00
Ryan Tomayko
491cce7a99 Avoid requiring webrick at boot time
This is a bit uglier but allows deferring loading webrick until the
serve command is invoked as opposed to when it's required.
2015-02-12 22:16:12 -05:00
Ryan Tomayko
e99a9e5821 Custom WEBrick FileHandler for stripping .html extension
This first performs the normal static file check at the exact
location. If no file is found, attempt the check again with an
".html" suffix.

See the following for base class search_file implementation:

https://github.com/ruby/ruby/blob/4607f95/lib/webrick/httpservlet/filehandler.rb#L363-L383
2015-02-12 21:58:35 -05:00
Alfred Xing
249249f76b Update history to reflect merge of #3382 [ci skip] 2015-02-11 15:52:04 -08:00
Alfred Xing
0d602018bd Merge pull request #3382 from alfredxing/site-template-kerning 2015-02-11 15:51:34 -08:00
Alfred Xing
a907addbe2 Optimize text rendering for legibility 2015-02-11 15:45:47 -08:00
Alfred Xing
7a5a90de82 Update history to reflect merge of #3440 [ci skip] 2015-02-11 13:59:53 -08:00
Alfred Xing
a64b7e7a62 Merge pull request #3440 from tkrotoff/class-text 2015-02-11 13:58:44 -08:00
Tanguy Krotoff
0914948099 Remove class="text"
There is no class text defined in the CSS
2015-02-10 17:09:06 +01:00
Parker Moore
8fe9561f64 Update history to reflect merge of #3438 [ci skip] 2015-02-09 23:24:47 -08:00
Parker Moore
83ad59841b Merge pull request #3438 from jordanthornquest/master 2015-02-09 23:23:59 -08:00
Jordan Thornquest
33c3b41f69 Fix broken link in resources
`jordanthornque.st` should be `jordanthornquest.com`. That's been remedied!
2015-02-09 23:58:22 -07:00
Parker Moore
c08c794801 Update history to reflect merge of #3436 [ci skip] 2015-02-09 22:09:33 -08:00
Parker Moore
b81f6ed38c Merge pull request #3436 from jekyll/fix-highlight-madness 2015-02-09 22:08:33 -08:00
Parker Moore
1f503b24b3 highlight: duplicate tests for pygments for rouge
Ensure that the output we get for pygments will match
that we get for rouge in all cases except line numbers.
2015-02-09 21:57:43 -08:00
Parker Moore
bf149a0b97 highlight: fix problem with linenos and rouge.
Found by @EdMcBane in https://github.com/jekyll/jekyll/pull/3435

The strange regexp we were doing to replace the <pre><code></pre></code>
bits in the Pygments output were wreaking havoc on Rouge output
because Rouge uses <pre>'s to wrap line numbers.

To be consistent, the output from render_* should *not* include
the wrapping <div> and <pre> tags. It should just be what was
inside. We can then wrap it in our own custom tags without using
any regular expressions, as God intended. Death to regular
expressions and HTML manipulation!
2015-02-09 21:42:52 -08:00