Skip to content
Permalink
Browse files

merged master

  • Loading branch information
ralsina committed May 14, 2016
2 parents 715b45b + f09b1cd commit ef10f2db51dbde5b39f433fea202b2e4a5036a37
Showing with 2,902 additions and 443 deletions.
  1. +1 −1 .travis.yml
  2. +1 −0 AUTHORS.txt
  3. +25 −0 CHANGES.txt
  4. +1 −1 appveyor.yml
  5. +5 −5 bower_components/jquery/.bower.json
  6. +26 −37 bower_components/jquery/dist/jquery.js
  7. +5 −5 bower_components/jquery/dist/jquery.min.js
  8. +1 −1 bower_components/jquery/dist/jquery.min.map
  9. +36 −0 bower_components/jquery/sizzle/LICENSE.txt
  10. +2,143 −0 bower_components/jquery/sizzle/dist/sizzle.js
  11. +3 −0 bower_components/jquery/sizzle/dist/sizzle.min.js
  12. +1 −0 bower_components/jquery/sizzle/dist/sizzle.min.map
  13. +1 −1 bower_components/jquery/src/ajax/load.js
  14. +0 −7 bower_components/jquery/src/ajax/script.js
  15. +15 −2 bower_components/jquery/src/attributes/prop.js
  16. +6 −3 bower_components/jquery/src/attributes/val.js
  17. +3 −11 bower_components/jquery/src/core/parseHTML.js
  18. +3 −6 bower_components/jquery/src/core/support.js
  19. +1 −1 bower_components/jquery/src/css/var/getStyles.js
  20. +61 −20 bower_components/jquery/src/data/Data.js
  21. +2 −2 bower_components/jquery/src/event/trigger.js
  22. +65 −27 docs/extending.txt
  23. BIN docs/man/nikola.1.gz
  24. +1 −1 docs/man/nikola.rst
  25. +24 −6 docs/manual.txt
  26. +1 −1 docs/social_buttons.txt
  27. +2 −2 docs/sphinx/conf.py
  28. +1 −1 docs/theming.txt
  29. +1 −1 nikola/__init__.py
  30. +2 −1 nikola/conf.py.in
  31. +3 −0 nikola/data/symlinked.txt
  32. +1 −1 nikola/data/themes/base/assets/css/rst.css
  33. +0 −1 nikola/data/themes/base/assets/js/jquery.min.map
  34. +4 −4 nikola/data/themes/base/messages/messages_ar.py
  35. +43 −0 nikola/data/themes/base/messages/messages_lt.py
  36. +1 −0 nikola/data/themes/bootstrap3-jinja/assets/js/jquery.slim.js
  37. +1 −0 nikola/data/themes/bootstrap3-jinja/assets/js/jquery.slim.min.js
  38. +1 −0 nikola/data/themes/bootstrap3-jinja/assets/js/jquery.slim.min.map
  39. +1 −1 nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
  40. +1 −1 nikola/data/themes/bootstrap3/templates/base_helper.tmpl
  41. +42 −17 nikola/nikola.py
  42. +3 −3 nikola/plugins/command/auto/__init__.py
  43. +2 −3 nikola/plugins/command/deploy.py
  44. +3 −7 nikola/plugins/command/github_deploy.py
  45. +8 −2 nikola/plugins/command/import_wordpress.py
  46. +3 −0 nikola/plugins/command/new_post.py
  47. +1 −1 nikola/plugins/command/serve.py
  48. +38 −13 nikola/plugins/command/status.py
  49. +21 −134 nikola/plugins/compile/markdown/mdx_gist.py
  50. +8 −0 nikola/plugins/compile/rest/__init__.py
  51. +12 −5 nikola/plugins/compile/rest/soundcloud.py
  52. +9 −1 nikola/plugins/compile/rest/vimeo.py
  53. +10 −4 nikola/plugins/compile/rest/youtube.py
  54. +1 −1 nikola/plugins/task/py3_switch.py
  55. +5 −1 nikola/state.py
  56. +1 −1 requirements-tests.txt
  57. +4 −0 setup.cfg
  58. +1 −1 setup.py
  59. +0 −43 tests/test_compile_markdown.py
  60. +2 −1 tests/test_rss_feeds.py
  61. +0 −50 tests/test_rst_compiler.py
  62. +86 −0 tests/test_template_shortcodes.py
  63. +4 −4 translations/nikola.messages/ar.po
  64. +145 −0 translations/nikola.messages/lt.po
