Merge branch 'master' into taxonomy-lang-refs

getnikola · Jun 7, 2017 · c51cf3f · c51cf3f
2 parents 39bd61b + dd38b45
commit c51cf3f
Show file tree

Hide file tree

Showing 188 changed files with 2,764 additions and 855 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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

diff --git a/.travis.yml b/.travis.yml
@@ -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:

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -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

diff --git a/bower.json b/bower.json
@@ -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"
   }
 }
diff --git a/bower_components/html5shiv/.bower.json b/bower_components/html5shiv/.bower.json
@@ -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"
+}
diff --git a/bower_components/html5shiv/Gruntfile.js b/bower_components/html5shiv/Gruntfile.js
@@ -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']);
+
+};