Skip to content
Permalink
Browse files
merged master
  • Loading branch information
ralsina committed May 20, 2015
2 parents 02bdaae + 156e49c commit 7e639404b2bcf0d8d2a6f4f8080830fb2836990b
Show file tree
Hide file tree
Showing 236 changed files with 11,546 additions and 9,542 deletions.
@@ -102,3 +102,5 @@ pwm1234 <https://github.com/pwm1234>
rafacarrascosa <https://github.com/rafacarrascosa>
yarko <https://github.com/yarko>
小明 <https://github.com/dongweiming>
Brad Miller <https://github.com/bnmnetp>

@@ -5,6 +5,42 @@ Features
--------

* Support [code] in wordpress importers (Issue #1186)
* Cleaner formatting of HTML output
* Allowing category hierarchies via new option CATEGORY_ALLOW_HIERARCHIES
(Issue #1520)

Bugfixes
--------

* The post-list directive only triggers rebuilds if timeline changes (Issue #1688)
* Don’t check the same remote URL more than once (Issue #1732)
* All remotely checked links resulted in incorrect warnings (`nikola check -lr`)
* Exclude `<meta content="noindex" name="robots">` from sitemaps
* new_post paths are now relative to CWD (Issue #1325)

New in v7.4.1
=============

Features
--------

* Better handling of missing/unconfigured compilers (Issue #1704)
* New -r option for the link checker to check remote links (Issue #1684)
* Use static navbars in bootstrap3 and bootstrap themes

Bugfixes
--------

* Handle strange URLs, like ed2k:// (Issue #1695)
* Fix very old metadata format support (Issue #1689)

New in v7.4.0
=============

Features
--------

>>>>>>> master
* Substitutions for RSS_LINKS_APPEND_QUERY for identifying
the source feed (feedRelUri) and the kind of feed (feedFormat).
* New option GENERATE_ATOM, off by default
@@ -35,6 +71,7 @@ Features
Bugfixes
--------

* Make ``.islink`` work properly (via Issue #1536)
* RSS_LINKS_APPEND_QUERY not working in RSS feeds for tags
* `nikola check -l` didn’t scan posts
* Don’t use sets for ``FAVICONS`` (Issue #1674)
@@ -9,9 +9,9 @@
"license": "MIT",
"private": true,
"dependencies": {
"bootstrap": "~3.3.2",
"bootstrap": "~3.3.4",
"jquery": "<2.0.0",
"jquery-colorbox": "~1.5.14",
"moment": "~2.8.4"
"jquery-colorbox": "~1.6.0",
"moment": "~2.10.3"
}
}
@@ -43,6 +43,6 @@
"commit": "a10eb60bc0b07b747fa0c4ebd8821eb7307bd07f"
},
"_source": "git://github.com/twbs/bootstrap.git",
"_target": "~3.3.2",
"_target": "~3.3.4",
"_originalSource": "bootstrap"
}
@@ -1,7 +1,7 @@
{
"name": "jquery-colorbox",
"description": "jQuery lightbox and modal window plugin",
"version": "1.5.15",
"version": "1.6.0",
"dependencies": {
"jquery": ">=1.3.2"
},
@@ -38,13 +38,13 @@
"example4/index.html",
"example5/index.html"
],
"_release": "1.5.15",
"_release": "1.6.0",
"_resolution": {
"type": "version",
"tag": "1.5.15",
"commit": "a611a80c152732b5afc7b1fa7ea0d641515f6268"
"tag": "1.6.0",
"commit": "7816dbccff2a0450fd53e726b7096ac38c1fe30c"
},
"_source": "git://github.com/jackmoore/colorbox.git",
"_target": "~1.5.14",
"_target": "~1.6.0",
"_originalSource": "jquery-colorbox"
}
@@ -3,6 +3,10 @@ A customizable lightbox plugin for jQuery. See the [project page](http://jacklm

## Changelog:

### Version 1.6.0 - 2015/03/03

* Added two new properties that expose how <img> and <iframe> elements are created, to give users direct control over those elements. Fixes #700.

### Version 1.5.15 - 2015/02/25

* Adding to NPM, merged white-space cleanup & new language file.
@@ -1,7 +1,7 @@
{
"name": "jquery-colorbox",
"description": "jQuery lightbox and modal window plugin",
"version": "1.5.15",
"version": "1.6.0",
"dependencies": {
"jquery": ">=1.3.2"
},

Large diffs are not rendered by default.

@@ -1,5 +1,5 @@
/*!
Colorbox 1.5.15
Colorbox 1.6.0
license: MIT
http://www.jacklmoore.com/colorbox
*/
@@ -85,6 +85,39 @@
},
title: function() {
return this.title;
},
createImg: function() {
var img = new Image();
var attrs = $(this).data('cbox-img-attrs');

if (typeof attrs === 'object') {
$.each(attrs, function(key, val){
img[key] = val;
});
}

return img;
},
createIframe: function() {
var iframe = document.createElement('iframe');
var attrs = $(this).data('cbox-iframe-attrs');

if (typeof attrs === 'object') {
$.each(attrs, function(key, val){
iframe[key] = val;
});
}

if ('frameBorder' in iframe) {
iframe.frameBorder = 0;
}
if ('allowTransparency' in iframe) {
iframe.allowTransparency = "true";
}
iframe.name = (new Date()).getTime(); // give the iframe a unique name to prevent caching
iframe.allowFullScreen = true;

return iframe;
}
},

@@ -834,15 +867,8 @@
}

if (settings.get('iframe')) {
iframe = document.createElement('iframe');

if ('frameBorder' in iframe) {
iframe.frameBorder = 0;
}

if ('allowTransparency' in iframe) {
iframe.allowTransparency = "true";
}
iframe = settings.get('createIframe');

if (!settings.get('scrolling')) {
iframe.scrolling = "no";
@@ -851,9 +877,7 @@
$(iframe)
.attr({
src: settings.get('href'),
name: (new Date()).getTime(), // give the iframe a unique name to prevent caching
'class': prefix + 'Iframe',
allowFullScreen : true // allow HTML5 video to go fullscreen
'class': prefix + 'Iframe'
})
.one('load', complete)
.appendTo($loaded);
@@ -946,7 +970,7 @@

href = retinaUrl(settings, href);

photo = new Image();
photo = settings.get('createImg');

$(photo)
.addClass(prefix + 'Photo')
@@ -963,13 +987,6 @@
setTimeout(function(){
var percent;

$.each(['alt', 'longdesc', 'aria-describedby'], function(i,val){
var attr = $(settings.el).attr(val) || $(settings.el).attr('data-'+val);
if (attr) {
photo.setAttribute(val, attr);
}
});

if (settings.get('retinaImage') && window.devicePixelRatio > 1) {
photo.height = photo.height / window.devicePixelRatio;
photo.width = photo.width / window.devicePixelRatio;
@@ -1,7 +1,7 @@
{
"name": "jquery-colorbox",
"description": "jQuery lightbox and modal window plugin.",
"version": "1.5.15",
"version": "1.6.0",
"keywords": [
"modal",
"lightbox",
@@ -15,6 +15,7 @@
"url": "http://www.jacklmoore.com",
"email": "hello@jacklmoore.com"
},
"main": "jquery.colorbox.js",
"license": "MIT",
"homepage": "http://www.jacklmoore.com/colorbox",
"demo": "http://www.jacklmoore.com/colorbox",
@@ -24,5 +25,5 @@
},
"dependencies": {
"jquery": ">=1.3.2"
},
}
}