moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2024-11-16 14:15:04 -05:00
Code Issues Releases Wiki Activity
796 Commits 12 Branches 1 Tag 3.7 MiB
fb27cae6be
Commit Graph

796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Wijas
1ac51f0950 render_partial always converts the content 
Signed-off-by: Brandon Mathis <brandon@imathis.com>
 2012-05-22 11:24:40 -05:00
Robert Wijas
82f8142cc4 render_partial - content coverting 
Signed-off-by: Brandon Mathis <brandon@imathis.com>
 2012-05-22 11:24:40 -05:00
Brandon Mathis
82386a0426 Merge branch 'master' into 2.1 
Conflicts:
	.themes/classic/source/_includes/article.html
 2012-05-22 09:28:59 -05:00
Brandon Mathis
3e3a2fcff3 Removed Gemfile.lock. Octopress will only manage the Gemfile, closes #568 2012-05-22 09:05:51 -05:00
Brandon Mathis
c9d3b0e288 Merge pull request #499 from lukekarrys/patch-1 
Don't display comments link for post excerpts on index page when comments for that post are set to false
 2012-05-21 23:13:28 -07:00
Brandon Mathis
7f7f52bcc6 updated dependencies 2012-05-22 01:11:53 -05:00
akira yamada
590b35ce4e apply "o" option to regexps to improve process time 
Signed-off-by: Brandon Mathis <brandon@imathis.com>
 2012-05-22 00:59:32 -05:00
Brandon Mathis
33073156bc removed some duplication in the pygments highlight method. Ensured the backtick codeblock would match newline characters in regex 2012-05-22 00:00:15 -05:00
Brandon Mathis
03aa250b96 Merge pull request #571 from xuhdev/2.1-404-quote-char 
weird quote character in the 404 page
 2012-05-21 21:58:05 -07:00
Brandon Mathis
b52536d72c Merge branch '2.1' of github.com:imathis/octopress into 2.1 2012-05-21 23:57:07 -05:00
Brandon Mathis
29a05c931f Added a generator meta tag. closes #465 2012-05-21 23:56:45 -05:00
Brandon Mathis
b07e533d4a Removed page content reading meta description. It was pointless. Set a description in your site or page yaml to add a meta description 
Conflicts:

	.themes/classic/source/_includes/head.html
 2012-05-21 23:54:21 -05:00
Brandon Mathis
473f721e9f Merge pull request #572 from xuhdev/sitemap-exclude-file-list 
Sitemap exclude file list
 2012-05-21 21:16:44 -07:00
Hong Xu
6cd00d865e Fix the EXCLUDED_FILES list in sitemap_generator.rb 2012-05-22 11:21:57 +08:00
Hong Xu
910734359d Fix a weird character in the 404 page. 2012-05-22 10:56:15 +08:00
Brandon Mathis
ca470417e5 Markdown/Textile escape system is more flexible and strips goofy parsing glitches much better. Fixes #500 2012-05-21 20:16:06 -05:00
Brandon Mathis
adc4e1f2ef removed an unnecessary whitespace indent adjustment from backtick codeblock 2012-05-21 20:13:43 -05:00
Brandon Mathis
eb075cbd33 removed faulty string join from code_block plugin 2012-05-21 20:13:40 -05:00
Brandon Mathis
99767a4e0c updated Gems, added more liberal definitions to gemfile 
Conflicts:

	Gemfile.lock
 2012-05-21 16:18:42 -05:00
