aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge pull request #243 from DandyDev/update-pelican-bootstrap3Kura2014-08-2157-567/+1589
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Updated pelican-bootstrap3 to the latest versionDaan Debie2014-08-2157-567/+1589
|/ / / /
* | | | Merge pull request #241 from wilsonfreitas/masterKura2014-08-1347-0/+4876
|\ \ \ \
| * | | | Added new theme aboutwilsonwilsonfreitas2014-08-1347-0/+4876
|/ / / /
* | | | Merge pull request #240 from tiarno/fixJustin Mayer2014-08-071-0/+0
|\ \ \ \
| * | | | renamed pygments.css from pygments.css1Tim Arnold2014-08-071-0/+0
|/ / / /
* | | | Merged in #158 manually due to massive merge conflicts. Closes #158Kura2014-08-022-1/+1
* | | | Merge pull request #235 from jreinhardt/gum_supportsKura2014-08-023-3/+83
|\ \ \ \ | |/ / / |/| | |
| * | | [gum] Add support for Juvia commentsJohannes Reinhardt2014-07-142-2/+60
| * | | [gum] Add support for Piwik AnalyticsJohannes Reinhardt2014-07-142-2/+24
|/ / /