@@ -31,7 +31,7 @@ install:
# WARNING: if you edit this, make sure to replicate your changes in dodo.py and appveyor.yml.
script:
- "if [[ $NMODE == 'nikola' ]]; then py.test --doctest-modules nikola/; fi"
- "if [[ $NMODE == 'nikola' ]]; then py.test --cov nikola --cov-report term-missing tests/; fi"
- "if [[ $NMODE == 'nikola' ]]; then py.test tests/; fi"
- "if [[ $NMODE == 'nikola' ]]; then nikola; fi"
- "if [[ $NMODE == 'nikola' ]]; then nikola help; fi"
- "if [[ $NMODE == 'flake8' ]]; then flake8 nikola/; fi"
@@ -15,6 +15,7 @@
* `Casey M. Bessette <https://github.com/caseybessette>`_
* `Chris Lee <https://github.com/clee>`_
* `Chris Warrick <https://github.com/Kwpolska>`_
* `Christopher Arndt <https:/github.com/SpotlightKid>`_
* `Claudio Canepa <https://github.com/ccanepa>`_
* `Damien Tournoud <https://github.com/damz>`_
* `Damián Avila <https://github.com/damianavila>`_
@@ -4,11 +4,36 @@ New in master
Features
--------

* Added ``enclosure_length`` meta field for better interop (Issue #2338)
* New Lithuanian translation by Antanas Lasys

Bugfixes
--------

* Don't call sys.exit() from plugins if possible (Issue #1839)
* Create Persistor directories only if site is configured (Issue #2334)
* Remove newlines in imported WordPress titles (Issue #2330)

New in v7.7.8
=============

Features
--------

* Template-based shortcodes now receive positional arguments too (Issue #2319)

Bugfixes
--------

* Warn if a tag appears multiple times in a post (Issue #2315)
* Fix folder handling and redirects in ``nikola auto`` (Issue #2331)
* Use state files in ``nikola github_deploy`` and ``nikola status``
(Issue #2317)
* Add ``align`` options for ``youtube``, ``vimeo``, ``soundcloud``
reST directives (Issue #2304)
* Update ``FILE_METADATA_REGEXP`` example in docs (Issue #2296)
* Show “tags too similar” error instead of cryptic doit crash (Issue #2325)
* Fix crashes when tag appears multiple times in a post (Issue #2315)
* Use binary I/O for ``.svg`` files in galleries
* Accept ``.svgz`` extension by default
* Don't randomly load plugins when Nikola is called with no arguments (Issue #2297)
@@ -9,7 +9,7 @@ init:
- ps: "ls C:/Python*"
install:
- "%PYTHON%/Scripts/pip.exe install --no-index -f https://users.getnikola.com/static/nikola-windows-wheels lxml"
- "%PYTHON%/Scripts/pip.exe install -r requirements-extras.txt pytest mock freezegun"
- "%PYTHON%/Scripts/pip.exe install -r requirements-extras.txt pytest coverage pytest-cov mock freezegun"
- "%PYTHON%/Scripts/pip.exe install ."

test_script:
@@ -12,14 +12,14 @@
"library"
],
"homepage": "https://github.com/jquery/jquery-dist",
"version": "1.12.1",
"_release": "1.12.1",
"version": "1.12.3",
"_release": "1.12.3",
"_resolution": {
"type": "version",
"tag": "1.12.1",
"commit": "56ead6ffbf8560c521e7e94518d35db42b19f5f3"
"tag": "1.12.3",
"commit": "3a43d7e563314bf32970b773dd31ecf2b90813dd"
},
"_source": "git://github.com/jquery/jquery-dist.git",
"_source": "https://github.com/jquery/jquery-dist.git",
"_target": "<2.0.0",
"_originalSource": "jquery"
}
@@ -1,5 +1,5 @@
/*!
* jQuery JavaScript Library v1.12.1
* jQuery JavaScript Library v1.12.3
* http://jquery.com/
*
* Includes Sizzle.js
@@ -9,7 +9,7 @@
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2016-02-22T19:07Z
* Date: 2016-04-05T19:16Z
*/

(function( global, factory ) {
@@ -65,7 +65,7 @@ var support = {};


var
version = "1.12.1",
version = "1.12.3",

// Define a local copy of jQuery
jQuery = function( selector, context ) {
@@ -8198,7 +8198,8 @@ jQuery.fn.delay = function( time, type ) {
} )();


var rreturn = /\r/g;
var rreturn = /\r/g,
rspaces = /[\x20\t\r\n\f]+/g;

jQuery.fn.extend( {
val: function( value ) {
@@ -8278,7 +8279,9 @@ jQuery.extend( {

// Support: IE10-11+
// option.text throws exceptions (#14686, #14858)
jQuery.trim( jQuery.text( elem ) );
// Strip and collapse whitespace
// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
jQuery.trim( jQuery.text( elem ) ).replace( rspaces, " " );
}
},
select: {
@@ -8332,7 +8335,7 @@ jQuery.extend( {
while ( i-- ) {
option = options[ i ];

if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0 ) {
if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 ) {

// Support: IE6
// When new option element is added to select box we need to
@@ -8751,8 +8754,11 @@ if ( !support.hrefNormalized ) {
}

// Support: Safari, IE9+
// mis-reports the default selected property of an option
// Accessing the parent's selectedIndex property fixes it
// Accessing the selectedIndex property
// forces the browser to respect setting selected
// on the option
// The getter ensures a default option is selected
// when in an optgroup
if ( !support.optSelected ) {
jQuery.propHooks.selected = {
get: function( elem ) {
@@ -8767,6 +8773,16 @@ if ( !support.optSelected ) {
}
}
return null;
},
set: function( elem ) {
var parent = elem.parentNode;
if ( parent ) {
parent.selectedIndex;

if ( parent.parentNode ) {
parent.parentNode.selectedIndex;
}
}
}
};
}
@@ -10349,13 +10365,6 @@ function createActiveXHR() {



// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
jQuery.ajaxPrefilter( function( s ) {
if ( s.crossDomain ) {
s.contents.script = false;
}
} );

// Install script dataType
jQuery.ajaxSetup( {
accepts: {
@@ -10542,21 +10551,6 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {



// Support: Safari 8+
// In Safari 8 documents created via document.implementation.createHTMLDocument
// collapse sibling forms: the second one becomes a child of the first one.
// Because of that, this security measure has to be disabled in Safari 8.
// https://bugs.webkit.org/show_bug.cgi?id=137337
support.createHTMLDocument = ( function() {
if ( !document.implementation.createHTMLDocument ) {
return false;
}
var doc = document.implementation.createHTMLDocument( "" );
doc.body.innerHTML = "<form></form><form></form>";
return doc.body.childNodes.length === 2;
} )();


// data: string of html
// context (optional): If specified, the fragment will be created in this context,
// defaults to document
@@ -10569,12 +10563,7 @@ jQuery.parseHTML = function( data, context, keepScripts ) {
keepScripts = context;
context = false;
}

// document.implementation stops scripts or inline event handlers from
// being executed immediately
context = context || ( support.createHTMLDocument ?
document.implementation.createHTMLDocument( "" ) :
document );
context = context || document;

var parsed = rsingleTag.exec( data ),
scripts = !keepScripts && [];
@@ -10656,7 +10645,7 @@ jQuery.fn.load = function( url, params, callback ) {
// If it fails, this function gets "jqXHR", "status", "error"
} ).always( callback && function( jqXHR, status ) {
self.each( function() {
callback.apply( self, response || [ jqXHR.responseText, status, jqXHR ] );
callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
} );
} );
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -0,0 +1,36 @@
Copyright jQuery Foundation and other contributors, https://jquery.org/

This software consists of voluntary contributions made by many
individuals. For exact contribution history, see the revision history
available at https://github.com/jquery/sizzle

The following license applies to all parts of this software except as
documented below:

====

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.

====

All files located in the node_modules and external directories are
externally maintained libraries used by this software which have their
own licenses; we recommend you read them, as their terms may differ from
the terms above.

0 comments on commit ef10f2d

Please sign in to comment.