Brandon Mathis
9fbc46abd9 Octopress filters are now limited to html producing templating languages, Fixes #536 2012-05-21 16:07:01 -05:00
Brandon Mathis
8753a6b00c Octopress filters are now limited to html producing templating languages, Fixes #536 2012-05-21 16:06:52 -05:00
Brandon Mathis
de38449d78 added 404.html to sitemap.xml exclude list. Closes #569 2012-05-21 11:29:20 -05:00
Brandon Mathis
bfa5255188 Rake new post now accepts: 
- Inline input as in `rake new_post["Your post title"]
- Input from stdin if in-line input isn't given.

This should help zhs users who've been frustrated by globbing issues.
Fixes #117
 2012-05-21 08:57:49 -05:00
Brandon Mathis
42369ddf5d fixed class name attribute on linklog posts 2012-05-20 23:40:17 -05:00
Brandon Mathis
741107291b Added 404, moved archives from /blog/archives to /archives, added migration in update_source rake task. Closes #375 2012-05-20 22:23:18 -05:00
Andrew Patton
c5e2e524f8 Fixed “3rd party plugins” wiki page link 
Signed-off-by: Brandon Mathis <brandon@imathis.com>
 2012-05-20 18:03:10 -05:00
Andrew Patton
a49651fdfd Fixed “3rd party plugins” wiki page link 
Signed-off-by: Brandon Mathis <brandon@imathis.com>
 2012-05-20 18:02:41 -05:00
Brandon Mathis
c7d74c0d82 Added instruction regarding management of _deploy/ for GitHub pages users. Removed preview mode check from deploy script 2012-05-20 17:27:27 -05:00
Nathan Manzi
e334e832de Added disqus developer mode functionality 
Signed-off-by: Brandon Mathis <brandon@imathis.com>
 2012-05-20 17:20:32 -05:00
Brandon Mathis
c06ba58466 removed some duplication from category url generation 2012-05-20 16:43:06 -05:00
Brandon Mathis
5e666bfe6b Category directory can be set to root directory. Closes #331 #369 2012-05-20 16:36:53 -05:00
Brandon Mathis
ecb1748c4e fixed issue where category layouts were using category feed xml instead of html layout 2012-05-20 16:23:08 -05:00
Avery Yen
19320018b2 Re-encoding of input string rather than force encoding. This is safer/more valid 
Signed-off-by: Brandon Mathis <brandon@imathis.com>
 2012-05-20 16:12:14 -05:00
Avery Yen
dd5f3d3fef Force code blocks to be UTF. This fixes ASCII/UTF incompatabilities. 
Signed-off-by: Brandon Mathis <brandon@imathis.com>
 2012-05-20 16:12:14 -05:00
Brandon Mathis
654a2937b8 Improvements to hosting with Github Pages: 
1. Push deployment task pulls first, avoiding a --force push
  2. Improvements to rake task setup_github_pages:
    - Now only rewrites _config.yml if in default state
    - Attempts a pull from deploy repo before setting up as a new project
    - Detects conflicts between CNAME and _config.yml url
    - Links to GitHub's help documentation for CNAME setup
Fixes #561
 2012-05-20 10:38:56 -05:00
Jeffrey Tratner
7025a1a90a changed pullquote to reflect multi-line pullquotes 
Signed-off-by: Brandon Mathis <brandon@imathis.com>
 2012-05-19 17:00:01 -05:00
Brandon Mathis
73b7e2094e Merge branch 'master' into 2.1 2012-05-19 14:56:16 -05:00
Brandon Mathis
d71223c675 updated to latest version of Sass, fixed deprecation warnings 2012-05-19 14:48:37 -05:00
Brandon Mathis
f954689bb6 Improved styling for linklog along with other scss refactoring. 
Feed urls are more flexible with linklog items
 2012-04-29 19:03:52 -05:00
Luke Karrys
8b8fff3b03 Don't display comments link for post excerpts on index page when comments for that post are set to false. 2012-03-23 13:06:01 -07:00
Brandon Mathis
8013163d00 Merge branch 'master' of github.com:imathis/octopress into linklog 2012-03-07 22:42:09 -06:00
Brandon Mathis
9f40242b1e Merge pull request #376 from robertkowalski/clrf 
Fix CRLF, closes #374
 2012-03-07 13:40:54 -08:00
Brandon Mathis
c26aa7e9a0 now per category feeds are optional (default to off) this should improve speed for the many people who don't use this feature 2012-02-19 16:27:45 -06:00
Brandon Mathis
a814ca76ea Merge branch 'master' of github.com:imathis/octopress into linklog 2012-02-19 15:12:19 -06:00
Brandon Mathis
a8c9fb8d7a Merge pull request #427 from joliss/typo 
Fix typo
 2012-02-19 11:26:41 -08:00
Brandon Mathis
b215202f1d Merge pull request #434 from nomulous/patch-1 
Github -> GitHub (capitalization)
 2012-02-19 11:25:50 -08:00
Fletcher Tomalty
4b8aeb2774 Github -> GitHub (capitalization) 2012-02-19 01:40:53 -05:00
Brandon Mathis
895504f274 added support for excerpting feed articles, added linklog support to category feed, refactored feeds to reduce duplication 2012-02-18 22:45:40 -06:00
Brandon Mathis
107a4af528 moved the category_feed out of _includes/custom to _layouts/ 2012-02-18 15:28:06 -06:00
Brandon Mathis
36bbdb6dfe fixed variable accessing permalink label in atom.xml 2012-02-18 15:01:42 -06:00