merged master

getnikola · May 22, 2015 · edfaed3 · edfaed3
2 parents 2f9436d + e03245d
commit edfaed3
Show file tree

Hide file tree

Showing 201 changed files with 50,555 additions and 247 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,7 @@ New in master
 Features
 --------
 
+* New `nikola status` command
 * Cleaner formatting of HTML output
 * Allowing category hierarchies via new option CATEGORY_ALLOW_HIERARCHIES
   (Issue #1520)
@@ -12,6 +13,8 @@ Bugfixes
 --------
 
 * Scanning of posts refactored out of core (Issue #1700)
+* 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`)

diff --git a/bower_components/jquery-colorbox/.bower.json b/bower_components/jquery-colorbox/.bower.json
@@ -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",