Commit Graph

803 Commits

Author SHA1 Message Date
Parker Moore
a77c60365c #866 - using 'raise' instead of 'puts' for the error 2012-12-19 22:45:50 -05:00
Parker Moore
66c9ede87e Checking to see if 'git push' worked in deploy. #866. 2012-12-19 22:45:11 -05:00
Brandon Mathis
ef6d53cac3 Merge pull request #651 from xuhdev/patch-3
404 Page does not need the footer
2012-12-19 08:22:55 -08:00
Brandon Mathis
5b8d079eb7 Not showing unnecessary permalink for non linklog posts. Closes #800 2012-12-19 01:18:50 -06:00
Brandon Mathis
54ffce5611 added figcaption with source link to embeded gist code snippets 2012-12-19 00:17:47 -06:00
Brandon Mathis
280d63f18c Merge branch '2.1' of github.com:imathis/octopress into 2.1 2012-12-19 00:17:01 -06:00
Brandon Mathis
e74d73a2cd Merge pull request #862 from elithrar/patch-2
Fixes URL sent to sharing services for both posts and pages.
2012-12-18 07:03:32 -08:00
Brandon Mathis
54d038748b Merge branch '2.1' of github.com:imathis/octopress into 2.1 2012-12-17 21:14:43 -06:00
Parker Moore
b97839f0d2 Updated CHANGELOG 2012-12-17 16:56:20 -05:00
Alexander 'AlexFinn' Ivanov
02ac0408e8 Adding gauges_analytics_tracking_id to _config.yml
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2012-12-17 16:47:00 -05:00
Alexander 'AlexFinn' Ivanov
cc977ad7b2 Change _includes/head.html and adding path to gauges_analytics.html
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2012-12-17 16:47:00 -05:00
Alexander 'AlexFinn' Ivanov
bc8fa12474 Adding gauges_analytics.html
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2012-12-17 16:47:00 -05:00
Parker Moore
a81765facb Gist plugin uses raw text instead of gist JS. 2012-12-17 15:20:29 -05:00
Parker Moore
c8b118cffc Added #780 to CHANGELOG. 2012-12-17 14:14:56 -05:00
Parker Moore
dbb1487ba0 Slightly different syntax for setting server_host/_port. #780 2012-12-17 14:14:25 -05:00
Parker Moore
bb8f531d54 Using OCTOPRESS_-prefixed ENV vars. Modification to #780. 2012-12-17 14:06:45 -05:00
Parker Moore
6827f314b1 Printing HOST and PORT on rake preview 2012-12-17 13:59:35 -05:00
Max Lincoln
329d2c5bda Grab IP and PORT env vars and bind rack to both 2012-12-17 13:58:09 -05:00
Dmitry Khraponov
2cebdb91db Update .themes/classic/sass/base/_typography.scss
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2012-12-17 02:13:32 -05:00
Dmitry Kasimtsev
ecc3c05afe Merge pull request #421 from kasyaar:master
added categories into xml feed
2012-12-17 02:10:25 -05:00
Matt Silverlock
25a4fcee7e Fixes URL sent to sharing services for both posts and pages.
Checks whether the destination is a post or a page and provides the correct Liquid tags to ensure the URL submitted to Twitter, Google + or Facebook is specific to that post or page (and not just the raw URL as previously).

