Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #285 from octomike/master | Justin Mayer | 2015-02-12 | 2 | -9/+9 |
|\ | | | | | fix some links in built-texts | ||||
| * | built-texts: fix github link | Michael Krause | 2015-02-11 | 1 | -1/+1 |
| | | |||||
| * | built-texts: fix some https links | Michael Krause | 2015-02-11 | 2 | -8/+8 |
| | | |||||
* | | Merge pull request #276 from higebu/feature/coderwall | Justin Mayer | 2015-02-11 | 5 | -0/+29 |
|\ \ | |/ |/| | pelican-bootstrap3: Add support for coderwall badges | ||||
| * | pelican-bootstrap3: Add support for coderwall badges | Yuya Kusakabe | 2014-12-26 | 5 | -0/+29 |
| | | |||||
* | | Merge pull request #283 from cpaulik/master | Justin Mayer | 2015-01-26 | 2 | -0/+3 |
|\ \ | | | | | | | added martin pelican theme as submodule | ||||
| * | | added martin pelican submodule | Christoph Paulik | 2015-01-22 | 2 | -0/+3 |
| | | | |||||
* | | | Merge pull request #284 from robulouski/master | Justin Mayer | 2015-01-26 | 1 | -0/+0 |
|\ \ \ | |/ / |/| | | Update VoidyBootstrap theme to version 2.0 | ||||
| * | | Update VoidyBootstrap to version 2.0 | Rob Iwancz | 2015-01-26 | 1 | -0/+0 |
|/ / | |||||
* | | Merge pull request #280 from jody-frankowski/update-blue-penguin-1 | Justin Mayer | 2015-01-19 | 1 | -0/+0 |
|\ \ | | | | | | | update blue-penguin | ||||
| * | | update blue-penguin | Jody Frankowski | 2015-01-11 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #282 from lucachr/master | Justin Mayer | 2015-01-19 | 2 | -0/+3 |
|\ \ \ | | | | | | | | | Add mg theme | ||||
| * | | | Add mg theme | Luca Chiricozzi | 2015-01-18 | 2 | -0/+3 |
|/ / / | |||||
* | | | Merge pull request #281 from mozillazg/patch-1 | Kyle Fuller | 2015-01-14 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | update niu-x2 theme url from http to https | ||||
| * | | update niu-x2 theme url from http to https | mozillazg | 2015-01-14 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #279 from yuex/master | Justin Mayer | 2015-01-10 | 3 | -3/+3 |
|\ \ | | | | | | | Rename pelican-iliork to Chameleon and update to its latest commit | ||||
| * | | rename pelican-iliork to chameleon, and update to its lastest commit | Yue Xin | 2015-01-10 | 3 | -3/+3 |
|/ / | |||||
* | | Merge pull request #264 from smu/master | Justin Mayer | 2015-01-06 | 2 | -0/+17 |
|\ \ | | | | | | | Add Piwik support to simple-bootstrap theme | ||||
| * | | + piwik support for simple-bootstrab | Stefan Muthers | 2014-10-23 | 2 | -0/+17 |
| | | | |||||
* | | | Merge pull request #263 from feld/master | Justin Mayer | 2015-01-05 | 3 | -7/+7 |
|\ \ \ | | | | | | | | | Minor tuxlite_tbs updates | ||||
| * | | | Fix FEED URLs | felderado | 2014-10-17 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You're supposed to prepend FEED_DOMAIN to the FEED variables according to the documentation so you can use an external feed domain. From the docs: "Since feed URLs should always be absolute..." Also, those FEED_ATOM, etc variables were bare with no / at the beginning so they were broken. You're not supposed to be putting a / at the beginning of your FEED_ variables in pelicanconf.py. From the docs: FEED_ALL_ATOM ('feeds/all.atom.xml') | ||||
| * | | | Update tags.html | felderado | 2014-10-17 | 1 | -1/+1 |
| | | | | | | | | | | | | sort the tags; be nice to your visitors... | ||||
| * | | | Update twitter.html | felderado | 2014-10-17 | 1 | -2/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually put the title of the blog entry in the tweet. Example blog entry titled "New Blog: Pelican" The tweet generated will look like: New Blog: Pelican http://blog.feld.me/posts/2014/06/new-blog-pelican/ via @feldpos This is a much better format for your users to share | ||||
* | | | Merge pull request #111 from silb/tuxlite_tbs_fixes | Justin Mayer | 2015-01-05 | 5 | -5/+177 |
|\ \ \ | |_|/ |/| | | Tuxlite tbs fixes | ||||
| * | | Add the missing GLYPHICONS files. | Stig Inge Lea Bjørnsen | 2015-01-05 | 3 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Bootstrap style sheet references these files and uses them in responsive mode. Not including them results in HTTP 404 Not Found requests. The URLs in the style sheet have been changed to use the Pelican theme icon folder. | ||||
| * | | Use the year of the latest post for the copyright in the footer. | Stig Inge Lea Bjørnsen | 2015-01-05 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | The method for obtaining the year was copied from `pelican-bootstrap3/templates/includes/footer.html`. | ||||
| * | | Serve Twitter Bootstrap JavaScript directly for tuxlite_tbs. | Stig Inge Lea Bjørnsen | 2015-01-05 | 2 | -1/+168 |
| | | | | | | | | | | | | | | | Avoid using GitHub as a CDN for Twitter Bootstrap. The file bootstrap-collapse.js is now included as a static asset in the theme. | ||||
| * | | Make archive links work in tuxlite_tbs | Stig Inge Lea Bjørnsen | 2015-01-05 | 1 | -1/+1 |
|/ / | | | | | | | | | Since there is no default value for the variabel `ARCHIVES_URL`, it is replaced by a hard coded value of `archives.html`. | ||||
* | | Merge pull request #275 from guyru/patch-1 | Ondrej Grover | 2014-12-13 | 1 | -1/+1 |
|\ \ | | | | | | | Fix a typo in new-bootstrap2/README.rst | ||||
| * | | Fix a typo in README.rst | guyru | 2014-12-13 | 1 | -1/+1 |
|/ / | | | | | s/slitly/a slightly/ | ||||
* | | Merge pull request #273 from spinner-dev/master | Justin Mayer | 2014-12-11 | 2 | -0/+3 |
|\ \ | | | | | | | Add new theme: ptemplate | ||||
| * | | Added new template | abr4xas | 2014-12-10 | 2 | -0/+3 |
|/ / | |||||
* | | Merge pull request #272 from agarstang/bug/aboutwilson/hardcodedfeeds | Kyle Fuller | 2014-11-15 | 1 | -2/+7 |
|\ \ | | | | | | | Fix hard-coded feeds and feed urls in aboutwilson/templates/base.html | ||||
| * | | Fix hard-coded feeds and feed urls in aboutwilson/templates/base.html | Adam Garstang | 2014-11-15 | 1 | -2/+7 |
|/ / | |||||
* | | Merge pull request #271 from agarstang/bug/aboutwilson/hardcodeditems | Justin Mayer | 2014-11-11 | 1 | -9/+10 |
|\ \ | | | | | | | Fix hard-coded items in aboutwilson theme | ||||
| * | | Fixed hard-coded items in aboutwilson template | Adam Garstang | 2014-11-11 | 1 | -9/+10 |
|/ / | |||||
* | | Merge pull request #270 from lgiordani/fix_tags_feeds | Justin Mayer | 2014-11-03 | 1 | -1/+1 |
|\ \ | | | | | | | [pelican-bootstrap3] Tag feeds now use tag.slug | ||||
| * | | Tag feeds now use tag.slug | Leonardo Giordani | 2014-11-03 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #269 from lgiordani/series_plugin | Justin Mayer | 2014-11-02 | 5 | -0/+66 |
|\ \ | | | | | | | [pelican-bootstrap3] Added support for series plugin | ||||
| * | | Added support for series plugin | Leonardo Giordani | 2014-11-02 | 5 | -0/+66 |
| | | | |||||
* | | | Merge pull request #267 from lgiordani/fix_category_feeds | Justin Mayer | 2014-10-31 | 2 | -4/+5 |
|\ \ \ | |_|/ |/| | | pelican-bootstrap3: Fix category feeds and pagination | ||||
| * | | Category feeds now use category.slug | Leonardo Giordani | 2014-10-31 | 1 | -1/+1 |
| |/ | |||||
| * | Update pagination.html | Leonardo Giordani | 2014-10-28 | 1 | -3/+4 |
|/ | | | This allows the theme to follow pagination specification through PAGINATION_PATTERNS. See Issue #265 | ||||
* | Merge pull request #260 from gunchu/fix-submodules | Justin Mayer | 2014-10-16 | 2 | -1/+1 |
|\ | | | | | Fix checkout of blue-penguin and add nikhil-theme correctly | ||||
| * | fix recursive checkout prob for blue-penguin and add nikhil-theme submodule ↵ | Nikhil | 2014-10-13 | 2 | -1/+1 |
|/ | | | | correctly | ||||
* | Merge pull request #259 from gunchu/patch-1 | Alexis Metaireau | 2014-10-13 | 1 | -0/+3 |
|\ | | | | | Adding a new theme nikhil-theme as submodule. | ||||
| * | Adding a new theme nikhil-theme as submodule. | Nikhil Gupta | 2014-10-12 | 1 | -0/+3 |
|/ | |||||
* | Merge pull request #146 from pnf/master | Alexis Metaireau | 2014-09-25 | 1 | -0/+19 |
|\ | | | | | Tag and category-specific ATOM feed links in header of respective web pages | ||||
| * | Merge remote-tracking branch 'upstream/master' | Peter Fraenkel | 2014-08-21 | 578 | -1380/+76909 |
| |\ | | | | | | | | | | | | | | | | | | | Keep the latex and tag-specific feeds in bootstrap3 Conflicts: pelican-bootstrap3/templates/base.html | ||||
| * | | Enable latex plugin | Peter Fraenkel | 2013-10-23 | 1 | -0/+8 |
| | | |