Skip to content
Permalink
Browse files
solved conflict
  • Loading branch information
ralsina committed Aug 5, 2015
2 parents f777562 + 511dc33 commit fd54fccb03b6833d3ee9859d184856f87c2318ad
Showing 309 changed files with 4,614 additions and 2,067 deletions.
@@ -23,7 +23,7 @@ install:
- "if [[ $NMODE == 'nikola' ]]; then pip install -r requirements-tests.txt; if [[ \"$?\" == '1' ]]; then cat /home/travis/.pip/pip.log; false; fi; fi"
- "if [[ $NMODE == 'nikola' ]]; then pip install .; fi"
- "if [[ $NMODE == 'nikola' ]]; then scripts/getbaseline.sh $(scripts/getpyver.py short); fi"
- "if [[ $NMODE == 'flake8' ]]; then pip install flake8; fi"
- "if [[ $NMODE == 'flake8' ]]; then pip install flake8 pep257; fi"
# We run tests and nikola (to see if the command is executable) OR flake8.
# We run `nikola` and `nikola help` because things may break due to human
# errors in argument parsing (cf. 96e78dd)
@@ -34,6 +34,7 @@ script:
- "if [[ $NMODE == 'nikola' ]]; then nikola; fi"
- "if [[ $NMODE == 'nikola' ]]; then nikola help; fi"
- "if [[ $NMODE == 'flake8' ]]; then flake8 nikola/; fi"
- "if [[ $NMODE == 'flake8' ]]; then pep257 --count --match-dir='(?!^\\\\.)(?!data).*' nikola/; fi"
after_success:
- "if [[ $NMODE == 'nikola' ]]; then coveralls; fi"
notifications:
@@ -10,6 +10,7 @@
* `Boris Kaul <https://github.com/localvoid>`_
* `Brandon W. Maister <https://github.com/quodlibetor>`_
* `Bussonnier Matthias <https://gtihub.com/carreau>`_
* `Carlos Martín Sánchez <https://github.com/carlosvin>`_
* `Carsten Grohmann <https://github.com/CarstenGrohmann>`_
* `Casey M. Bessette <https://github.com/caseybessette>`_
* `Chris Lee <https://github.com/clee>`_
@@ -4,18 +4,43 @@ New in master
Features
--------

* Remove empty directories with nikola check --clean-files (Issue #1873)
* Render Jupyter notebooks (ipynb) in listings (Issue #1900)

Bugfixes
--------

* Avoid Broken Pipe error in nikola auto (Issue #1906)
* "nikola auto" serving implicit index.html with wrong mime type (Issue #1921)
* Handle non-integer shutter speeds and other variables in WordPress
importer (Issue #1917)


New in v7.6.2
=============

Features
--------

* Make the Google Search example prettier, integrating well with
Bootstrap 3 (Issue #1912)
* Add categories filter to post list directive (via Issue #1889)
* Remove empty directories with nikola check --clean-files (Issue #1873)

Bugfixes
--------

* Don't auto-rebuild on changes to ".foo" or "foo~" or changes in folders.
* Don't assume things are HTML in auto mode (Issue #1915)
* Don’t rebuild Atom syndication files unnecessarily often
* Include .php files in sitemaps
* Retry all client errors (4xx) to HEAD as GET reques when checking remote links
* Graceful fallback in ``nikola serve --detach`` on Windows (Issue #1913)
* Don't auto-rebuild on changes to ".foo" or "foo~" or changes in folders
* auto should also rebuild in response to move events
* Don’t get metadata from file if compiler-specific metadata exist (Issue #1904)
* Fix PRETTY_URLS prompt for Windows (Issue #1901)
* Fix reST and Markdown title extraction from documents (Issue #1895, #1898)
* Minor improvements in the extending document.
* Minor improvements to the extending document
* Re-add the hack to kill nikola auto on ^C (Issue #1893)

New in v7.6.1
@@ -37,12 +37,12 @@
"example4/index.html",
"example5/index.html"
],
"version": "1.6.2",
"_release": "1.6.2",
"version": "1.6.3",
"_release": "1.6.3",
"_resolution": {
"type": "version",
"tag": "1.6.2",
"commit": "b14397fd611c10ee8969c4e25535ced62cf97ace"
"tag": "1.6.3",
"commit": "f08f0ac16996b14e4ce681e0a08befc129b93924"
},
"_source": "git://github.com/jackmoore/colorbox.git",
"_target": "~1.6.0",
@@ -3,6 +3,10 @@ A customizable lightbox plugin for jQuery. See the [project page](http://jacklm

## Changelog:

##### Version 1.6.3 - 2015/07/27

* Fixed regression that caused error in IE8 when the calculated initial size was negative. Fixes #741

##### Version 1.6.2 - 2015/07/13

* Fixed iframe attribute name (allowFullScreen to allowFullscreen). Fixes #737
@@ -8,8 +8,8 @@ jQuery.extend(jQuery.colorbox.settings, {
previous: "上一頁",