Commit graph

361 commits

Author SHA1 Message Date
Michael Rose
e92c672868 Merge branch 'hotfix/updates' into develop
Conflicts:
	_config.yml
2014-01-02 11:39:36 -05:00
Michael Rose
9a139e601d Merge branch 'hotfix/updates' 2014-01-02 11:36:01 -05:00
Michael Rose
72c9bd90cc Add notes about setting site.url properly 2014-01-02 11:30:57 -05:00
Michael Rose
51d92c8aa0 Load Disqus comments properly 2014-01-02 11:23:34 -05:00
Michael Rose
7365c85e91 Add Kramdown dependency. Fixes #43 2014-01-02 11:22:49 -05:00
Michael Rose
5a86c93b9e Update site.url and exclude Gemfile.lock 2013-10-25 10:13:59 -04:00
Jim Lim
9622cc0430 exclude Gemfile from _site 2013-10-25 10:13:48 -04:00
Michael Rose
79c9622e83 Update site.url and exclude Gemfile.lock 2013-10-25 10:13:33 -04:00
Michael Rose
01c4eef341 Merge pull request #39 from jimjh/patch-1
exclude Gemfile from _site
2013-10-25 07:08:31 -07:00
Jim Lim
13acbcc52b exclude Gemfile from _site 2013-10-24 19:56:34 -07:00
Michael Rose
cbe1f91b44 Merge branch 'hotfix/documentation' into develop
Conflicts:
	assets/js/scripts.min.js
2013-09-12 08:37:13 -04:00
Michael Rose
ae02778fbb Merge branch 'hotfix/documentation' 2013-09-12 08:36:38 -04:00
Michael Rose
770e52c0a7 Update documentation 2013-09-12 08:36:28 -04:00
Michael Rose
ae06bed7ae Fix search.json url for realZ this time 2013-09-12 08:19:55 -04:00
Michael Rose
38db39977e Fix simple search path issues 2013-09-12 08:17:48 -04:00
Michael Rose
6eab0eaa0d Fix search.json url for realZ this time 2013-09-12 08:16:13 -04:00
Michael Rose
f30520be41 Fix simple search path issues 2013-09-12 08:15:56 -04:00
Michael Rose
7b26bbff4d Fix jumpy navigation on click. 2013-09-11 16:09:24 -04:00
Michael Rose
6968a18a4c Merge branch 'release/1.3.0' into develop 2013-09-11 15:33:53 -04:00
Michael Rose
67152e0eed Merge branch 'release/1.3.0' 2013-09-11 15:33:52 -04:00
Michael Rose
1b0f2506cb Document new features and fixes 2013-09-11 15:33:35 -04:00
Michael Rose
e893fd19e3 Adjust placement of .search-wrapper overlay 2013-09-11 14:50:29 -04:00
Michael Rose
ab9fe47043 Fixes #32 2013-09-11 14:49:04 -04:00
Michael Rose
8a286ecd30 Fixes #29. Close menu on click outside of it. 2013-09-11 14:43:35 -04:00
Michael Rose
31292dc888 Add search overlay background-color fallback 2013-09-11 14:42:43 -04:00
Michael Rose
5241e9f646 Style simple search overlay 2013-09-11 14:24:55 -04:00
Michael Rose
20cc1bdf8c Add simple post search overlay to nav 2013-09-11 12:12:08 -04:00
Michael Rose
7a65dbcfea Merge branch 'feature/grunt' into develop 2013-09-11 09:54:56 -04:00
Michael Rose
6a880e0cc7 Run Grunt build script 2013-09-11 09:53:44 -04:00
Michael Rose
335401167a Setup Grunt build scripts 2013-09-11 09:45:12 -04:00
Michael Rose
e8a7412d1e Merge branch 'master' into develop
# By Nerian
# Via Michael Rose (2) and Nerian (1)
* master:
  Automate post creation
2013-08-21 23:07:10 -04:00
Michael Rose
6a5d7eaedc Merge pull request #33 from Nerian/automate_post_creation
Automate post creation
2013-08-21 20:06:10 -07:00
Nerian
2eacb24dff Automate post creation 2013-08-21 17:48:38 +02:00
Michael Rose
b27140008a Merge branch 'hotfix/bugfixes' into develop 2013-08-19 10:40:31 -04:00
Michael Rose
25dc78765c Merge branch 'hotfix/bugfixes' 2013-08-19 10:40:31 -04:00
Michael Rose
0b004baaaa Fixes #31 2013-08-19 10:38:30 -04:00
Michael Rose
79a8f0f481 Fixes #30 2013-08-19 10:36:01 -04:00
Michael Rose
0bbc5e4884 Merge branch 'hotfix/schema' 2013-08-18 23:13:41 -04:00
Michael Rose
b6dbcc1f2c Merge branch 'hotfix/schema' into develop 2013-08-18 23:13:41 -04:00
Michael Rose
606eba1665 Fix blogposting schema.org markup 2013-08-18 23:13:30 -04:00
Michael Rose
83e92d6f08 Merge branch 'hotfix/code-wrap' into develop 2013-08-16 08:32:09 -04:00
Michael Rose
7bc31164fe Merge branch 'hotfix/code-wrap' 2013-08-16 08:32:08 -04:00
Michael Rose
aebc4bc732 Cleanup code syntax highlighting (Pygments, Coderay) 2013-08-16 08:31:48 -04:00
Michael Rose
e2aa4c39e3 Add syntax highlighting demo post 2013-08-16 08:11:42 -04:00
Michael Rose
f2ccd56d48 Merge branch 'hotfix/summary-large-image' into develop 2013-08-15 09:58:23 -04:00
Michael Rose
a73b926d7a Merge branch 'hotfix/summary-large-image' 2013-08-15 09:58:23 -04:00
Michael Rose
e37ef0bf0e Update Twitter Cards documentation 2013-08-15 09:58:14 -04:00
Michael Rose
4e86b51f98 Add support for Twitter card summary_large_image. Fixes #28 2013-08-15 09:38:27 -04:00
Michael Rose
043be0f26a Merge branch 'hotfix/link-post' into develop 2013-08-12 14:28:39 -04:00
Michael Rose
5b80cc1d2a Merge branch 'hotfix/link-post' 2013-08-12 14:28:38 -04:00