Skip to content
Permalink
Browse files
Merge branch 'master' into taxonomy-lang-refs
  • Loading branch information
Kwpolska committed Jun 7, 2017
2 parents 39bd61b + dd38b45 commit c51cf3fe2d698a2d284d03c01628320861883d30
Showing with 2,764 additions and 855 deletions.
  1. +2 −14 .gitignore
  2. +1 −1 .travis.yml
  3. +6 −3 CHANGES.txt
  4. +6 −2 bower.json
  5. +25 −0 bower_components/html5shiv/.bower.json
  6. +61 −0 bower_components/html5shiv/Gruntfile.js
  7. +372 −0 bower_components/html5shiv/MIT and GPL2 licenses.md
  8. +15 −0 bower_components/html5shiv/bower.json
  9. +524 −0 bower_components/html5shiv/dist/html5shiv-printshiv.js
  10. +4 −0 bower_components/html5shiv/dist/html5shiv-printshiv.min.js
  11. +326 −0 bower_components/html5shiv/dist/html5shiv.js
  12. +4 −0 bower_components/html5shiv/dist/html5shiv.min.js
  13. +16 −0 bower_components/html5shiv/package.json
  14. +152 −0 bower_components/html5shiv/readme.md
  15. +2 −0 docs/template-variables.rst
  16. +2 −7 nikola/data/themes/base-jinja/templates/archiveindex.tmpl
  17. +9 −22 nikola/data/themes/base-jinja/templates/author.tmpl
  18. +2 −7 nikola/data/themes/base-jinja/templates/authorindex.tmpl
  19. +2 −2 nikola/data/themes/base-jinja/templates/base.tmpl
  20. +0 −1 nikola/data/themes/base-jinja/templates/base_footer.tmpl
  21. +2 −2 nikola/data/themes/base-jinja/templates/base_header.tmpl
  22. +22 −37 nikola/data/themes/base-jinja/templates/base_helper.tmpl
  23. +69 −0 nikola/data/themes/base-jinja/templates/feed_helper.tmpl
  24. +1 −0 nikola/data/themes/base-jinja/templates/index_helper.tmpl
  25. +2 −4 nikola/data/themes/base-jinja/templates/listing.tmpl
  26. +8 −6 nikola/data/themes/base-jinja/templates/math_helper.tmpl
  27. +1 −0 nikola/data/themes/base-jinja/templates/post_helper.tmpl
  28. +5 −8 nikola/data/themes/base-jinja/templates/sectionindex.tmpl
  29. +9 −22 nikola/data/themes/base-jinja/templates/tag.tmpl
  30. +2 −7 nikola/data/themes/base-jinja/templates/tagindex.tmpl
  31. +0 −1 nikola/data/themes/base/assets/css/baguetteBox.css
  32. +349 −0 nikola/data/themes/base/assets/css/html4css1.css
  33. +2 −2 nikola/data/themes/base/assets/css/ipython.min.css
  34. +0 −1 nikola/data/themes/base/assets/css/ipython.min.css.map
  35. +46 −0 nikola/data/themes/base/assets/css/nikola_rst.css
  36. +2 −330 nikola/data/themes/base/assets/css/rst.css
  37. +0 −1 nikola/data/themes/base/assets/js/baguetteBox.js
  38. +0 −8 nikola/data/themes/base/assets/js/html5.js
  39. +1 −0 nikola/data/themes/base/assets/js/html5.js
  40. +1 −0 nikola/data/themes/base/assets/js/html5shiv-printshiv.min.js
  41. +2 −2 nikola/data/themes/base/bundles
  42. +1 −0 nikola/data/themes/base/messages/messages_ar.py
  43. +1 −0 nikola/data/themes/base/messages/messages_az.py
  44. +1 −0 nikola/data/themes/base/messages/messages_bg.py
  45. +1 −0 nikola/data/themes/base/messages/messages_bs.py
  46. +1 −0 nikola/data/themes/base/messages/messages_ca.py
  47. +1 −0 nikola/data/themes/base/messages/messages_cs.py
  48. +1 −0 nikola/data/themes/base/messages/messages_da.py
  49. +1 −0 nikola/data/themes/base/messages/messages_de.py
  50. +1 −0 nikola/data/themes/base/messages/messages_el.py
  51. +1 −0 nikola/data/themes/base/messages/messages_en.py
  52. +1 −0 nikola/data/themes/base/messages/messages_eo.py
  53. +1 −0 nikola/data/themes/base/messages/messages_es.py
  54. +1 −0 nikola/data/themes/base/messages/messages_et.py
  55. +1 −0 nikola/data/themes/base/messages/messages_eu.py
  56. +1 −0 nikola/data/themes/base/messages/messages_fa.py
  57. +1 −0 nikola/data/themes/base/messages/messages_fi.py
  58. +1 −0 nikola/data/themes/base/messages/messages_fil.py
  59. +1 −0 nikola/data/themes/base/messages/messages_fr.py
  60. +1 −0 nikola/data/themes/base/messages/messages_gl.py
  61. +1 −0 nikola/data/themes/base/messages/messages_he.py
  62. +1 −0 nikola/data/themes/base/messages/messages_hi.py
  63. +1 −0 nikola/data/themes/base/messages/messages_hr.py
  64. +1 −0 nikola/data/themes/base/messages/messages_hu.py
  65. +1 −0 nikola/data/themes/base/messages/messages_id.py
  66. +1 −0 nikola/data/themes/base/messages/messages_it.py
  67. +1 −0 nikola/data/themes/base/messages/messages_ja.py
  68. +1 −0 nikola/data/themes/base/messages/messages_ko.py
  69. +1 −0 nikola/data/themes/base/messages/messages_lt.py
  70. +1 −0 nikola/data/themes/base/messages/messages_nb.py
  71. +1 −0 nikola/data/themes/base/messages/messages_nl.py
  72. +1 −0 nikola/data/themes/base/messages/messages_pa.py
  73. +1 −0 nikola/data/themes/base/messages/messages_pl.py
  74. +1 −0 nikola/data/themes/base/messages/messages_pt.py
  75. +1 −0 nikola/data/themes/base/messages/messages_pt_br.py
  76. +1 −0 nikola/data/themes/base/messages/messages_ru.py
  77. +1 −0 nikola/data/themes/base/messages/messages_si_lk.py
  78. +1 −0 nikola/data/themes/base/messages/messages_sk.py
  79. +1 −0 nikola/data/themes/base/messages/messages_sl.py
  80. +1 −0 nikola/data/themes/base/messages/messages_sq.py
  81. +1 −0 nikola/data/themes/base/messages/messages_sr.py
  82. +1 −0 nikola/data/themes/base/messages/messages_sr_latin.py
  83. +1 −0 nikola/data/themes/base/messages/messages_sv.py
  84. +1 −0 nikola/data/themes/base/messages/messages_te.py
  85. +1 −0 nikola/data/themes/base/messages/messages_tl.py
  86. +1 −0 nikola/data/themes/base/messages/messages_tr.py
  87. +1 −0 nikola/data/themes/base/messages/messages_uk.py
  88. +1 −0 nikola/data/themes/base/messages/messages_ur.py
  89. +1 −0 nikola/data/themes/base/messages/messages_zh_cn.py
  90. +1 −0 nikola/data/themes/base/messages/messages_zh_tw.py
  91. +2 −7 nikola/data/themes/base/templates/archiveindex.tmpl
  92. +9 −22 nikola/data/themes/base/templates/author.tmpl
  93. +2 −7 nikola/data/themes/base/templates/authorindex.tmpl
  94. +2 −2 nikola/data/themes/base/templates/base.tmpl
  95. +0 −1 nikola/data/themes/base/templates/base_footer.tmpl
  96. +2 −2 nikola/data/themes/base/templates/base_header.tmpl
  97. +23 −38 nikola/data/themes/base/templates/base_helper.tmpl
  98. +69 −0 nikola/data/themes/base/templates/feed_helper.tmpl
  99. +1 −0 nikola/data/themes/base/templates/index_helper.tmpl
  100. +2 −4 nikola/data/themes/base/templates/listing.tmpl
  101. +8 −6 nikola/data/themes/base/templates/math_helper.tmpl
  102. +1 −0 nikola/data/themes/base/templates/post_helper.tmpl
  103. +5 −8 nikola/data/themes/base/templates/sectionindex.tmpl
  104. +9 −22 nikola/data/themes/base/templates/tag.tmpl
  105. +2 −7 nikola/data/themes/base/templates/tagindex.tmpl
  106. +0 −1 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.css
  107. +0 −1 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.css.map
  108. +0 −1 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.css
  109. +0 −1 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.css.map
  110. +0 −1 nikola/data/themes/bootstrap3-jinja/assets/js/bootstrap.js
  111. +0 −1 nikola/data/themes/bootstrap3-jinja/assets/js/jquery.colorbox.js
  112. +0 −1 nikola/data/themes/bootstrap3-jinja/assets/js/jquery.js
  113. +5 −21 nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
  114. +0 −1 nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.css
  115. +0 −1 nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.css.map
  116. +0 −1 nikola/data/themes/bootstrap3/assets/css/bootstrap.css
  117. +0 −1 nikola/data/themes/bootstrap3/assets/css/bootstrap.css.map
  118. +0 −1 nikola/data/themes/bootstrap3/assets/js/bootstrap.js
  119. +0 −1 nikola/data/themes/bootstrap3/assets/js/jquery.colorbox.js
  120. +0 −1 nikola/data/themes/bootstrap3/assets/js/jquery.js
  121. +2 −2 nikola/data/themes/bootstrap3/bundles
  122. +5 −21 nikola/data/themes/bootstrap3/templates/base_helper.tmpl
  123. +6 −1 nikola/plugin_categories.py
  124. +1 −0 nikola/plugins/task/taxonomies.py
  125. +3 −1 scripts/jinjify.py
  126. +16 −9 tests/base.py
  127. +1 −0 tests/import_wordpress_and_build_workflow.py
  128. +41 −25 tests/test_command_import_wordpress.py
  129. +5 −5 tests/test_command_init.py
  130. +0 −3 tests/test_commands.py
  131. +74 −38 tests/test_integration.py
  132. +9 −4 tests/test_locale.py
  133. +0 −4 tests/test_plugin_importing.py
  134. +16 −14 tests/test_rss_feeds.py
  135. +0 −3 tests/test_rst_compiler.py
  136. +6 −4 tests/test_scheduling.py
  137. +132 −44 tests/test_shortcodes.py
  138. +5 −2 tests/test_slugify.py
  139. +2 −1 tests/test_template_shortcodes.py
  140. +44 −20 tests/test_utils.py
  141. +3 −0 translations/nikola.messages/ar.po
  142. +3 −0 translations/nikola.messages/az.po
  143. +3 −0 translations/nikola.messages/bg.po
  144. +3 −0 translations/nikola.messages/bs.po
  145. +3 −0 translations/nikola.messages/ca.po
  146. +3 −0 translations/nikola.messages/cs.po
  147. +3 −0 translations/nikola.messages/da.po
  148. +3 −0 translations/nikola.messages/de.po
  149. +3 −0 translations/nikola.messages/el.po
  150. +5 −2 translations/nikola.messages/en.po
  151. +3 −0 translations/nikola.messages/eo.po
  152. +3 −0 translations/nikola.messages/es.po
  153. +3 −0 translations/nikola.messages/et.po
  154. +3 −0 translations/nikola.messages/eu.po
  155. +3 −0 translations/nikola.messages/fa.po
  156. +3 −0 translations/nikola.messages/fi.po
  157. +3 −0 translations/nikola.messages/fil.po
  158. +3 −0 translations/nikola.messages/fr.po
  159. +3 −0 translations/nikola.messages/gl.po
  160. +3 −0 translations/nikola.messages/he.po
  161. +3 −0 translations/nikola.messages/hi.po
  162. +3 −0 translations/nikola.messages/hr.po
  163. +3 −0 translations/nikola.messages/hu.po
  164. +3 −0 translations/nikola.messages/id.po
  165. +3 −0 translations/nikola.messages/it.po
  166. +3 −0 translations/nikola.messages/ja.po
  167. +3 −0 translations/nikola.messages/ko.po
  168. +3 −0 translations/nikola.messages/lt.po
  169. +3 −0 translations/nikola.messages/nb.po
  170. +3 −0 translations/nikola.messages/nl.po
  171. +3 −0 translations/nikola.messages/pa.po
  172. +3 −0 translations/nikola.messages/pl.po
  173. +3 −0 translations/nikola.messages/pt.po
  174. +3 −0 translations/nikola.messages/pt_BR.po
  175. +4 −1 translations/nikola.messages/ru.po
  176. +3 −0 translations/nikola.messages/si_LK.po
  177. +3 −0 translations/nikola.messages/sk.po
  178. +3 −0 translations/nikola.messages/sl.po
  179. +3 −0 translations/nikola.messages/sq.po
  180. +3 −0 translations/nikola.messages/sr.po
  181. +3 −0 translations/nikola.messages/sr@latin.po
  182. +3 −0 translations/nikola.messages/sv.po
  183. +3 −0 translations/nikola.messages/te.po
  184. +3 −0 translations/nikola.messages/tl.po
  185. +3 −0 translations/nikola.messages/tr.po
  186. +3 −0 translations/nikola.messages/uk.po
  187. +3 −0 translations/nikola.messages/ur.po
  188. +3 −0 translations/nikola.messages/zh_CN.po
  189. +3 −0 translations/nikola.messages/zh_TW.po
