Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin/master' into status-command
Conflicts:
	CHANGES.txt
  • Loading branch information
da2x committed May 21, 2015
2 parents eca8be6 + 35b57a8 commit 14d0bdd4ec252ecc0bf1d2c3daff715acb078125
Showing 196 changed files with 50,449 additions and 136 deletions.
@@ -4,13 +4,17 @@ New in master
Features
--------

* New `nikola status` command
* Cleaner formatting of HTML output
* Allowing category hierarchies via new option CATEGORY_ALLOW_HIERARCHIES
(Issue #1520)

Bugfixes
--------

* github_deploy records lastdeploy timestamp like regular deploy
* Use a global directory for gallery images, ignoring translations (Issue #1726)
* 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
@@ -1,7 +1,7 @@
{
"name": "jquery-colorbox",
"description": "jQuery lightbox and modal window plugin",
"version": "1.6.0",
"version": "1.6.1",
"dependencies": {
"jquery": ">=1.3.2"
},
@@ -38,11 +38,11 @@
"example4/index.html",
"example5/index.html"
],
"_release": "1.6.0",
"_release": "1.6.1",
"_resolution": {
"type": "version",
"tag": "1.6.0",
"commit": "7816dbccff2a0450fd53e726b7096ac38c1fe30c"
"tag": "1.6.1",
"commit": "b817f48e5b8e5fa694020ef5fe2ccfd76d2bf4f0"
},
"_source": "git://github.com/jackmoore/colorbox.git",
"_target": "~1.6.0",

0 comments on commit 14d0bdd

Please sign in to comment.