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: "上一頁",
next: "下一頁",
close: "關閉",
xhrError: "此內容加載失敗.",
imgError: "此圖片加載失敗.",
xhrError: "此內容載入失敗.",
imgError: "此圖片加入失敗.",
slideshowStart: "開始幻燈片",
slideshowStop: "結束幻燈片"
});
});

Large diffs are not rendered by default.

@@ -1,5 +1,5 @@
/*!
Colorbox 1.6.2
Colorbox 1.6.3
license: MIT
http://www.jacklmoore.com/colorbox
*/
@@ -413,8 +413,8 @@
var maxWidth = settings.get('maxWidth');
var maxHeight = settings.get('maxHeight');

settings.w = (maxWidth !== false ? Math.min(initialWidth, setSize(maxWidth, 'x')) : initialWidth) - loadedWidth - interfaceWidth;
settings.h = (maxHeight !== false ? Math.min(initialHeight, setSize(maxHeight, 'y')) : initialHeight) - loadedHeight - interfaceHeight;
settings.w = Math.max((maxWidth !== false ? Math.min(initialWidth, setSize(maxWidth, 'x')) : initialWidth) - loadedWidth - interfaceWidth, 0);
settings.h = Math.max((maxHeight !== false ? Math.min(initialHeight, setSize(maxHeight, 'y')) : initialHeight) - loadedHeight - interfaceHeight, 0);