@@ -97,20 +97,8 @@ __pycache__/
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
/build
/dist
*.egg-info/
.installed.cfg
*.egg
@@ -45,7 +45,7 @@ script:
- if [[ $NMODE == 'nikola' ]]; then nikola help; fi
- if [[ $NMODE == 'nikola' ]]; then scripts/baseline.sh check; fi
- if [[ $NMODE == 'nikola' ]]; then scripts/codacy_coverage.sh; fi
- if [[ $NMODE == 'flake8' ]]; then flake8 nikola/; fi
- if [[ $NMODE == 'flake8' ]]; then flake8 nikola/ tests/; fi
- if [[ $NMODE == 'flake8' ]]; then pydocstyle --count --match-dir='(?!^\\.)(?!data).*' nikola/; fi
after_success:
notifications:
@@ -4,19 +4,22 @@ New in master
Features
--------

* New METADATA_FORMAT option to choose preferred metadata format
(Nikola/YAML/TOML/Pelican) (Part of Issue #2801)
* Extract metadata from HTML meta and title tags like Pelican (Issue #1923)
* Providing infrastructure for taxonomies for classification pages to
link to related classifications in other languages
* Added alternate links (visible and header) for archives and authors
(Issue #993)
* Added options to add alternative links (visible and header) for
tags, sections and categories.
* New METADATA_FORMAT option to choose preferred metadata format
(Nikola/YAML/TOML/Pelican) (Part of Issue #2801)
* Extract metadata from HTML meta and title tags like Pelican (Issue #1923)
* Update assets in the ``base`` and ``base-jinja`` themes and clean
up code (Issue #2744)

Bugfixes
--------

* Support empty lines in YAML/TOML metadata (Part of issue #2801)
* Tests run on macOS.

New in v7.8.7
@@ -9,11 +9,15 @@
"license": "MIT",
"private": true,
"dependencies": {
"baguettebox.js": "~1.8",
"bootstrap": "~3.3.7",
"html5shiv": "^3.7.3",
"jquery": "<2.0.0",
"jquery-colorbox": "~1",
"moment": "~2",
"livereload-js": "~2",
"baguettebox.js": "~1.8"
"moment": "~2"
},
"devDependencies": {
"html5shiv": "^3.7.3"
}
}
@@ -0,0 +1,25 @@
{
"name": "html5shiv",
"version": "3.7.3",
"main": [
"dist/html5shiv.js"
],
"ignore": [
"**/.*",
"composer.json",
"test",
"build",
"src",
"build.xml"
],
"homepage": "https://github.com/aFarkas/html5shiv",
"_release": "3.7.3",
"_resolution": {
"type": "version",
"tag": "3.7.3",
"commit": "ed28c56c071bddfe7d635ad88995674957a016be"
},
"_source": "https://github.com/aFarkas/html5shiv.git",
"_target": "^3.7.3",
"_originalSource": "html5shiv"
}
@@ -0,0 +1,61 @@
/*global module:false*/
module.exports = function(grunt){


// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
bower: grunt.file.readJSON('bower.json'),
copy: {
demo: {
files: [
{expand: true, src: ['src/*'], dest: 'dist/', filter: 'isFile', flatten: true}
]
}
},

uglify: {
options: {
beautify: {
ascii_only : true
},
preserveComments: 'some'
},
html5shiv: {
files: [{
expand: true, // Enable dynamic expansion.
cwd: 'src/', // Src matches are relative to this path.
src: ['**/*.js'], // Actual pattern(s) to match.
dest: 'dist/', // Destination path prefix.
ext: '.min.js'
}]
}
},
watch: {
js: {
files: ['src/**/*.js'],
tasks: ['copy', 'uglify', 'bytesize']
}
},
bytesize: {
all: {
src: [
'dist/**.min.js'
]
}
}
});


// Default task.



grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-bytesize');

grunt.registerTask('default', ['copy', 'uglify', 'bytesize', 'watch']);

};

0 comments on commit c51cf3f

Please sign in to comment.