Skip to content
Permalink
Browse files

Merge branch 'master' into logging

  • Loading branch information
Kwpolska committed Jul 5, 2015
2 parents e019b3a + b4d237f commit 5b7bce0bb387048388120d24d0bd4e5b5c803c20
Showing with 4,859 additions and 1,273 deletions.
  1. +1 −1 .coveragerc
  2. +3 −0 .gitignore
  3. +110 −0 .pypt/ghrel
  4. +67 −0 CHANGES.txt
  5. +2 −1 bower.json
  6. +7 −11 bower_components/bootstrap/.bower.json
  7. +38 −18 bower_components/bootstrap/Gruntfile.js
  8. +13 −10 bower_components/bootstrap/README.md
  9. +3 −8 bower_components/bootstrap/bower.json
  10. +125 −14 bower_components/bootstrap/dist/css/bootstrap-theme.css
  11. +1 −1 bower_components/bootstrap/dist/css/bootstrap-theme.css.map
  12. +2 −2 bower_components/bootstrap/dist/css/bootstrap-theme.min.css
  13. +292 −76 bower_components/bootstrap/dist/css/bootstrap.css
  14. +1 −1 bower_components/bootstrap/dist/css/bootstrap.css.map
  15. +2 −2 bower_components/bootstrap/dist/css/bootstrap.min.css
  16. +143 −97 bower_components/bootstrap/dist/js/bootstrap.js
  17. +4 −4 bower_components/bootstrap/dist/js/bootstrap.min.js
  18. +9 −2 bower_components/bootstrap/grunt/bs-commonjs-generator.js
  19. +4 −3 bower_components/bootstrap/grunt/bs-glyphicons-data-generator.js
  20. +6 −7 bower_components/bootstrap/grunt/bs-lessdoc-parser.js
  21. +6 −8 bower_components/bootstrap/grunt/bs-raw-files-generator.js
  22. +1 −1 bower_components/bootstrap/grunt/configBridge.json
  23. +1 −1 bower_components/bootstrap/grunt/sauce_browsers.yml
  24. +6 −0 bower_components/bootstrap/js/.jscsrc
  25. +3 −3 bower_components/bootstrap/js/affix.js
  26. +2 −2 bower_components/bootstrap/js/alert.js
  27. +13 −9 bower_components/bootstrap/js/button.js
  28. +2 −2 bower_components/bootstrap/js/carousel.js
  29. +2 −2 bower_components/bootstrap/js/collapse.js
  30. +46 −42 bower_components/bootstrap/js/dropdown.js
  31. +5 −7 bower_components/bootstrap/js/modal.js
  32. +2 −2 bower_components/bootstrap/js/popover.js
  33. +2 −2 bower_components/bootstrap/js/scrollspy.js
  34. +5 −3 bower_components/bootstrap/js/tab.js
  35. +58 −20 bower_components/bootstrap/js/tooltip.js
  36. +1 −1 bower_components/bootstrap/js/transition.js
  37. +1 −1 bower_components/bootstrap/less/badges.less
  38. +6 −0 bower_components/bootstrap/less/bootstrap.less
  39. +3 −2 bower_components/bootstrap/less/button-groups.less
  40. +11 −5 bower_components/bootstrap/less/buttons.less
  41. +2 −2 bower_components/bootstrap/less/carousel.less
  42. +3 −1 bower_components/bootstrap/less/dropdowns.less
  43. +44 −11 bower_components/bootstrap/less/forms.less
  44. +1 −0 bower_components/bootstrap/less/input-groups.less
  45. +5 −3 bower_components/bootstrap/less/jumbotron.less
  46. +9 −3 bower_components/bootstrap/less/list-group.less
  47. +5 −0 bower_components/bootstrap/less/media.less
  48. +1 −0 bower_components/bootstrap/less/mixins.less
  49. +2 −1 bower_components/bootstrap/less/mixins/background-variant.less
  50. +18 −2 bower_components/bootstrap/less/mixins/buttons.less
  51. +2 −2 bower_components/bootstrap/less/mixins/grid-framework.less
  52. +2 −2 bower_components/bootstrap/less/mixins/grid.less
  53. +1 −1 bower_components/bootstrap/less/mixins/hide-text.less
  54. +2 −1 bower_components/bootstrap/less/mixins/list-group.less
  55. +2 −1 bower_components/bootstrap/less/mixins/pagination.less
  56. +18 −0 bower_components/bootstrap/less/mixins/reset-text.less
  57. +1 −1 bower_components/bootstrap/less/mixins/responsive-visibility.less
  58. +2 −1 bower_components/bootstrap/less/mixins/text-emphasis.less
  59. +8 −11 bower_components/bootstrap/less/normalize.less
  60. +3 −2 bower_components/bootstrap/less/pagination.less
  61. +6 −0 bower_components/bootstrap/less/panels.less
  62. +4 −8 bower_components/bootstrap/less/popovers.less
  63. +0 −6 bower_components/bootstrap/less/print.less
  64. +1 −2 bower_components/bootstrap/less/scaffolding.less
  65. +23 −5 bower_components/bootstrap/less/theme.less
  66. +4 −5 bower_components/bootstrap/less/tooltip.less
  67. +7 −1 bower_components/bootstrap/less/variables.less
  68. +5 −2 bower_components/bootstrap/package.js
  69. +26 −32 bower_components/bootstrap/package.json
  70. +40 −0 bower_components/livereload-js/.bower.json
  71. +42 −0 bower_components/livereload-js/Gruntfile.js
  72. +20 −0 bower_components/livereload-js/LICENSE
  73. +220 −0 bower_components/livereload-js/README.md
  74. +30 −0 bower_components/livereload-js/bower.json
  75. +1,155 −0 bower_components/livereload-js/dist/livereload.js
  76. +32 −0 bower_components/livereload-js/package.json
  77. +1 −1 docs/extending.txt
  78. BIN docs/man/nikola.1.gz
  79. +118 −0 docs/man/nikola.rst
  80. +194 −76 docs/manual.txt
  81. +1 −1 docs/social_buttons.txt
  82. +2 −2 docs/sphinx/conf.py
  83. +2 −2 docs/{getting-help.txt → support.rst}
  84. +1 −1 docs/theming.txt
  85. +1 −1 nikola/__init__.py
  86. +18 −6 nikola/__main__.py
  87. +9 −7 nikola/conf.py.in
  88. +1 −0 nikola/data/symlinked.txt
  89. +2 −2 nikola/data/themes/base-jinja/templates/base_header.tmpl
  90. +1 −1 nikola/data/themes/base-jinja/templates/post.tmpl
  91. +1 −1 nikola/data/themes/base-jinja/templates/post_header.tmpl
  92. +1 −1 nikola/data/themes/base-jinja/templates/post_helper.tmpl
  93. +0 −4 nikola/data/themes/base/assets/css/nikola_ipython.css
  94. +64 −58 nikola/data/themes/base/assets/css/rst.css
  95. +107 −6 nikola/data/themes/base/assets/css/theme.css
  96. +2 −0 nikola/data/themes/base/messages/messages_ar.py
  97. +2 −0 nikola/data/themes/base/messages/messages_az.py
  98. +2 −0 nikola/data/themes/base/messages/messages_bg.py
  99. +2 −0 nikola/data/themes/base/messages/messages_ca.py
  100. +2 −0 nikola/data/themes/base/messages/messages_cs.py
  101. +2 −0 nikola/data/themes/base/messages/messages_da.py
  102. +2 −0 nikola/data/themes/base/messages/messages_de.py
  103. +2 −0 nikola/data/themes/base/messages/messages_el.py
  104. +2 −0 nikola/data/themes/base/messages/messages_en.py
  105. +2 −0 nikola/data/themes/base/messages/messages_eo.py
  106. +3 −1 nikola/data/themes/base/messages/messages_es.py
  107. +2 −0 nikola/data/themes/base/messages/messages_et.py
  108. +2 −0 nikola/data/themes/base/messages/messages_eu.py
  109. +2 −0 nikola/data/themes/base/messages/messages_fa.py
  110. +2 −0 nikola/data/themes/base/messages/messages_fi.py
  111. +2 −0 nikola/data/themes/base/messages/messages_fil.py
  112. +3 −1 nikola/data/themes/base/messages/messages_fr.py
  113. +2 −0 nikola/data/themes/base/messages/messages_gl.py
  114. +2 −0 nikola/data/themes/base/messages/messages_hi.py
  115. +2 −0 nikola/data/themes/base/messages/messages_hr.py
  116. +4 −2 nikola/data/themes/base/messages/messages_id.py
  117. +14 −12 nikola/data/themes/base/messages/messages_it.py
  118. +2 −0 nikola/data/themes/base/messages/messages_ja.py
  119. +2 −0 nikola/data/themes/base/messages/messages_ko.py
  120. +2 −0 nikola/data/themes/base/messages/messages_nb.py
  121. +3 −1 nikola/data/themes/base/messages/messages_nl.py
  122. +3 −1 nikola/data/themes/base/messages/messages_pl.py
  123. +2 −0 nikola/data/themes/base/messages/messages_pt.py
  124. +2 −0 nikola/data/themes/base/messages/messages_pt_br.py
  125. +2 −0 nikola/data/themes/base/messages/messages_ru.py
  126. +2 −0 nikola/data/themes/base/messages/messages_si_lk.py
  127. +2 −0 nikola/data/themes/base/messages/messages_sk.py
  128. +2 −0 nikola/data/themes/base/messages/messages_sl.py
  129. +2 −0 nikola/data/themes/base/messages/messages_sr.py
  130. +2 −0 nikola/data/themes/base/messages/messages_sv.py
  131. +2 −0 nikola/data/themes/base/messages/messages_tl.py
  132. +2 −0 nikola/data/themes/base/messages/messages_tr.py
  133. +2 −0 nikola/data/themes/base/messages/messages_uk.py
  134. +3 −1 nikola/data/themes/base/messages/messages_ur.py
  135. +2 −0 nikola/data/themes/base/messages/messages_zh_cn.py
  136. +2 −0 nikola/data/themes/base/messages/messages_zh_tw.py
  137. +1 −1 nikola/data/themes/base/templates/post.tmpl
  138. +1 −1 nikola/data/themes/base/templates/post_header.tmpl
  139. +1 −1 nikola/data/themes/base/templates/post_helper.tmpl
  140. +29 −0 nikola/data/themes/bootstrap-jinja/assets/css/theme.css
  141. +2 −2 nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl
  142. +1 −1 nikola/data/themes/bootstrap-jinja/templates/post.tmpl
  143. +29 −0 nikola/data/themes/bootstrap/assets/css/theme.css
  144. +1 −1 nikola/data/themes/bootstrap/templates/post.tmpl
  145. +37 −7 nikola/data/themes/bootstrap3-jinja/assets/css/theme.css
  146. +2 −2 nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
  147. +7 −7 nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
  148. +37 −7 nikola/data/themes/bootstrap3/assets/css/theme.css
  149. +2 −2 nikola/data/themes/bootstrap3/templates/base.tmpl
  150. +5 −5 nikola/data/themes/bootstrap3/templates/base_helper.tmpl
  151. +8 −4 nikola/filters.py
  152. +26 −9 nikola/nikola.py
  153. +38 −4 nikola/plugin_categories.py
  154. +1 −1 nikola/plugins/command/auto.plugin
  155. +0 −119 nikola/plugins/command/auto.py
  156. +369 −0 nikola/plugins/command/auto/__init__.py
  157. +1 −0 nikola/plugins/command/auto/livereload.js
  158. +2 −10 nikola/plugins/command/bootswatch_theme.py
  159. +8 −10 nikola/plugins/command/check.py
  160. +2 −3 nikola/plugins/command/deploy.py
  161. +3 −4 nikola/plugins/command/github_deploy.py
  162. +57 −21 nikola/plugins/command/import_wordpress.py
  163. +8 −1 nikola/plugins/command/init.py
  164. +4 −30 nikola/plugins/command/install_theme.py
  165. +10 −2 nikola/plugins/command/new_page.py
  166. +105 −11 nikola/plugins/command/new_post.py
  167. +6 −31 nikola/plugins/command/plugin.py
  168. +3 −2 nikola/plugins/command/rst2html/__init__.py
  169. +1 −1 nikola/plugins/command/serve.py
  170. +1 −0 nikola/plugins/command/status.py
  171. +2 −9 nikola/plugins/command/version.py
  172. +2 −4 nikola/plugins/compile/html.py
  173. +4 −4 nikola/plugins/compile/ipynb.plugin
  174. +62 −31 nikola/plugins/compile/{ipynb/__init__.py → ipynb.py}
  175. +0 −40 nikola/plugins/compile/ipynb/README.rst
  176. +3 −3 nikola/plugins/compile/markdown/__init__.py
  177. +3 −0 nikola/plugins/compile/markdown/mdx_gist.plugin
  178. +21 −29 nikola/plugins/compile/markdown/mdx_gist.py
  179. +3 −0 nikola/plugins/compile/markdown/mdx_nikola.plugin
  180. +1 −1 nikola/plugins/compile/markdown/mdx_nikola.py
  181. +3 −0 nikola/plugins/compile/markdown/mdx_podcast.plugin
  182. +1 −1 nikola/plugins/compile/markdown/mdx_podcast.py
  183. +1 −0 nikola/plugins/compile/pandoc.py
  184. +1 −0 nikola/plugins/compile/php.py
  185. +15 −25 nikola/plugins/compile/rest/__init__.py
  186. +3 −0 nikola/plugins/compile/rest/chart.plugin
  187. +3 −0 nikola/plugins/compile/rest/doc.plugin
  188. +3 −0 nikola/plugins/compile/rest/gist.plugin
  189. +4 −16 nikola/plugins/compile/rest/gist.py
  190. +3 −0 nikola/plugins/compile/rest/listing.plugin
  191. +3 −0 nikola/plugins/compile/rest/media.plugin
  192. +3 −0 nikola/plugins/compile/rest/post_list.plugin
  193. +3 −0 nikola/plugins/compile/rest/slides.plugin
  194. +1 −1 nikola/plugins/compile/rest/slides.py
  195. +3 −0 nikola/plugins/compile/rest/soundcloud.plugin
  196. +1 −1 nikola/plugins/compile/rest/soundcloud.py
  197. +3 −0 nikola/plugins/compile/rest/thumbnail.plugin
  198. +3 −0 nikola/plugins/compile/rest/vimeo.plugin
  199. +1 −9 nikola/plugins/compile/rest/vimeo.py
  200. +3 −0 nikola/plugins/compile/rest/youtube.plugin
  201. +1 −1 nikola/plugins/compile/rest/youtube.py
  202. +4 −1 nikola/plugins/task/archive.py
  203. +2 −9 nikola/plugins/task/galleries.py
  204. +18 −2 nikola/plugins/task/posts.py
  205. +16 −19 nikola/plugins/task/sitemap/__init__.py
  206. +10 −12 nikola/plugins/task/tags.py
  207. +9 −4 nikola/post.py
  208. +20 −1 nikola/utils.py
  209. +3 −3 requirements-extras.txt
  210. +2 −2 requirements-tests.txt
  211. +3 −2 requirements.txt
  212. +19 −0 scripts/github-release.py
  213. +9 −1 scripts/set_version.py
  214. +1 −3 scripts/update-bower.sh
  215. +3 −13 setup.py
  216. +1 −1 tests/test_command_import_wordpress.py
  217. +9 −1 translations/nikola.messages/ar.po
  218. +9 −1 translations/nikola.messages/az.po
  219. +9 −1 translations/nikola.messages/bg.po
  220. +9 −1 translations/nikola.messages/ca.po
  221. +9 −1 translations/nikola.messages/cs.po
  222. +9 −1 translations/nikola.messages/da.po
  223. +9 −1 translations/nikola.messages/de.po
  224. +9 −1 translations/nikola.messages/el.po
  225. +8 −0 translations/nikola.messages/en.po
  226. +9 −1 translations/nikola.messages/eo.po
  227. +10 −2 translations/nikola.messages/es.po
  228. +9 −1 translations/nikola.messages/et.po
  229. +9 −1 translations/nikola.messages/eu.po
  230. +9 −1 translations/nikola.messages/fa.po
  231. +9 −1 translations/nikola.messages/fi.po
  232. +9 −1 translations/nikola.messages/fil.po
  233. +9 −1 translations/nikola.messages/fr.po
  234. +9 −1 translations/nikola.messages/gl.po
  235. +9 −1 translations/nikola.messages/hi.po
  236. +9 −1 translations/nikola.messages/hr.po
  237. +11 −3 translations/nikola.messages/id.po
  238. +23 −14 translations/nikola.messages/it.po
  239. +9 −1 translations/nikola.messages/ja.po
  240. +9 −1 translations/nikola.messages/ko.po
  241. +9 −1 translations/nikola.messages/nb.po
  242. +9 −1 translations/nikola.messages/nl.po
  243. +10 −2 translations/nikola.messages/pl.po
  244. +9 −1 translations/nikola.messages/pt.po
  245. +9 −1 translations/nikola.messages/pt_BR.po
  246. +9 −1 translations/nikola.messages/ru.po
  247. +9 −1 translations/nikola.messages/si_LK.po
  248. +9 −1 translations/nikola.messages/sk.po
  249. +9 −1 translations/nikola.messages/sl.po
  250. +9 −1 translations/nikola.messages/sr.po
  251. +9 −1 translations/nikola.messages/sv.po
  252. +9 −1 translations/nikola.messages/tl.po
  253. +9 −1 translations/nikola.messages/tr.po
  254. +9 −1 translations/nikola.messages/uk.po
  255. +11 −3 translations/nikola.messages/ur.po
  256. +9 −1 translations/nikola.messages/zh_CN.po
  257. +9 −1 translations/nikola.messages/zh_TW.po
