Skip to content

Commit ee3e113

Browse files
ralsinaralsina
committedMay 27, 2015
Merge branch 'master' into new-auto
·
v8.3.1v7.1.1
2 parents 00d2283 + 4911008 commit ee3e113

File tree

70 files changed

+11329
-377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+11329
-377
lines changed
 

‎CHANGES.txt

+8
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,21 @@ New in master
44
Features
55
--------
66

7+
* New `nikola rst2html` command (Issue #1710)
8+
* New `nikola status` command (Issue #1740)
9+
* Support [code] in wordpress importers (Issue #1186)
710
* Cleaner formatting of HTML output
811
* Allowing category hierarchies via new option CATEGORY_ALLOW_HIERARCHIES
912
(Issue #1520)
1013

1114
Bugfixes
1215
--------
1316

17+
* Treat special-purpose “draft” tag case-insensitive
18+
* Avoid some rebuild loops (Issue #1747)
19+
* Better error if two posts/pages output conflict (Issue #1749)
20+
* Scanning of posts refactored out of core (Issue #1700)
21+
* github_deploy records lastdeploy timestamp like regular deploy
1422
* Use a global directory for gallery images, ignoring translations (Issue #1726)
1523
* The post-list directive only triggers rebuilds if timeline changes (Issue #1688)
1624
* Don’t check the same remote URL more than once (Issue #1732)

‎README.rst

+8-7
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ It has many features, but here are some of the nicer ones:
3333
* `Blogs, with tags, feeds, archives, comments, etc.`__
3434
* `Themable`_
3535
* Fast builds, thanks to `doit`_
36-
* Flexible, extensible via plugins
36+
* Flexible, extensible via the dozens of `available plugins`_
3737
* Small codebase (programmers can understand all of Nikola core in a day)
3838
* `reStructuredText`_ or Markdown as input language (also Wiki, BBCode, Textile, and HTML)
3939
* Easy `image galleries`_ (just drop files in a folder!)
@@ -42,12 +42,13 @@ It has many features, but here are some of the nicer ones:
4242
* Doesn't reinvent wheels, leverages existing tools.
4343
* Python 2.7, 3.3 and 3.4 compatible.
4444

45-
.. _Nikola Handbook: http://getnikola.com/handbook.html#why-static
46-
__ http://users.getnikola.com/
47-
.. _Themable: http://themes.getnikola.com
45+
.. _Nikola Handbook: https://getnikola.com/handbook.html#why-static
46+
__ https://users.getnikola.com/
47+
.. _Themable: https://themes.getnikola.com
4848
.. _doit: http://pydoit.org
49-
.. _reStructuredText: http://getnikola.com/quickstart.html
50-
.. _image galleries: http://getnikola.com/galleries/demo/
49+
.. _available plugins: https://plugins.getnikola.com/
50+
.. _reStructuredText: https://getnikola.com/quickstart.html
51+
.. _image galleries: https://getnikola.com/galleries/demo/
5152
__ https://www.transifex.com/projects/p/nikola/
5253

5354
Nikola Architecture
@@ -70,4 +71,4 @@ For tests (see tests/README.rst for more details)::
7071

7172
pip install Nikola[extras,tests]
7273

73-
For more information, see http://getnikola.com/
74+
For more information, see https://getnikola.com/

0 commit comments

Comments
 (0)
Please sign in to comment.