Skip to content
Permalink
Browse files
Merge branch 'master' into yaml-playground
  • Loading branch information
ralsina committed Jun 4, 2017
2 parents aa4b61a + 0ca3747 commit 653583edf28644f96b3e0ba4ae7ccf31c4f762d0
Show file tree
Hide file tree
Showing 72 changed files with 3,026 additions and 254 deletions.
@@ -1,21 +1,18 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{json,yml,yaml}]
indent_size = 2

[CHANGES.txt]
max_line_length = 70

[*.py]
trim_trailing_whitespace = true

[nikola/data/themes/base/assets/css/theme.css]
indent_style = tab

[{appveyor.yml,.travis.yml}]
indent_style = space
indent_size = 2
@@ -1,29 +1,202 @@
*.py[co]
# Demo for Bagguette
/bower_components/baguettebox.js/demo/*

*.db
*~
/dist
*.log
*.diff
*.patch
tmp/
cache/
output/
build/

# GitHub token
.pypt/gh-token

#
.DS_Store

# All of .idea should be ignored
.idea/
.vscode/
node_modules

# Created by https://www.gitignore.io/api/pydev,python,pycharm,vim

### PyCharm ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries

# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml

# Gradle:
.idea/**/gradle.xml
.idea/**/libraries

# CMake
cmake-build-debug/

# Mongo Explorer plugin:
.idea/**/mongoSettings.xml

## File-based project format:
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### PyCharm Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
.idea/sonarlint

### pydev ###
.pydevproject

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.cache/
.installed.cfg
*.egg

# virtualenvwrapper oh-my-zsh plugin
.venv
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# coverage.py
# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
.hypothesis/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# GitHub token
.pypt/gh-token
# celery beat schedule file
celerybeat-schedule

#
.DS_Store
# SageMath parsed files
*.sage.py

# dotenv
.env

# virtualenv
.venv
venv/
ENV/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

### Vim ###
# swap
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-v][a-z]
[._]sw[a-p]
# session
Session.vim
# temporary
.netrwhist
*~

# End of https://www.gitignore.io/api/pydev,python,pycharm,vim
@@ -4,8 +4,31 @@ New in master
Features
--------

* New ``deduplicate_ids``, for preventing duplication of HTML id
attributes (Issue #2570)
* Support ignoring assets via ``ignore_assets`` theme meta field
(Issue #2812)
* Ignore unused Colorbox locales (Issue #2812)
* Support for reStructured text docinfo metadata with
USE_REST_DOCINFO_METADATA option, defaulting to False (Issue #1923)
* New HIDE_REST_DOCINFO option, defaulting to False.
* Support for Markdown Metadata for Pelican compatibility by adding
``'markdown.extensions.meta'`` to ``MARKDOWN_EXTENSIONS`` (Issue #1923)
* Support for YAML and TOML metadata (Issue #2801)

Bugfixes
--------

* Fix unbound variable error in locale guessing (Issue #2806)

New in v7.8.6
=============

Features
--------

* Guess file format from file name on new_post (Issue #2798)
* Use BaguetteBox as lightbox in base theme (Issue #2777)
* New ``deduplicate_ids`` filter, for preventing duplication of HTML
``id`` attributes (Issue #2570)
* Ported gallery image layout to base theme (Issue #2775)
* Better error handling when posts can't be parsed (Issue #2771)
* Use ``.theme`` files to store theme metadata (Issue #2758)
@@ -16,12 +39,23 @@ Features
Bugfixes
--------

* Use ``locale.getdefaultlocale()`` for better locale guessing
(credit: @madduck)
* Save dependencies for template hooks properly (using ``.__doc__`` or
``.template_registry_identifier`` for callables)
* Enable larger panorama thumbnails (Issue #2780)
* Disable ``archive_rss`` link handler, which was useless because no
such RSS was ever generated (Issue #2783)
* Ignore files ending wih "bak" (Issue #2740)
* Use page.tmpl by default, which is inherited from story.tmpl (Issue
#1891)

Other
-----

* Limit Jupyter support to notebook >= 4.0.0 (it already was in
requirements-extras.txt; Issue #2733)

New in v7.8.5
=============

@@ -13,6 +13,7 @@
"jquery": "<2.0.0",
"jquery-colorbox": "~1",
"moment": "~2",
"livereload-js": "~2"
"livereload-js": "~2",
"baguettebox.js": "~1.8"
}
}
@@ -0,0 +1,40 @@
{
"name": "baguettebox.js",
"version": "1.8.2",
"description": "Simple and easy to use lightbox script written in pure JavaScript",
"main": [
"./dist/baguetteBox.js",
"./dist/baguetteBox.css"
],
"keywords": [
"lightbox"
],
"authors": [
"feimosi"
],
"license": "MIT",
"homepage": "https://github.com/feimosi/baguetteBox.js",
"repository": {
"type": "git",
"url": "git://github.com/feimosi/baguetteBox.js.git"
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests",
"src/index.html",
"build/index.html",
"build/img"
],
"_release": "1.8.2",
"_resolution": {
"type": "version",
"tag": "v1.8.2",
"commit": "87555d4e359b58cc44ca783b2da6c9e4ca42ef78"
},
"_source": "https://github.com/feimosi/baguetteBox.js.git",
"_target": "~1.8",
"_originalSource": "baguettebox.js"
}
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2017 Marek Grzybek

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

0 comments on commit 653583e

Please sign in to comment.