Commit Graph

729 Commits

Author SHA1 Message Date
Frederic Hemberger
23a3efc7f1 Add reference to Liquid tags and 'more' comment, closes #254 2011-12-10 12:58:42 +01:00
Frederic Hemberger
5ae24737c9 Clarify RVM/rbenv relation, add to installation instructions. Closes #313,#306. 2011-12-10 12:17:12 +01:00
Brandon Mathis
1eed72762d Merge pull request #287 from treyhunner/fix/line-wrap-after-code
Fix/line wrap after code
2011-11-19 19:58:43 -08:00
Trey Hunner
ffb31492d2 Fix wrapping in and around code elements 2011-11-17 10:21:14 -08:00
Frederic Hemberger
665737f3fe Merge pull request #268 from marutanm/patch-1
Summary of Video Tag
2011-11-10 22:35:01 -08:00
marutanm
e3126f7502 Fix brief overview of HTML5 Video Tag 2011-11-11 08:39:04 +09:00
Frederic Hemberger
97903baab3 Fix missing 'blockquote' in example, closes #229 2011-10-18 17:51:36 +02:00
Frederic Hemberger
ba2af4847f Merge branch 'site' of github.com:imathis/octopress into site 2011-09-30 15:31:43 +02:00
Brandon Mathis
666284dfa1 updated to latest octopress 2011-09-29 14:51:22 -05:00
Brandon Mathis
0e4b0d725a added support for adding content to the bottom of a page 2011-09-29 14:51:09 -05:00
Frederic Hemberger
26aa0c7272 Merge branch 'site' of github.com:imathis/octopress into site
Conflicts:
	Rakefile
2011-09-29 09:24:21 +02:00
Brandon Mathis
b75feaf207 updated twitter.js 2011-09-28 00:53:44 -05:00
Brandon Mathis
9477747f6b added buffer for mentions in twitter stream 2011-09-28 00:53:31 -05:00
Brandon Mathis
6de9c29656 added node_modules to gitignore 2011-09-28 00:08:11 -05:00
Brandon Mathis
95bf97e219 update ender and twitter js 2011-09-27 23:50:46 -05:00
Brandon Mathis
89ff181c38 updated added reqwest to ender.js, fixed twitter.js url expansion bug 2011-09-27 23:50:08 -05:00
Brandon Mathis
5f81677cf5 updated rsync user 2011-09-27 16:27:52 -05:00
Brandon Mathis
45d5d64b0d Merge branch 'master' into site 2011-09-27 16:22:38 -05:00
Brandon Mathis
04586299b1 fixed github line numbering issue, fixed a few bugs in code block styling 2011-09-27 00:58:07 -05:00
Brandon Mathis
0b74084cd7 updated to latest octopress 2011-09-27 00:58:01 -05:00
Brandon Mathis
63d642d017 fixed github line numbering issue, fixed a few bugs in code block styling 2011-09-27 00:57:45 -05:00
Brandon Mathis
02433114c5 Merge branch 'master' of github.com:imathis/octopress 2011-09-26 09:12:03 -05:00
Brandon Mathis
7a7825f667 collapse sidebar is now possible site-wide 2011-09-26 09:11:40 -05:00
Brandon Mathis
3a967a6b1e updated to latest octopress 2011-09-26 09:11:30 -05:00
Brandon Mathis
96cdce5c30 collapse sidebar is now possible site-wide 2011-09-26 09:11:14 -05:00
Brandon Mathis
9f7329b049 Merge branch 'master' of github.com:imathis/octopress into site 2011-09-26 08:59:32 -05:00
Frederic Hemberger
fdf6af1d25 Fixes img tag properties 2011-09-26 15:58:14 +02:00
Frederic Hemberger
a032598c58 Merge branch 'master' into site
Conflicts:
	Rakefile
2011-09-26 15:49:02 +02:00
Brandon Mathis
f7b3a303c9 Merge branch 'site' of github.com:imathis/octopress into site 2011-09-26 08:40:18 -05:00
Brandon Mathis
9af74d3a47 updated to latest octopress 2011-09-26 08:35:06 -05:00
Brandon Mathis
2afb62b297 Merge branch 'master' into site
Conflicts:
	Rakefile
2011-09-26 08:34:50 -05:00
Brandon Mathis
ceb3a7da83 updated sit source 2011-09-26 07:56:46 -05:00
Brandon Mathis
fd1c54bae6 Merge branch 'master' into site 2011-09-26 07:55:42 -05:00
Frederic Hemberger
ab62bb9355 jsHint'ed octopress.js 2011-09-26 14:41:39 +02:00
Frederic Hemberger
569717abdc jsHint'ed github.js 2011-09-26 14:37:01 +02:00
Frederic Hemberger
40a7809d65 Fixes delicious integration #179 2011-09-26 14:19:47 +02:00
Frederic Hemberger
167db49940 Refactores twitter widget
- Order of code: Define functions first before using them
- Fixed issues found by jsHint (http://jshint.com)
- Switched to Twitter's current API url
- Expand shortened urls, fixes #165
2011-09-26 13:53:12 +02:00
Frederic Hemberger
64ee87a966 Added documentation for jsfiddle tag 2011-09-26 12:41:40 +02:00
Frederic Hemberger
2f07c2f0c9 Updated documentation of img tag 2011-09-26 12:41:17 +02:00
Frederic Hemberger
19a646b5e9 Escapes double quotes in img tag 2011-09-26 11:55:43 +02:00
Frederic Hemberger
9bd572ffdc Adds jsFiddle plugin 2011-09-26 11:51:44 +02:00
Frederic Hemberger
50eaf98c24 Makes img tag more flexible, adds support for relative paths. Includes pull request #145, fixes #161 2011-09-26 11:00:35 +02:00
Frederic Hemberger
8c5ce51b3f Merge pull request #178 from matrixagent/patch-1
Changed rsync deployment so the ssh port is configurable as well.
2011-09-25 22:50:56 -07:00
Brandon Mathis
d1e5c45e79 Ender.js is now loaded locally instead of hotlinking 2011-09-25 21:31:22 -05:00
Brandon Mathis
eade4fc0d5 now layouts or pages can specify "sidebar: collapse" in the yaml front matter for an always collapsed sidebar 2011-09-25 21:31:18 -05:00
Brandon Mathis
8ff71da80a now layouts or pages can specify "sidebar: collapse" in the yaml front matter for an always collapsed sidebar 2011-09-25 21:30:55 -05:00
Brandon Mathis
8abc271e5d Ender.js is now loaded locally instead of hotlinking 2011-09-25 21:29:53 -05:00
Manu
af1f2af48f Typo. 2011-09-26 00:16:15 +03:00
Manu
a4177e1471 Changed it so the ssh port is configurable as well. (As I ran into the same issue already described at https://github.com/imathis/octopress/issues/30 ) 2011-09-26 00:13:42 +03:00
Brandon Mathis
c26e5c3be9 Merge branch 'master' of github.com:imathis/octopress 2011-09-25 09:15:14 -05:00