Skip to content
Permalink
Browse files

merged master

  • Loading branch information
ralsina committed May 22, 2015
2 parents 2f9436d + e03245d commit edfaed3fe27993f397f1bdd1418c4e1a0cf9b60b
Showing with 50,555 additions and 247 deletions.
  1. +3 −0 CHANGES.txt
  2. +4 −4 bower_components/jquery-colorbox/.bower.json
  3. +115 −111 bower_components/jquery-colorbox/README.md
  4. +1 −1 bower_components/jquery-colorbox/bower.json
  5. +2 −2 bower_components/jquery-colorbox/jquery.colorbox-min.js
  6. +5 −4 bower_components/jquery-colorbox/jquery.colorbox.js
  7. +1 −1 bower_components/jquery-colorbox/package.json
  8. +56 −0 bower_components/moment/locale/ar-tn.js
  9. +70 −0 bower_components/moment/locale/fy.js
  10. +82 −0 bower_components/moment/locale/jv.js
  11. +108 −0 bower_components/moment/locale/me.js
  12. +64 −0 bower_components/moment/locale/si.js
  13. +39,537 −0 bower_components/moment/min/tests.js
  14. +28 −0 bower_components/moment/src/lib/create/check-overflow.js
  15. +19 −0 bower_components/moment/src/lib/create/date-from-array.js
  16. +93 −0 bower_components/moment/src/lib/create/from-anything.js
  17. +124 −0 bower_components/moment/src/lib/create/from-array.js
  18. +13 −0 bower_components/moment/src/lib/create/from-object.js
  19. +50 −0 bower_components/moment/src/lib/create/from-string-and-array.js
  20. +102 −0 bower_components/moment/src/lib/create/from-string-and-format.js
  21. +83 −0 bower_components/moment/src/lib/create/from-string.js
  22. +5 −0 bower_components/moment/src/lib/create/local.js
  23. +22 −0 bower_components/moment/src/lib/create/parsing-flags.js
  24. +5 −0 bower_components/moment/src/lib/create/utc.js
  25. +36 −0 bower_components/moment/src/lib/create/valid.js
  26. +18 −0 bower_components/moment/src/lib/duration/abs.js
  27. +21 −0 bower_components/moment/src/lib/duration/add-subtract.js
  28. +55 −0 bower_components/moment/src/lib/duration/as.js
  29. +54 −0 bower_components/moment/src/lib/duration/bubble.js
  30. +41 −0 bower_components/moment/src/lib/duration/constructor.js
  31. +113 −0 bower_components/moment/src/lib/duration/create.js
  32. +12 −0 bower_components/moment/src/lib/duration/duration.js
  33. +25 −0 bower_components/moment/src/lib/duration/get.js
  34. +64 −0 bower_components/moment/src/lib/duration/humanize.js
  35. +28 −0 bower_components/moment/src/lib/duration/iso-string.js
  36. +48 −0 bower_components/moment/src/lib/duration/prototype.js
  37. +95 −0 bower_components/moment/src/lib/format/format.js
  38. +13 −0 bower_components/moment/src/lib/locale/calendar.js
  39. +2 −0 bower_components/moment/src/lib/locale/constructor.js
  40. +15 −0 bower_components/moment/src/lib/locale/en.js
  41. +19 −0 bower_components/moment/src/lib/locale/formats.js
  42. +5 −0 bower_components/moment/src/lib/locale/invalid.js
  43. +48 −0 bower_components/moment/src/lib/locale/lists.js
  44. +35 −0 bower_components/moment/src/lib/locale/locale.js
  45. +119 −0 bower_components/moment/src/lib/locale/locales.js
  46. +7 −0 bower_components/moment/src/lib/locale/ordinal.js
  47. +3 −0 bower_components/moment/src/lib/locale/pre-post-format.js
  48. +70 −0 bower_components/moment/src/lib/locale/prototype.js
  49. +27 −0 bower_components/moment/src/lib/locale/relative.js
  50. +14 −0 bower_components/moment/src/lib/locale/set.js
  51. +46 −0 bower_components/moment/src/lib/moment/add-subtract.js
  52. +17 −0 bower_components/moment/src/lib/moment/calendar.js
  53. +5 −0 bower_components/moment/src/lib/moment/clone.js
  54. +43 −0 bower_components/moment/src/lib/moment/compare.js
  55. +73 −0 bower_components/moment/src/lib/moment/constructor.js
  56. +49 −0 bower_components/moment/src/lib/moment/diff.js
  57. +27 −0 bower_components/moment/src/lib/moment/format.js
  58. +13 −0 bower_components/moment/src/lib/moment/from.js
  59. +39 −0 bower_components/moment/src/lib/moment/get-set.js
  60. +34 −0 bower_components/moment/src/lib/moment/locale.js
  61. +54 −0 bower_components/moment/src/lib/moment/min-max.js
  62. +26 −0 bower_components/moment/src/lib/moment/moment.js
  63. +144 −0 bower_components/moment/src/lib/moment/prototype.js
  64. +52 −0 bower_components/moment/src/lib/moment/start-end-of.js
  65. +16 −0 bower_components/moment/src/lib/moment/to-type.js
  66. +13 −0 bower_components/moment/src/lib/moment/to.js
  67. +15 −0 bower_components/moment/src/lib/moment/valid.js
  68. +44 −0 bower_components/moment/src/lib/parse/regex.js
  69. +32 −0 bower_components/moment/src/lib/parse/token.js
  70. +29 −0 bower_components/moment/src/lib/units/aliases.js
  71. +7 −0 bower_components/moment/src/lib/units/constants.js
  72. +32 −0 bower_components/moment/src/lib/units/day-of-month.js
  73. +134 −0 bower_components/moment/src/lib/units/day-of-week.js
  74. +49 −0 bower_components/moment/src/lib/units/day-of-year.js
  75. +77 −0 bower_components/moment/src/lib/units/hour.js
  76. +42 −0 bower_components/moment/src/lib/units/millisecond.js
  77. +24 −0 bower_components/moment/src/lib/units/minute.js
  78. +129 −0 bower_components/moment/src/lib/units/month.js
  79. +206 −0 bower_components/moment/src/lib/units/offset.js
  80. +27 −0 bower_components/moment/src/lib/units/quarter.js
  81. +24 −0 bower_components/moment/src/lib/units/second.js
  82. +20 −0 bower_components/moment/src/lib/units/timestamp.js
  83. +16 −0 bower_components/moment/src/lib/units/timezone.js
  84. +20 −0 bower_components/moment/src/lib/units/units.js
  85. +78 −0 bower_components/moment/src/lib/units/week-year.js
  86. +88 −0 bower_components/moment/src/lib/units/week.js
  87. +60 −0 bower_components/moment/src/lib/units/year.js
  88. +7 −0 bower_components/moment/src/lib/utils/abs-floor.js
  89. +16 −0 bower_components/moment/src/lib/utils/compare-arrays.js
  90. +10 −0 bower_components/moment/src/lib/utils/defaults.js
  91. +33 −0 bower_components/moment/src/lib/utils/deprecate.js
  92. +19 −0 bower_components/moment/src/lib/utils/extend.js
  93. +3 −0 bower_components/moment/src/lib/utils/has-own-prop.js
  94. +13 −0 bower_components/moment/src/lib/utils/hooks.js
  95. +3 −0 bower_components/moment/src/lib/utils/is-array.js
  96. +3 −0 bower_components/moment/src/lib/utils/is-date.js
  97. +7 −0 bower_components/moment/src/lib/utils/map.js
  98. +14 −0 bower_components/moment/src/lib/utils/to-int.js
  99. +9 −0 bower_components/moment/src/lib/utils/zero-fill.js
  100. +63 −0 bower_components/moment/src/locale/af.js
  101. +50 −0 bower_components/moment/src/locale/ar-ma.js
  102. +94 −0 bower_components/moment/src/locale/ar-sa.js
  103. +48 −0 bower_components/moment/src/locale/ar-tn.js
  104. +127 −0 bower_components/moment/src/locale/ar.js
  105. +95 −0 bower_components/moment/src/locale/az.js
  106. +138 −0 bower_components/moment/src/locale/be.js
  107. +81 −0 bower_components/moment/src/locale/bg.js
  108. +104 −0 bower_components/moment/src/locale/bn.js
  109. +101 −0 bower_components/moment/src/locale/bo.js
  110. +98 −0 bower_components/moment/src/locale/br.js
  111. +132 −0 bower_components/moment/src/locale/bs.js
  112. +70 −0 bower_components/moment/src/locale/ca.js
  113. +148 −0 bower_components/moment/src/locale/cs.js
  114. +53 −0 bower_components/moment/src/locale/cv.js
  115. +70 −0 bower_components/moment/src/locale/cy.js
  116. +51 −0 bower_components/moment/src/locale/da.js
  117. +67 −0 bower_components/moment/src/locale/de-at.js
  118. +66 −0 bower_components/moment/src/locale/de.js
  119. +85 −0 bower_components/moment/src/locale/el.js
  120. +57 −0 bower_components/moment/src/locale/en-au.js
  121. +54 −0 bower_components/moment/src/locale/en-ca.js
  122. +58 −0 bower_components/moment/src/locale/en-gb.js
  123. +64 −0 bower_components/moment/src/locale/eo.js
  124. +70 −0 bower_components/moment/src/locale/es.js
  125. +71 −0 bower_components/moment/src/locale/et.js
  126. +55 −0 bower_components/moment/src/locale/eu.js
  127. +96 −0 bower_components/moment/src/locale/fa.js
  128. +98 −0 bower_components/moment/src/locale/fi.js
  129. +51 −0 bower_components/moment/src/locale/fo.js
  130. +49 −0 bower_components/moment/src/locale/fr-ca.js
  131. +53 −0 bower_components/moment/src/locale/fr.js
  132. +62 −0 bower_components/moment/src/locale/fy.js
  133. +66 −0 bower_components/moment/src/locale/gl.js
  134. +73 −0 bower_components/moment/src/locale/he.js
  135. +114 −0 bower_components/moment/src/locale/hi.js
  136. +131 −0 bower_components/moment/src/locale/hr.js
  137. +100 −0 bower_components/moment/src/locale/hu.js
  138. +102 −0 bower_components/moment/src/locale/hy-am.js
  139. +74 −0 bower_components/moment/src/locale/id.js
  140. +118 −0 bower_components/moment/src/locale/is.js
  141. +61 −0 bower_components/moment/src/locale/it.js
  142. +56 −0 bower_components/moment/src/locale/ja.js
  143. +73 −0 bower_components/moment/src/locale/jv.js
  144. +94 −0 bower_components/moment/src/locale/ka.js
  145. +49 −0 bower_components/moment/src/locale/km.js
  146. +59 −0 bower_components/moment/src/locale/ko.js
  147. +125 −0 bower_components/moment/src/locale/lb.js
  148. +106 −0 bower_components/moment/src/locale/lt.js
  149. +87 −0 bower_components/moment/src/locale/lv.js
  150. +99 −0 bower_components/moment/src/locale/me.js
  151. +81 −0 bower_components/moment/src/locale/mk.js
  152. +62 −0 bower_components/moment/src/locale/ml.js
  153. +112 −0 bower_components/moment/src/locale/mr.js
  154. +73 −0 bower_components/moment/src/locale/ms-my.js
  155. +84 −0 bower_components/moment/src/locale/my.js
  156. +52 −0 bower_components/moment/src/locale/nb.js
  157. +114 −0 bower_components/moment/src/locale/ne.js
  158. +62 −0 bower_components/moment/src/locale/nl.js
  159. +51 −0 bower_components/moment/src/locale/nn.js
  160. +95 −0 bower_components/moment/src/locale/pl.js
  161. +51 −0 bower_components/moment/src/locale/pt-br.js
  162. +55 −0 bower_components/moment/src/locale/pt.js
  163. +65 −0 bower_components/moment/src/locale/ro.js
  164. +155 −0 bower_components/moment/src/locale/ru.js
  165. +56 −0 bower_components/moment/src/locale/si.js
  166. +149 −0 bower_components/moment/src/locale/sk.js
  167. +150 −0 bower_components/moment/src/locale/sl.js
  168. +60 −0 bower_components/moment/src/locale/sq.js
  169. +99 −0 bower_components/moment/src/locale/sr-cyrl.js
  170. +99 −0 bower_components/moment/src/locale/sr.js
  171. +58 −0 bower_components/moment/src/locale/sv.js
  172. +86 −0 bower_components/moment/src/locale/ta.js
  173. +56 −0 bower_components/moment/src/locale/th.js
  174. +53 −0 bower_components/moment/src/locale/tl-ph.js
  175. +81 −0 bower_components/moment/src/locale/tr.js
  176. +49 −0 bower_components/moment/src/locale/tzm-latn.js
  177. +49 −0 bower_components/moment/src/locale/tzm.js
  178. +144 −0 bower_components/moment/src/locale/uk.js
  179. +49 −0 bower_components/moment/src/locale/uz.js
  180. +57 −0 bower_components/moment/src/locale/vi.js
  181. +118 −0 bower_components/moment/src/locale/zh-cn.js
  182. +91 −0 bower_components/moment/src/locale/zh-tw.js
  183. +68 −0 bower_components/moment/src/moment.js
  184. +7 −0 bower_components/moment/templates/amd-named.js
  185. +7 −0 bower_components/moment/templates/amd.js
  186. +5 −0 bower_components/moment/templates/globals.js
  187. +5 −0 bower_components/moment/templates/locale-header.js
  188. +5 −0 bower_components/moment/templates/test-header.js
  189. BIN docs/man/nikola.1.gz
  190. +0 −111 docs/upgrading-to-v6.txt
  191. +13 −7 nikola/__main__.py
  192. +0 −1 nikola/data/samplesite/stories/upgrading-to-v6.txt
  193. +1 −0 nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bn.js
  194. +1 −0 nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bn.js
  195. +1 −0 nikola/nikola.py
  196. +12 −1 nikola/plugins/command/github_deploy.py
  197. +9 −0 nikola/plugins/command/status.plugin
  198. +104 −0 nikola/plugins/command/status.py
  199. +8 −2 nikola/plugins/task/galleries.py
  200. +6 −1 nikola/utils.py
  201. +1 −1 requirements-tests.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`)
@@ -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 edfaed3

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