1044 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Frederic Hemberger	ba2af4847f	Merge branch 'site' of github.com:imathis/octopress into site	2011-09-30 15:31:43 +02:00
Frederic Hemberger	362d93d938	Merge branch 'master' of github.com:imathis/octopress	2011-09-30 15:29:37 +02:00
Frederic Hemberger	2f7d9f3896	Fixes flow for sidebar three column mode	2011-09-30 15:27:06 +02:00
Brandon Mathis	bdf904adff	Retains customized favicon on update_source fixes #189, Copies index.* from source.old fixes #188	2011-09-30 08:08:07 -05:00
Brandon Mathis	46cd9656c8	updated twitter.js	2011-09-29 20:04:18 -05:00
Brandon Mathis	898b149dda	removed console.log from twitter.js #facepalm	2011-09-29 19:59:06 -05:00
Brandon Mathis	3d6cd62100	removed console.log from twitter.js #facepalm	2011-09-29 19:58:53 -05:00
Brandon Mathis	579142c28b	fixed issue with expanded twitter urls, fixed issue where twitter would report seven day old tweets as "false"	2011-09-29 19:55:23 -05:00
Brandon Mathis	ef05e67a46	fixed issue with expanded twitter urls, fixed issue where twitter would report seven day old tweets as "false"	2011-09-29 19:55:11 -05:00
Brandon Mathis	d0d1e2a98d	updated github.js to use reqwest.js with Ender	2011-09-29 16:06:09 -05:00
Brandon Mathis	6823f07f3a	updated github.js	2011-09-29 16:05:58 -05:00
Brandon Mathis	c0cc4c9d6d	updated github.js to use reqwest.js with Ender	2011-09-29 16:05:43 -05:00
Brandon Mathis	fb80e90838	Merge branch 'master' into site	2011-09-29 14:54:05 -05:00
Brandon Mathis	30d5bfca9c	Merge branch 'master' of github.com:imathis/octopress	2011-09-29 14:53:45 -05:00
Brandon Mathis	b19e7698f6	added support for adding content to the bottom of a page	2011-09-29 14:51:26 -05: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	a35c780616	Merge pull request #180 from victor/patch-1 ... Allow capitalization after a period.	2011-09-28 13:35:42 -07:00
Brandon Mathis	3bd4ed026e	Merge branch 'master' of github.com:imathis/octopress into compass	2011-09-28 14:51:24 -05:00
Victor Jalencas	f75f17b05c	Allow capitalization after a period.	2011-09-28 10:08:55 +03:00
Brandon Mathis	9cf956cc96	added buffer for mentions in twitter stream	2011-09-28 00:53:54 -05: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	9730e241b1	added node_modules to gitignore	2011-09-28 00:08:23 -05:00
Brandon Mathis	6de9c29656	added node_modules to gitignore	2011-09-28 00:08:11 -05:00
Brandon Mathis	347c954894	updated added reqwest to ender.js, fixed twitter.js url expansion bug	2011-09-27 23:51:01 -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