aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #271 from agarstang/bug/aboutwilson/hardcodeditemsJustin Mayer2014-11-111-9/+10
|\ \
| * | Fixed hard-coded items in aboutwilson templateAdam Garstang2014-11-111-9/+10
|/ /
* | Merge pull request #270 from lgiordani/fix_tags_feedsJustin Mayer2014-11-031-1/+1
|\ \
| * | Tag feeds now use tag.slugLeonardo Giordani2014-11-031-1/+1
|/ /
* | Merge pull request #269 from lgiordani/series_pluginJustin Mayer2014-11-025-0/+66
|\ \
| * | Added support for series pluginLeonardo Giordani2014-11-025-0/+66
* | | Merge pull request #267 from lgiordani/fix_category_feedsJustin Mayer2014-10-312-4/+5
|\ \ \ | |_|/ |/| |
| * | Category feeds now use category.slugLeonardo Giordani2014-10-311-1/+1
| |/
| * Update pagination.htmlLeonardo Giordani2014-10-281-3/+4
|/
* Merge pull request #260 from gunchu/fix-submodulesJustin Mayer2014-10-162-1/+1
|\
| * fix recursive checkout prob for blue-penguin and add nikhil-theme submodule c...Nikhil2014-10-132-1/+1
|/
* Merge pull request #259 from gunchu/patch-1Alexis Metaireau2014-10-131-0/+3
|\
| * Adding a new theme nikhil-theme as submodule.Nikhil Gupta2014-10-121-0/+3
|/
* Merge pull request #146 from pnf/masterAlexis Metaireau2014-09-251-0/+19
|\
| * Merge remote-tracking branch 'upstream/master'Peter Fraenkel2014-08-21578-1380/+76909
| |\
| * | Enable latex pluginPeter Fraenkel2013-10-231-0/+8
| * | Restore RSS feedPeter Fraenkel2013-09-211-0/+4
| * | Category and tag-specific feedsPeter Fraenkel2013-09-211-4/+13
* | | Merge pull request #150 from tverrbjelke/masterAlexis Metaireau2014-09-253-13/+71
|\ \ \
| * | | see commit 2d81aec3b2509d56c1f3d99df3ad94a0d15d7e7dtverrbjelke2013-09-261-7/+16
| * | | see commit 2d81aec3b2509d56c1f3d99df3ad94a0d15d7e7dtverrbjelke2013-09-261-6/+29
| * | | see http://querbalken.net/howto-activate-feeding-for-pelican-blog-en.htmltverrbjelke2013-09-261-0/+26
* | | | Merge pull request #236 from makefu/gum_multi_authorsAlexis Metaireau2014-09-252-31/+39
|\ \ \ \
| * | | | gum: retab index.htmlmakefu2014-07-211-34/+34
| * | | | gum: fix indentation in index.htmlmakefu2014-07-211-8/+7
| * | | | Gum show multiple authors if there are anymakefu2014-07-212-4/+13
* | | | | Merge pull request #245 from FooSoft/masterAlexis Metaireau2014-09-241-1/+3
|\ \ \ \ \
| * | | | | Making the comments section show up for bootstrap theme correctly again if TW...Alex Yatskov2014-09-021-1/+1
| * | | | | Display comments section on articles only if DISQUS_SITENAME or FACEBOOK_APPI...Alex Yatskov2014-09-011-1/+3
* | | | | | Merge pull request #246 from bertrandbo/masterAlexis Metaireau2014-09-241-6/+5
|\ \ \ \ \ \
| * | | | | | Fix inline code tag renderingBertrand Bousquet2014-09-041-6/+5
| |/ / / / /
* | | | | | Add the blue-pinguin themeAlexis Métaireau2014-09-242-0/+3
* | | | | | Fix pelican-twitchy themeAlexis Métaireau2014-09-241-0/+0
* | | | | | Update dev-random3 to be included as a submoduleAlexis Métaireau2014-09-242-1/+1
* | | | | | Merge pull request #255 from 22decembre/patch-1Alexis Metaireau2014-09-241-0/+3
|\ \ \ \ \ \
| * | | | | | add dev-random3 theme22decembre2014-09-241-0/+3
|/ / / / / /
* | | | | | Merge pull request #250 from magopian/update-links-mnmlist-base-templateJustin Mayer2014-09-193-6/+38
|\ \ \ \ \ \
| * | | | | | update some links in mnmlist base templateMathieu Agopian2014-09-153-6/+38
* | | | | | | Merge pull request #251 from callmemagnus/patch-1Justin Mayer2014-09-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Changed URL to modernizer.jsmagnus anderssen2014-09-131-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #252 from callmemagnus/patch-2Justin Mayer2014-09-191-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | added missing piwik scriptmagnus anderssen2014-09-151-0/+1
| * | | | | | Missing end tagsmagnus anderssen2014-09-151-0/+2
|/ / / / / /
* | | | | | Merge pull request #248 from ingwinlu/patch-1Justin Mayer2014-09-111-1/+3
|\ \ \ \ \ \
| * | | | | | update .gitmodules to include pelican-twitchywinlu2014-09-111-1/+3
|/ / / / / /
* | | | | | Merge pull request #247 from lord63/masterKyle Fuller2014-09-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix a typo in Just-Read themelord632014-09-071-1/+1
|/ / / / /
* | | | | Merge pull request #244 from lazycoder-ru/masterJustin Mayer2014-08-242-0/+3
|\ \ \ \ \
| * | | | | adding new theme LazystrapDmitriy2014-08-242-0/+3
|/ / / / /
* | | | | Remove errant tags in built-text theme. Fix #238.Justin Mayer2014-08-211-2/+1