| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Removed accidental call to expand_url | Brandon Mathis | 2014-02-24 | 1 | -1/+1 | |
| | | | ||||||
| * | | Ignore protocol relative '//' urls. | Brandon Mathis | 2014-02-24 | 1 | -2/+2 | |
| |/ | ||||||
| * | Merge pull request #1431 from Haacked/windows-code-page-fix | Brandon Mathis | 2014-01-30 | 1 | -0/+4 | |
| |\ | | | | | Set the codepage to 65001 before generating | |||||
| | * | chcp only needs to run once | Phil Haack | 2013-11-29 | 1 | -4/+4 | |
| | | | ||||||
| | * | Add check for running on Windows | Haacked | 2013-11-28 | 1 | -2/+4 | |
| | | | ||||||
| | * | Set the codepage to 65001 before generating | Haacked | 2013-11-28 | 1 | -0/+2 | |
| | | | ||||||
| * | | Add note about current stable version of Octopress to README. | Parker Moore | 2013-12-28 | 1 | -1/+3 | |
| | | | | | | | | | Fixes #1451. | |||||
| * | | Merge pull request #1443 from wickedshimmy/patch-1 | Parker Moore | 2013-12-19 | 1 | -1/+1 | |
| |\ \ | |/ |/| | Fix spelling error | |||||
| | * | Fix spelling error | Matt Enright | 2013-12-19 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge pull request #1397 from IQAndreas/cleanup-date | Parker Moore | 2013-11-18 | 1 | -35/+18 | |
| |\ | | | | | Call overridden version of `to_liquid` and remove duplicate code in `Octopress::Date` | |||||
| | * | Rename 'data' to 'date_attributes' | Andreas Renberg (IQAndreas) | 2013-11-18 | 1 | -4/+4 | |
| | | | | | | | | | | | Prevents ambiguity, since there is already a `date` property defined in the instance. | |||||
| | * | Call overridden version of `to_liquid` and remove duplicate code | Andreas Renberg (IQAndreas) | 2013-10-19 | 1 | -35/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to call "overidden" method which keeps us nice and compatible so we don't need to keep up with whatever Jekyll usually does, and make sure to include it in our overriden method. I have had it with these monkey-patching methods in this Monday-to- Friday language! Add method `liquid_date_attributes`. Cleanup the Post and Page overrides to be more similar. | |||||
| * | | Merge branch 'master' of github.com:imathis/octopress | Parker Moore | 2013-11-17 | 5 | -7/+7 | |
| |\ \ | | | | | | | | | | | | | | | | | | | * 'master' of github.com:imathis/octopress: removing border from iframe in jsFiddle plugin * properly escaped site title and post/page title in the RSS feeds; * consistently convert page and post titles to titlecase if site.titlecase is true; | |||||
| | * \ | Merge pull request #1400 from axiac/fixed-titlecase-usage | Parker Moore | 2013-11-17 | 4 | -6/+6 | |
| | |\ \ | | | | | | | | | Fixed titlecase usage | |||||
| | | * | | * properly escaped site title and post/page title in the RSS feeds; | Valentin VALCIU | 2013-10-28 | 2 | -2/+2 | |
| | | | | | ||||||
| | | * | | * consistently convert page and post titles to titlecase if site.titlecase ↵ | Valentin VALCIU | 2013-10-28 | 4 | -5/+5 | |
| | | | | | | | | | | | | | | | | | is true; | |||||
| | * | | | Merge pull request #1402 from vernak2539/removing_frame_from_jsFiddle_iframe | Parker Moore | 2013-11-17 | 1 | -1/+1 | |
| | |\ \ \ | | | | | | | | | | | Removing border from iframe in jsFiddle plugin | |||||
| | | * | | | removing border from iframe in jsFiddle plugin | Alex Vernacchia | 2013-10-28 | 1 | -1/+1 | |
| | | |/ / | ||||||
| * | | | | Allow no last space for gist number only in gist tag | rcmdnk | 2013-11-17 | 1 | -2/+6 | |
| |/ / / | | | | | | | | | | Closes #1394 | |||||
| * | | | Move '/.' back to first arg in :update_style | Parker Moore | 2013-11-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | Rel #1299 | |||||
| * | | | Merge pull request #1299 from blake41/master | Parker Moore | 2013-11-17 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Fix update styles rake task | |||||
| | * | | | update style rake task to copy from new sass to old sass folder. it seems ↵ | Blake Johnson | 2013-07-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | like it was backwards before which makes no sense | |||||
| * | | | | Merge pull request #1301 from masondesu/patch-1 | Parker Moore | 2013-11-17 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | Fixed typo in path to jQuery fallback | |||||
| | * | | | | Fixed typo in path to jQuery fallback | Mason Stewart | 2013-07-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | The `libs` folder was typoed as `lib` | |||||
| * | | | | | Merge pull request #1406 from TheChymera/master | Parker Moore | 2013-11-17 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | changed sidebar content color so that it does not all change color on hover | |||||
| | * | | | | | changed sidebar content color so that it does not all change color on hover. | Horea Christian | 2013-11-01 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Include timezone offset in new post template for YAML Front-Matter | J. B. Rainsberger | 2013-11-17 | 1 | -1/+1 | |
| |/ / / / / | | | | | | | | | | | | | | | | Closes #1419. | |||||
| * | | | | | Merge pull request #1405 from AlexVPopov/patch-1 | Parker Moore | 2013-10-31 | 1 | -1/+1 | |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Fix a typo in Readme.markdown | |||||
| | * | | | | Fix a typo in Readme.markdown | AlexVPopov | 2013-10-31 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1399 from aleiphoenix/master | Brandon Mathis | 2013-10-24 | 1 | -2/+1 | |
| |\ \ \ \ | |_|_|/ |/| | | | fix minor mis-spelling | |||||
| | * | | | fix minor mis-spelling | AR | 2013-10-24 | 1 | -2/+1 | |
| |/ / / | ||||||
| * | | | Removed space to fix HAML compatibility on include_code. | Brandon Mathis | 2013-10-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #1254 from kAworu/master | Brandon Mathis | 2013-10-12 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | make codeblock play nice with HAML | |||||
| | * \ \ | Merge branch 'master' of https://github.com/imathis/octopress | Alexandre Perrin | 2013-10-07 | 3 | -11/+29 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' of https://github.com/imathis/octopress | Alexandre Perrin | 2013-09-27 | 15 | -26/+46 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Fix codeblock rendering with HAML when there is a filetype defined. | Alexandre Perrin | 2013-05-11 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #1390 from pfista/master | Parker Moore | 2013-10-09 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Use a protocol-relative url to load disqus over https or http | |||||
| | * | | | | | removed superfluous parentheses | Michael Pfister | 2013-10-09 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Use a protocol-relative url to load disqus over https or http | Michael Pfister | 2013-10-09 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #1385 from imathis/aleiphoenix-fix-gist-plugin | Parker Moore | 2013-10-05 | 1 | -9/+26 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Handle Gists returning 302's | |||||
| | * | | | | | Error handling FTW | Parker Moore | 2013-10-05 | 1 | -0/+3 | |
| | | | | | | | ||||||
| | * | | | | | Clean up Gist redirection. | Parker Moore | 2013-10-05 | 1 | -14/+12 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress ↵ | Parker Moore | 2013-10-05 | 1 | -8/+24 | |
| | |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into aleiphoenix-fix-gist-plugin * 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress: fix old style gist url not found issue | |||||
| | * | | | | | fix old style gist url not found issue | AR | 2013-09-20 | 1 | -8/+24 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #1384 from kAworu/fix-disqus-over-https | Parker Moore | 2013-10-03 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix Disqus over https. | |||||
| | * | | | | | | Fix Disqus over https. | Alexandre Perrin | 2013-10-03 | 1 | -1/+1 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Forcing http:// as protocol will make Disqus fail when server over https for security reasons. | |||||
| * | | | | | | Add proper disqus identifier comment count links | Trey Hunner | 2013-09-29 | 1 | -1/+2 | |
| | |_|/ / / |/| | | | | | | | | | | | | | | Fixes #277 | |||||
| * | | | | | Merge pull request #1367 from nagimov/patch-1 | Parker Moore | 2013-09-19 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | ".git" added to sample string with SSH repository URL | |||||
| | * | | | | | ".git" added to sample string with SSH repository URL | nagimov | 2013-09-20 | 1 | -1/+1 | |
| |/ / / / / | | | | | | | | | | | | | | | | Octopress does not work with a repo URL like a "git@github.com:your_username/your_username.github.io" ("ERROR: repository not found" error appears). It is necessary to add ".git" to the end of this line. | |||||
| * | | | | | Remove .ruby-version file and add note to README regarding minimum Ruby version. | Parker Moore | 2013-09-19 | 2 | -1/+1 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | @imathis - look ok? Closes #1365. | |||||
 |
index : website/my_new_personal_website | |
| This is my current personnal website (frontend and backend) | git version control |
| aboutsummaryrefslogtreecommitdiff |