@@ -1,6 +1,6 @@
[run]
source = nikola
omit = /tmp/*, _*
omit = /tmp/*, _*, nikola/packages*, nikola/data*, nikola/winutils*
[report]
exclude_lines =
pragma: no cover
@@ -20,3 +20,6 @@ __pycache__/

# pyenv
.python-version

# GitHub token
.pypt/gh-token
@@ -0,0 +1,110 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
# Kw’s Release Tools/Python Project Template
# GitHub Release Creator
# Copyright © 2013-2015, Chris Warrick.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions, and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions, and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# 3. Neither the name of the author of this software nor the names of
# contributors to this software may be used to endorse or promote
# products derived from this software without specific prior written
# consent.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

"""
Create GitHub releases out of changelogs.
Usage: .pypt/commitlog FILE BASEDIR REPOSITORY TAG, where
FILE is the path to the file to use, which can be
a plain .md file or a CMFN file,
BASEDIR is the project directory,
REPOSITORY is the full GitHub repository name (user/repo),
TAG is the tag to write to.
All paths should be absolute.
"""

import argparse
import json
import re
import requests
import sys
from os.path import join as pjoin


def main():
"""ghrel main function."""
parser = argparse.ArgumentParser(
description="GitHub Release Creator "
"(part of Chris Warrick's Python Project Template)")
parser.add_argument('filename', metavar='FILE', nargs=1,
help='File to parse (Markdown or commitlog)')
parser.add_argument('basedir', metavar='BASEDIR', nargs=1,
help='Project directory (must contain .pypt/gh-token)')
parser.add_argument('repo', metavar='REPOSITORY', nargs=1,
help='GitHub repository (owner/repo)')
parser.add_argument('tag', metavar='TAG', nargs=1,
help='Tag to create release for (vX.Y.Z)')
args = parser.parse_args()
# nargs gets you lists, not strings
filename = args.filename[0]
basedir = args.basedir[0]
repo = args.repo[0]
tag = args.tag[0]

with open(pjoin(basedir, '.pypt', 'gh-token')) as fh:
token = fh.read().strip()

headers = {
'User-Agent': 'Kwpolska/python-project-template',
'Authorization': 'token ' + token,
}

with open(filename) as fh:
fdata = fh.read()
e = re.findall(
'#~ CHANGELOG MESSAGE START ~#\n(.*?)\n'
'#~ CHANGELOG MESSAGE END ~#',
fdata, flags=re.S)

if e:
# parse as a CMFN file, replace backticks (reST -> Markdown)
message = e[0].replace('``', '`')
else:
# parse as a plain Markdown file
message = fdata

r = requests.post(
'https://api.github.com/repos/{0}/releases'.format(repo),
data=json.dumps({'tag_name': tag, 'body': message}),
headers=headers)

if r.status_code == 201:
print("GitHub Release created: {0}".format(r.json()['html_url']))
else:
print("GitHub Release failed: {0}".format(r.text))
return 1

if __name__ == '__main__':
sys.exit(main())
@@ -5,8 +5,75 @@ Features
--------

* Remove logging handlers (Issue #1797)
* Screen reader-friendly navbar collapses and dropdowns (Issue #1863)
* Modern reST stylesheets, based in part on Bootstrap 3 (Issue #1150)

Bugfixes
--------

* Surpress wincing when auto is aborted during rebuilding
* Show tags only from the current language on tag listing pages (Issue #1856)
* Remove gap between line numbers and code (Issue #1859)
* Fix spurious warnings about posts published in the future (Issue #1850)

New in v7.6.0
=============

Features
--------

* Translate ``Write your post here.`` to default language (Issue #1621)
* Enable ``PRETTY_URLS`` by default on new sites created by the wizard
(Issue #1838)
* Add ``-F``, ``--available-compilers`` option to ``nikola new_post``
and ``nikola new_page`` (Issue #1837)
* Add print CSS to all default themes (Issue #1817)
* Support other kernels for ipynb/Jupyter using
``nikola new_post -f ipynb@kernel`` (Issues #1774, #1834)
* Add distinct styling for the site footer in bootstrap3
* Bootstrap v3.3.5 (Issue #1828)
* Use ``watchdog`` in ``nikola auto`` (Issue #1810)
* Add redirection for tags in Wordpress importer (Issue #1168)
* Add support for ``html_tidy_withconfig`` to use a ``tidy5.conf`` file
(Issue #1795)
* Change default tidy5 filters not to drop empty elements (Issue #1795)
* Apply per-post filters via metadata (Issue #914)

Bugfixes
--------

* Nikola auto was broken in python 3 (Issue #1830)
* Read configuration when importing into an existing site (Issue #1823)
* Don’t crash on non-UTF-8 files during sitemap generation (Issue #1842)
* Unnecessary rebuilds of yearly archives (Issue #1833)
* Quietly ignore non-existent files in ``nikola check -l`` (Issue #1831)
* Don’t rebuild all tag or category pages when changing tag/category descriptions
* Fix crash in wordpress code importer (Issue #1819)
* Call correct command in ``nikola auto``

New in v7.5.1
=============

Features
--------

* Suggest misspelled commands (Issue #1807)
* New implementation of the ``nikola auto`` command
* ``requests`` is now required for all Nikola sites
* New ``nikola version --check`` option (Issue #1767)

Bugfixes
--------

* Support pure markdown posts in WP import (Issue #484)
* Make auto shutdown with ctrl-c (Issue #1811)
* Log properly in ``nikola auto`` (Issue #1812)
* Handle rare gettz failure (Issue #1806)
* Handle missing dependencies better in auto plugin (Issues #1803, #1809)
* IDNA mixing unicode/bytes in python 3 (Issue #1802)
* Cleaner splitting of metadata in onefile posts (Issue #973)
* It's markdown extra, not extras (Issue #1799)

New in v7.5.0
=============

@@ -12,6 +12,7 @@
"bootstrap": "~3.3.4",
"jquery": "<2.0.0",
"jquery-colorbox": "~1.6.0",
"moment": "~2.10.3"
"moment": "~2.10.3",
"livereload-js": "~2.2.1"
}
}
@@ -1,7 +1,6 @@
{
"name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "3.3.4",
"keywords": [
"css",
"js",
@@ -13,15 +12,11 @@
"web"
],
"homepage": "http://getbootstrap.com",
"license": "MIT",
"moduleType": "globals",
"main": [
"less/bootstrap.less",
"dist/css/bootstrap.css",
"dist/js/bootstrap.js",
"dist/fonts/glyphicons-halflings-regular.eot",
"dist/fonts/glyphicons-halflings-regular.svg",
"dist/fonts/glyphicons-halflings-regular.ttf",
"dist/fonts/glyphicons-halflings-regular.woff",
"dist/fonts/glyphicons-halflings-regular.woff2"
"dist/js/bootstrap.js"
],
"ignore": [
"/.*",
@@ -36,11 +31,12 @@
"dependencies": {
"jquery": ">= 1.9.1"
},
"_release": "3.3.4",
"version": "3.3.5",
"_release": "3.3.5",
"_resolution": {
"type": "version",
"tag": "v3.3.4",
"commit": "a10eb60bc0b07b747fa0c4ebd8821eb7307bd07f"
"tag": "v3.3.5",
"commit": "16b48259a62f576e52c903c476bd42b90ab22482"
},
"_source": "git://github.com/twbs/bootstrap.git",
"_target": "~3.3.4",
@@ -44,7 +44,7 @@ module.exports = function (grunt) {
banner: '/*!\n' +
' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' +
' * Licensed under the <%= pkg.license %> license\n' +
' */\n',
jqueryCheck: configBridge.config.jqueryCheck.join('\n'),
jqueryVersionCheck: configBridge.config.jqueryVersionCheck.join('\n'),
@@ -63,7 +63,7 @@ module.exports = function (grunt) {
options: {
jshintrc: 'grunt/.jshintrc'
},
src: ['Gruntfile.js', 'grunt/*.js']
src: ['Gruntfile.js', 'package.js', 'grunt/*.js']
},
core: {
src: 'js/*.js'
@@ -126,6 +126,10 @@ module.exports = function (grunt) {

uglify: {
options: {
compress: {
warnings: false
},
mangle: true,
preserveComments: 'some'
},
core: {
@@ -191,7 +195,7 @@ module.exports = function (grunt) {
src: 'dist/css/<%= pkg.name %>-theme.css'
},
docs: {
src: ['docs/assets/css/anchor.css', 'docs/assets/css/src/docs.css']
src: ['docs/assets/css/src/docs.css']
},
examples: {
expand: true,
@@ -240,24 +244,12 @@ module.exports = function (grunt) {
docs: {
src: [
'docs/assets/css/src/pygments-manni.css',
'docs/assets/css/src/anchor.css',
'docs/assets/css/src/docs.css'

],
dest: 'docs/assets/css/docs.min.css'
}
},

usebanner: {
options: {
position: 'top',
banner: '<%= banner %>'
},
files: {
src: 'dist/css/*.css'
}
},

csscomb: {
options: {
config: 'less/.csscomb.json'
@@ -317,6 +309,26 @@ module.exports = function (grunt) {
}
},

htmlmin: {
dist: {
options: {
collapseWhitespace: true,
conservativeCollapse: true,
minifyCSS: true,
minifyJS: true,
removeAttributeQuotes: true,
removeComments: true
},
expand: true,
cwd: '_gh_pages',
dest: '_gh_pages',
src: [
'**/*.html',
'!examples/**/*.html'
]
}
},

jade: {
options: {
pretty: true,
@@ -346,7 +358,7 @@ module.exports = function (grunt) {
watch: {
src: {
files: '<%= jshint.core.src %>',
tasks: ['jshint:src', 'qunit', 'concat']
tasks: ['jshint:core', 'qunit', 'concat']
},
test: {
files: '<%= jshint.test.src %>',
@@ -365,6 +377,14 @@ module.exports = function (grunt) {
return old ? RegExp.quote(old) : old;
})(),
replacement: grunt.option('newver'),
exclude: [
'dist/fonts',
'docs/assets',
'fonts',
'js/tests/vendor',
'node_modules',
'test-infra'
],
recursive: true
}
},
@@ -455,7 +475,7 @@ module.exports = function (grunt) {

// CSS distribution task.
grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']);
grunt.registerTask('dist-css', ['less-compile', 'autoprefixer:core', 'autoprefixer:theme', 'usebanner', 'csscomb:dist', 'cssmin:minifyCore', 'cssmin:minifyTheme']);
grunt.registerTask('dist-css', ['less-compile', 'autoprefixer:core', 'autoprefixer:theme', 'csscomb:dist', 'cssmin:minifyCore', 'cssmin:minifyTheme']);

// Full distribution task.
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'copy:fonts', 'dist-js']);
@@ -491,7 +511,7 @@ module.exports = function (grunt) {
grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']);
grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-glyphicons-data', 'build-customizer']);

grunt.registerTask('prep-release', ['jekyll:github', 'compress']);
grunt.registerTask('prep-release', ['dist', 'docs', 'jekyll:github', 'htmlmin', 'compress']);

// Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
// This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.

0 comments on commit 5b7bce0

Please sign in to comment.
You can’t perform that action at this time.