$loaded.css({width:'', height:settings.h});
publicMethod.position();
@@ -1,7 +1,7 @@
{
"name": "jquery-colorbox",
"description": "jQuery lightbox and modal window plugin.",
"version": "1.6.2",
"version": "1.6.3",
"keywords": [
"modal",
"lightbox",
@@ -1,6 +1,5 @@
{
"name": "moment",
"version": "2.10.3",
"main": "moment.js",
"ignore": [
"**/.*",
@@ -21,11 +20,12 @@
"package.json"
],
"homepage": "https://github.com/moment/moment",
"_release": "2.10.3",
"version": "2.10.6",
"_release": "2.10.6",
"_resolution": {
"type": "version",
"tag": "2.10.3",
"commit": "6fa444238494318e3c488c81d8520ad2eba8bae7"
"tag": "2.10.6",
"commit": "446ce77eb08c5c862d7b0b11ef1d2e884d12e3d7"
},
"_source": "git://github.com/moment/moment.git",
"_target": "~2.10.3",
@@ -1,6 +1,24 @@
Changelog
=========

### 2.10.6

[#2515](https://github.com/moment/moment/pull/2515) Fix regression introduced
in `2.10.5` related to `moment.ISO_8601` parsing.

### 2.10.5 [See full changelog](https://gist.github.com/ichernev/6ec13ac7efc396da44b2)

Important changes:
* [#2357](https://github.com/moment/moment/pull/2357) Improve unit bubbling for ISO dates
this fixes day to year conversions to work around end-of-year (~365 days). As
a side effect 365 days is 11 months and 30 days, and 366 days is one year.
* [#2438](https://github.com/moment/moment/pull/2438) Fix inconsistent moment.min and moment.max results
Return invalid result if any of the inputs is invalid
* [#2494](https://github.com/moment/moment/pull/2494) Fix two digit year parsing with YYYY format
This brings the benefits of YY to YYYY
* [#2368](https://github.com/moment/moment/pull/2368) perf: use faster form of copying dates, across the board improvement


### 2.10.3 [See full changelog](https://gist.github.com/ichernev/f264b9bed5b00f8b1b7f)

* add `moment.fn.to` and `moment.fn.toNow` (similar to `from` and `fromNow`)
@@ -1,6 +1,7 @@
[![Join the chat at https://gitter.im/moment/moment](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/moment/moment?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

[![NPM version][npm-version-image]][npm-url] [![NPM downloads][npm-downloads-image]][npm-url] [![MIT License][license-image]][license-url] [![Build Status][travis-image]][travis-url]
[![Coverage Status](https://coveralls.io/repos/moment/moment/badge.svg?branch=master)](https://coveralls.io/r/moment/moment?branch=master)

A lightweight JavaScript date library for parsing, validating, manipulating, and formatting dates.

@@ -1,6 +1,5 @@
{
"name": "moment",
"version": "2.10.3",
"main": "moment.js",
"ignore": [
"**/.*",
@@ -28,11 +28,11 @@
},
longDateFormat : {
LT : 'HH:mm',
LTS : 'LT:ss',
LTS : 'HH:mm:ss',
L : 'DD/MM/YYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY LT',
LLLL : 'dddd, D MMMM YYYY LT'
LLL : 'D MMMM YYYY HH:mm',
LLLL : 'dddd, D MMMM YYYY HH:mm'
},
calendar : {
sameDay : '[Vandag om] LT',
@@ -18,11 +18,11 @@
weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
longDateFormat : {
LT : 'HH:mm',
LTS : 'LT:ss',
LTS : 'HH:mm:ss',
L : 'DD/MM/YYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY LT',
LLLL : 'dddd D MMMM YYYY LT'
LLL : 'D MMMM YYYY HH:mm',
LLLL : 'dddd D MMMM YYYY HH:mm'
},
calendar : {
sameDay: '[اليوم على الساعة] LT',
@@ -44,8 +44,8 @@
LTS : 'HH:mm:ss',
L : 'DD/MM/YYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY LT',
LLLL : 'dddd D MMMM YYYY LT'
LLL : 'D MMMM YYYY HH:mm',
LLLL : 'dddd D MMMM YYYY HH:mm'
},
meridiemParse: /ص|م/,
isPM : function (input) {
@@ -16,11 +16,11 @@
weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
longDateFormat: {
LT: 'HH:mm',
LTS: 'LT:ss',
LTS: 'HH:mm:ss',
L: 'DD/MM/YYYY',
LL: 'D MMMM YYYY',
LLL: 'D MMMM YYYY LT',
LLLL: 'dddd D MMMM YYYY LT'
LLL: 'D MMMM YYYY HH:mm',
LLLL: 'dddd D MMMM YYYY HH:mm'
},
calendar: {
sameDay: '[اليوم على الساعة] LT',
@@ -77,8 +77,8 @@
LTS : 'HH:mm:ss',
L : 'D/\u200FM/\u200FYYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY LT',
LLLL : 'dddd D MMMM YYYY LT'
LLL : 'D MMMM YYYY HH:mm',
LLLL : 'dddd D MMMM YYYY HH:mm'
},
meridiemParse: /ص|م/,
isPM : function (input) {
@@ -38,11 +38,11 @@
weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
longDateFormat : {
LT : 'HH:mm',
LTS : 'LT:ss',
LTS : 'HH:mm:ss',
L : 'DD.MM.YYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY LT',
LLLL : 'dddd, D MMMM YYYY LT'
LLL : 'D MMMM YYYY HH:mm',
LLLL : 'dddd, D MMMM YYYY HH:mm'
},
calendar : {
sameDay : '[bugün saat] LT',
@@ -62,11 +62,11 @@
weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
longDateFormat : {
LT : 'HH:mm',
LTS : 'LT:ss',
LTS : 'HH:mm:ss',
L : 'DD.MM.YYYY',
LL : 'D MMMM YYYY г.',
LLL : 'D MMMM YYYY г., LT',
LLLL : 'dddd, D MMMM YYYY г., LT'
LLL : 'D MMMM YYYY г., HH:mm',
LLLL : 'dddd, D MMMM YYYY г., HH:mm'
},
calendar : {
sameDay: '[Сёння ў] LT',
@@ -17,11 +17,11 @@
weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
longDateFormat : {
LT : 'H:mm',
LTS : 'LT:ss',
LTS : 'H:mm:ss',
L : 'D.MM.YYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY LT',
LLLL : 'dddd, D MMMM YYYY LT'
LLL : 'D MMMM YYYY H:mm',
LLLL : 'dddd, D MMMM YYYY H:mm'
},
calendar : {
sameDay : '[Днес в] LT',
@@ -45,8 +45,8 @@
LTS : 'A h:mm:ss সময়',
L : 'DD/MM/YYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY, LT',
LLLL : 'dddd, D MMMM YYYY, LT'
LLL : 'D MMMM YYYY, A h:mm সময়',
LLLL : 'dddd, D MMMM YYYY, A h:mm সময়'
},
calendar : {
sameDay : '[আজ] LT',
@@ -81,7 +81,7 @@
return symbolMap[match];
});
},
meridiemParse: /রাত|শকাল|দুপুর|বিকেল|রাত/,
meridiemParse: /রাত|সকাল|দুপুর|বিকেল|রাত/,
isPM: function (input) {
return /^(দুপুর|বিকেল|রাত)$/.test(input);
},
@@ -92,7 +92,7 @@
if (hour < 4) {
return 'রাত';
} else if (hour < 10) {
return 'শকাল';
return 'সকাল';
} else if (hour < 17) {
return 'দুপুর';
} else if (hour < 20) {
@@ -42,11 +42,11 @@
weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
longDateFormat : {
LT : 'A h:mm',
LTS : 'LT:ss',
LTS : 'A h:mm:ss',
L : 'DD/MM/YYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY, LT',
LLLL : 'dddd, D MMMM YYYY, LT'
LLL : 'D MMMM YYYY, A h:mm',
LLLL : 'dddd, D MMMM YYYY, A h:mm'
},
calendar : {
sameDay : '[དི་རིང] LT',
@@ -64,8 +64,8 @@
LTS : 'h[e]mm:ss A',
L : 'DD/MM/YYYY',
LL : 'D [a viz] MMMM YYYY',
LLL : 'D [a viz] MMMM YYYY LT',
LLLL : 'dddd, D [a viz] MMMM YYYY LT'
LLL : 'D [a viz] MMMM YYYY h[e]mm A',
LLLL : 'dddd, D [a viz] MMMM YYYY h[e]mm A'
},
calendar : {
sameDay : '[Hiziv da] LT',
@@ -71,11 +71,11 @@
weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
longDateFormat : {
LT : 'H:mm',
LTS : 'LT:ss',
LTS : 'H:mm:ss',
L : 'DD. MM. YYYY',
LL : 'D. MMMM YYYY',
LLL : 'D. MMMM YYYY LT',
LLLL : 'dddd, D. MMMM YYYY LT'
LLL : 'D. MMMM YYYY H:mm',
LLLL : 'dddd, D. MMMM YYYY H:mm'
},
calendar : {
sameDay : '[danas u] LT',
@@ -20,8 +20,8 @@
LTS : 'LT:ss',
L : 'DD/MM/YYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY LT',
LLLL : 'dddd D MMMM YYYY LT'
LLL : 'D MMMM YYYY H:mm',
LLLL : 'dddd D MMMM YYYY H:mm'
},
calendar : {
sameDay : function () {

0 comments on commit fd54fcc

Please sign in to comment.
You can’t perform that action at this time.