i.e. a share button attached to a post on the blog index would send the root URL for the site instead of the URL specific to that post.
2012-12-17 14:07:46 +08:00
Parker Moore
1d737a45c8 Merge pull request #858 from parkr/rack-unescape-urls
Rack should unescape URLs (support for non-ascii URLs)
2012-12-16 18:42:11 -08:00
Parker Moore
438c6a5095 Merge pull request #857 from parkr/generate-strict-compile
Strictly compile in :generate
2012-12-16 18:35:55 -08:00
Parker Moore
a5e3a45846 Rack should unescape submitted URLs
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-12-16 20:11:57 -06:00
Parker Moore
cb7ec73fc7 Rack should unescape submitted URLs 2012-12-16 13:29:44 -05:00
Parker Moore
7e720ebe33 rake :generate strictly compiles 2012-12-16 12:44:57 -05:00
Brandon Mathis
773be70c29 Disabled Rsync delete by default. #787 2012-10-13 15:37:03 -05:00
Brandon Mathis
0bd7f13ccf updated ruby to 1.9.3-p194 2012-10-11 23:04:48 -05:00
Brandon Mathis
4b5ffb725a Using https rather than protocol relative urls 2012-10-01 07:26:26 -05:00
Brandon Mathis
7fbb696966 Disqus ids can now be used to identify posts. 2012-09-30 16:41:43 -05:00
Brandon Mathis
340d9aea23 Merge branch '2.1' of github.com:imathis/octopress into 2.1 2012-09-29 22:48:26 -05:00
Brandon Mathis
9f7425a953 Using protocol relative URLs for Twitter, GitHub and Pinboard feeds 2012-09-29 22:48:11 -05:00
Brandon Mathis
76ae3e0a9b Merge pull request #771 from dmison/2.1-trailing_slashes_missing_from_archive_links
issue 770 - trailing slashes missing from archive links
2012-09-20 23:55:42 -07:00
Darrin Mison
62c58ad6cf issue 770 - trailing slashes missing from archive links
Signed-off-by: Darrin Mison <dmison@me.com>
2012-09-21 16:42:07 +10:00
Brandon Mathis
1a1f9905a8 Merge pull request #682 from henrik/unbreak_generate_only
[BUGFIX] Unbreak generate_only task.
2012-09-09 12:43:42 -07:00
Brandon Mathis
3f842465bd Now you can turn off titlecase on pages or posts by setting titlecase = false on the page/post YAML front matter 2012-09-08 14:37:26 -05:00
Brandon Mathis
1a96b235fc Now code blocks automatically escape liquid {{ and {% characters fixes #745 2012-09-06 11:10:32 -05:00
Brandon Mathis
c1a0d4ba52 Merge pull request #717 from rmm5t/patch-1
Typo while including custom/page_meta.html
2012-08-18 15:42:19 -07:00
Ryan McGeary
7645af6f90 Fixed typo while including custom/page_meta.html 2012-08-18 18:57:36 -03:00
Brandon Mathis
777736a8b7 Merge pull request #694 from SamWhited/2.1
Fix Twitter integration over SSL
2012-07-30 11:21:34 -07:00
Sam Whited
d4f7f10fee Fix Twitter integration over SSL 2012-07-30 14:19:43 -04:00
Henrik N
b0a60e44f3 Unbreak generate_only task.
The isolate task would overwrite the stash_dir local,
breaking the integrate task.
2012-07-22 21:15:34 +02:00
Hong Xu
feb11bfbab Remove footer in the 404 page. 2012-07-03 01:15:34 +08:00
Brandon Mathis
cf0fd14476 fixed some typos 2012-06-17 11:20:05 -05:00
Brandon Mathis
c2e14bf88e Added combined javascript to .gitignore. Rake minify now uses configuration for the source directory 2012-06-17 09:36:56 -05:00
Brandon Mathis
17368e93c4 Added minification and concatenation of Javascript files 2012-06-16 18:36:58 -05:00
Brandon Mathis
318e348163 Removed include_array plugin, replaced it with include_sidebar plugin and reorganized sidebars 2012-06-16 17:17:33 -05:00
Brandon Mathis
f1b57f39a1 Merge branch '2.1' of github.com:imathis/octopress into 2.1 2012-06-15 12:51:00 -05:00
Brandon Mathis
28e99b3c38 Added plugins/config.rb for reading and writing _config.yml. Added option to use Albino and default Python Pygments by setting pygments:true in _config.yml 2012-06-15 12:50:44 -05:00
Brandon Mathis
c3d9bf8783 Merge pull request #606 from jrothwell/2.1
[minor bugfix] 2.1: refer to page_meta.html rather than page-meta.html
2012-06-12 08:35:28 -07:00