aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #561 from schtobia/for_upstreamJustin Mayer2017-10-111-7/+52
|\ | | | | Just Read: Extended metadata
| * Just Read: Added rel link for faviconTobias Schmidl2017-10-111-1/+2
| |
| * Just Read: Fixed meta header tagsTobias Schmidl2017-10-111-4/+4
| |
| * Just Read: Extended metadata blockTobias Schmidl2017-10-111-2/+46
|/ | | | This meta information is useful for integrating into the social media.
* Merge pull request #559 from agrrh/add-custom-js-to-pelican-bootstrap3Justin Mayer2017-10-103-8/+17
|\ | | | | pelican-bootstrap3: add CUSTOM_JS var based on CUSTOM_CSS
| * Fix VK sidear logoKirill K2017-10-101-1/+1
| |
| * Add readme changesKirill K2017-10-101-7/+12
| |
| * Add js to base templateKirill K2017-10-101-0/+4
|/
* Merge pull request #557 from schtobia/for_upstreamJustin Mayer2017-10-041-2/+3
|\ | | | | Just Read: further small improvements
| * [Just-Read] Avoid a mixed content warning in Chrome, FirefoxTobias Schmidl2017-10-021-1/+1
| |
| * [Just-Read] Conditionally enable Google AnalyticsTobias Schmidl2017-10-021-1/+2
|/ | | | | As I personally don't have Google Analytics, I don't want to load the script with empty default values.
* Merge pull request #556 from kplaube/masterJustin Mayer2017-10-021-0/+0
|\ | | | | Update yapeme to 0.2.0
| * Update yapeme to 0.2.0Klaus Laube2017-10-021-0/+0
|/
* Merge pull request #555 from schtobia/for_upstreamJustin Mayer2017-10-023-53/+87
|\ | | | | Just-Read: Various enhancements
| * [Just-Read] Repaired footerTobias Schmidl2017-10-021-1/+5
| | | | | | | | | | We sometimes have a real FOOTERTEXT. Then it's not sufficient to just print the author.
| * [Just-Read] removed "huge" setting for codeTobias Schmidl2017-10-022-46/+77
| | | | | | | | | | This gets ridiculously big on wide screen displays. Try to maintain a normal size for code
| * [Just-Read] Incorporated the changes in main.css in lessTobias Schmidl2017-10-021-7/+6
|/ | | | | | | | Bertrand Bousquet did a quite good job in 185fde6 by repairing the inlined code fragments - unfortunately only in the CSS file, not in Less. This commit tries to incorporate these changes back into the less file.
* Merge pull request #552 from petrnohejl/masterJustin Mayer2017-09-222-0/+3
|\ | | | | Add MinimalXY theme as submodule
| * Add MinimalXY themePetr Nohejl2017-09-212-0/+3
| |
* | Merge pull request #548 from chrisramsay/feature/show-source-supportJustin Mayer2017-09-224-0/+31
|\ \ | |/ |/| pelican-bootstrap3: Add support for Show Source plugin
| * Show source support added in pelican-bootstrap3Chris Ramsay2017-09-104-0/+31
|/
* Merge pull request #546 from mlissner/patch-1Justin Mayer2017-09-061-0/+1
|\ | | | | pelican-bootstrap3: Add DNT meta so Twitter doesn't track us
| * Adds DNT meta so that Twitter doesn't track usMike Lissner2017-09-051-0/+1
| | | | | | | | | | | | | | | | | | As explained on this page, this meta tag prevents Twitter from using your webpage to track people: https://dev.twitter.com/web/overview/privacy#what-privacy-options-do-website-publishers-have Generally speaking, this is the kind of tracking that nobody expects. Nobody thinks that by going to *my* website, which shows some tweets, that Twitter will be tracking them. Let's turn that off by default. Hopefully this isn't controversial.
* | Merge pull request #545 from karambir/masterJustin Mayer2017-09-062-0/+3
|\ \ | |/ |/| Add Taman theme as submodule
| * Add pelican taman themeKarambir Singh Nain2017-09-062-0/+3
|/
* Merge pull request #506 from joshmorel/masterJustin Mayer2017-09-046-6/+6
|\ | | | | Fix Python 3 unorderable types issue with multiple themes
| * Fix Python 3 unorderable types issuejoshmorel2017-04-166-6/+6
| | | | | | | | | | | | {% for article in articles | sort %} resulted in: "CRITICAL: unorderable types: Article() < Article()"
* | Merge pull request #511 from digitalrounin/rm-stray-vim-filesJustin Mayer2017-09-046-0/+14
|\ \ | | | | | | Delete stray Vim data files and update .gitignore
| * | Deleted stray Vim data filesPedro H2017-05-076-0/+14
| |/ | | | | | | | | Also updates `.gitignore` to exclude other system and editor data files and directories.
* | Bricabrac: Update theme (#512)Badaboum2017-09-0425-61/+193
| |
* | Merge pull request #513 from offdutypirate/add-gitlab-non-squareJustin Mayer2017-09-041-1/+1
|\ \ | | | | | | Pelican-Bootstrap3: Add GitLab to non-square icon list
| * | Add gitlab to non-square icon in pelican-bootstrap3Jon Moore2017-05-121-1/+1
| |/ | | | | | | This commit adds gitlab to the list of non-square icons in pelican-bootstrap3.
* | Pelican-Bootstrap3: Change MathJax CDN link to HTTPSJustin Mayer2017-09-041-1/+1
| |
* | Merge pull request #518 from hlapp/patch-1Justin Mayer2017-09-041-1/+1
|\ \ | | | | | | Fix copyright year to 2014
| * | Fixes copyright year to 2014Hilmar Lapp2017-05-301-1/+1
| |/ | | | | | | | | | | See hlapp/cc-tools#3 for the corresponding change in the original source repo. I recognize this is a minuscule change, but the year 1994 is simply wrong, makes no sense, and is simply an honest mistake.
* | Merge pull request #523 from cfcolaco/masterJustin Mayer2017-09-041-0/+0
|\ \ | | | | | | Nice-blog submodule update
| * | nice-blog updatecfcolaco2017-06-081-0/+0
| | |
| * | nice-blog updatedcfcolaco2017-06-061-0/+0
| | |
* | | Merge pull request #533 from josch/archive-sidebarJustin Mayer2017-09-043-0/+25
|\ \ \ | | | | | | | | pelican-bootstrap3: Add archive to sidebar
| * \ \ Merge branch 'master' into archive-sidebarJustin Mayer2017-09-0432-6/+1468
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #531 from josch/authors-sidebarJustin Mayer2017-09-043-0/+24
|\ \ \ \ | | | | | | | | | | pelican-bootstrap3: Add authors to sidebar
| * | | | pelican-bootstrap3: Add authors to sidebarJohannes 'josch' Schauer2017-07-293-0/+24
| | | | |
* | | | | Merge pull request #541 from theMarix/improve-i18n-configuration-documentationJustin Mayer2017-09-041-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Pelican-Bootstrap3: add I18N language docs clarification
| * | | | | Improve documentation on I18N of pelican-bootstrap3Matthias Bach2017-08-251-0/+8
| | | | | |
* | | | | | Merge pull request #542 from ↵Justin Mayer2017-09-042-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | theMarix/pelican-bootstrap3-modernize-flattr-support Pelican-Bootstrap3: Add support for Flattr domain verification
| * | | | | | Add support for Flattr domain verification to Pelican-Boostrap3Matthias Bach2017-09-012-0/+9
|/ / / / / /
* | | | | | Merge pull request #539 from suheb/masterJustin Mayer2017-08-252-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add Resume theme as submodule
| * | | | | Adding resume themeSuhaib Khan2017-08-172-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Suhaib Khan <suheb.work@gmail.com>
* | | | | | Merge pull request #540 from wamonite/update_relapseJustin Mayer2017-08-241-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update relapse submodule
| * | | | | Update relapse submodule.Warren Moore2017-08-241-0/+0
|/ / / / /