1
0
Fork 0
forked from github/pelican
Commit graph

2,576 commits

Author SHA1 Message Date
Justin Mayer
ac151ef867 Merge pull request #1802 from andreacorbellini/better-word-recognition
When truncating, consider hyphens, apostrophes and HTML entities.
2015-08-28 10:18:44 -07:00
Andrea Corbellini
9d0804de7a When truncating, consider hypens, apostrophes and HTML entities. 2015-08-28 13:22:54 +02:00
Justin Mayer
d30ffcf52f Merge pull request #1807 from fernandezcuesta/remove_duplicate_tags
Remove duplicate tags and authors in metadata
2015-08-27 09:16:46 -07:00
Jesús Fernández
7f795ed558 Remove duplicate tags and authors in metadata 2015-08-26 12:07:38 +02:00
Justin Mayer
ad72287b4c Revert dev requirement additions
Tox uses dev_requirements.txt to install things. That wasn't the
original purpose of the dev_requirements.txt file, but for now these
additions will have to remain a documentation issue until this can be
sorted out properly.
2015-08-25 11:25:57 -07:00
Justin Mayer
170a429c52 Add flake8, sphinx, and tox to dev requirements 2015-08-25 10:05:15 -07:00
Justin Mayer
ca389e70e1 Merge pull request #1753 from ingwinlu/flake8
Make Pelican codebase compliant with PEP8
2015-08-24 19:27:25 -07:00
Justin Mayer
39f74280b3 Merge pull request #1803 from jvehent/patch-1
Fix tag count calculation in Dotclear import
2015-08-19 12:50:13 -07:00
Julien Vehent
9d57dcf020 Fix calculation of tag count in dotclear import
Upon import of a dotclear backup, `pelican-import` returned this stacktrace:

```
  File "/usr/bin/pelican-import", line 11, in <module>
    sys.exit(main())
  File "/usr/lib/python3.4/site-packages/pelican/tools/pelican_import.py", line 809, in main
    attachments = attachments or None)
  File "/usr/lib/python3.4/site-packages/pelican/tools/pelican_import.py", line 621, in fields2pelican
    kind, in_markup) in fields:
  File "/usr/lib/python3.4/site-packages/pelican/tools/pelican_import.py", line 262, in dc2fields
    if int(tag[:1]) == 1:
ValueError: invalid literal for int() with base 10: 'a'
```
2015-08-19 12:28:14 -04:00
derwinlu
8993c55e6e fulfil pep8 standard 2015-08-17 13:34:32 +02:00
derwinlu
44f9cfaaf1 add flake8 testing environment 2015-08-17 13:33:23 +02:00
Justin Mayer
de6bd537b5 Fix FAQ header underlines 2015-08-16 10:37:43 -07:00
Justin Mayer
bd3bec493e Fix reST error in docs 2015-08-16 10:14:49 -07:00
Justin Mayer
5dc6d2914e Minor tweaks to FAQ docs 2015-08-16 09:57:55 -07:00
Justin Mayer
3580478dc9 Merge pull request #1788 from andreacorbellini/truncate-with-html-parser
Truncate words using a HTML instead of regular expressions
2015-08-15 08:21:28 -07:00
Justin Mayer
e06d0046b1 Prepare version 3.6.4.dev0 for next development cycle 2015-08-14 17:24:29 -07:00
Justin Mayer
f0a6725a74 Merge branch 'v3.6.3'
Conflicts:
	docs/changelog.rst
	pelican/__init__.py
	setup.py
2015-08-14 17:16:38 -07:00
Justin Mayer
ed83ad75a9 Bump version 3.6.3 3.6.3 2015-08-14 16:34:25 -07:00
Kyle Fuller
06190f1518 Merge pull request #1798 from boite/master
Correct render of article description meta
2015-08-11 23:14:48 +01:00
jah
ed34ee1808 Correct render of article description meta
in the simple theme: the template incorrectly assumed that the source
metadata is made available as a list of strings. Fixes #1792.
2015-08-11 20:03:43 +01:00
Justin Mayer
a55217ef36 Merge pull request #1795 from ingwinlu/add_warning_to_replacer
Add warning for unknown replacement indicators
2015-08-08 09:12:36 -07:00
winlu
657ffdd75f add warning for unknown replacement indicators
If an unknown replacement indicator {bla} was used, it was ignored
silently. This commit adds a warning when an unmatched indicator occurs
to help identify the issue.

closes #1794
2015-08-08 14:40:51 +02:00
Justin Mayer
ed71ad0d3a Merge pull request #1767 from ingwinlu/rm_PAGES
Remove PAGES; use pages instead
2015-08-02 08:59:08 -07:00
Justin Mayer
7181cc36d5 Prepare version 3.6.3.dev for next development cycle 2015-08-01 13:39:24 -07:00
Justin Mayer
96b23e03bd Bump version 3.6.2 3.6.2 2015-08-01 13:39:10 -07:00
Justin Mayer
5e36a87916 Update changelog 2015-08-01 13:20:04 -07:00
Andrea Corbellini
379f8666c1 Rewrite pelican.utils.truncate_html_words() to use an HTML parser instead of regular expressions. 2015-07-30 21:04:28 +02:00
Justin Mayer
10315944d3 Merge pull request #1768 from jo-tham/patch-1
Add S3 404 custom page to Tips documentation
2015-07-11 10:42:44 -07:00
Justin Mayer
d88f846599 Merge pull request #1778 from ionelmc/manual-package-data
Avoid adding tests in bdists (like wheel bdist)
2015-07-10 11:34:44 -07:00
Ionel Cristian Mărieș
bd5dfa0b3e Avoid adding the tests in bdists (like wheel bdist). Supersedes and closes #1618. 2015-07-10 00:48:41 +03:00
Jotham Apaloo
aa318a1366 Update tips.rst
add 404 page instructions for amazon s3.
2015-07-06 21:52:19 -04:00
Justin Mayer
2332563bda Merge pull request #1776 from guanidene/master
Watch for changes in mtime of symlinked folders and files too
2015-07-04 07:56:43 -07:00
guanidene
ba9b4a1d9b Watch for changes in mtime of symlinked folders and files too 2015-06-30 20:56:21 +05:30
Justin Mayer
2a183281fa Merge pull request #1764 from ingwinlu/urlwrappers_comp
Improve URLWrapper comparison
2015-06-28 13:29:23 -07:00
derwinlu
5389543a39 improve URLWrapper comparison
* speed up via reduced slugify calls (only call when needed)
* fix __repr__ to not contain str, should call repr on name
* add test_urlwrappers and move URLWrappers tests there
  * add new equality test
* cleanup header

additionally:
* Content is now decorated with python_2_unicode_compatible
  instead of treating __str__ differently
* better formatting for test_article_metadata_key_lowercase
  to actually output the conflict instead of a non descriptive
  error
2015-06-27 19:13:50 +02:00
derwinlu
ec5c77b251 remove PAGES; use pages instead
* remove PAGES from context as pages is available
* add section to FAQ to provide guidance
2015-06-27 19:11:55 +02:00
Justin Mayer
3f69a1fb62 Merge pull request #1760 from jml/export-hidden-pages
Export hidden pages in context
2015-06-27 08:58:37 -07:00
Justin Mayer
ff88c4bb34 Document enabling per-block Markdown line numbers
Since users frequently ask how to enable line numbers in
Markdown-formatted code blocks, adding instructions to the docs will
allow us to point users there.

Fixes #1773
2015-06-26 09:44:45 -07:00
Justin Mayer
8eebf19627 Merge pull request #1766 from ingwinlu/keep_docs
Tox: keep docs output
2015-06-23 09:35:45 -07:00
Justin Mayer
4b74896a4d Merge pull request #1770 from ehashman/issue1572
Fixes #1068, #1572: template page navigation bugs
2015-06-22 10:07:10 -07:00
Elana Hashman
21544a404c Update simple theme to fix #1068 2015-06-21 13:35:41 -06:00
Elana Hashman
22bc56ddf1 Fixes #1068, #1572: template page navigation bugs
Updates the template logic for when page navigation is included in the
generated HTML in the notmyidea theme, fixing:

* Issue #1068: useless pagination controls should not be displayed when a
  single page is generated (i.e. "Page 1/1"). New logic prevents the
  generation of these superfluous page navigation controls. Tests updated
  accordingly.

* Issue #1572: when multiple pages are generated and the last page contains
  only one item, the closing </ol> and </section> tags are not generated,
  resulting in page breakage. We need to check if
  articles_page.has_other_pages(); if it does, a list has been generated per
  line 19 or 25 and the tags must be closed.
2015-06-21 13:24:49 -06:00
Jonathan Lange
108b67282a Export hidden pages in context
The `PageGenerator` was building hidden pages, but was not making them
available in the context. This makes it difficult for other plugins to
operate on hidden pages.

This patch updates `PageGenerator` to export the hidden pages it finds
in the context as `hidden_pages`.

It also updates the article generator to export `drafts`.
2015-06-20 11:21:39 +01:00
derwinlu
f588c565e2 keep docs output 2015-06-19 19:30:53 +02:00
Justin Mayer
780ccfe137 Prepare version 3.6.1.dev for next development cycle 2015-06-15 13:46:17 -07:00
Justin Mayer
fba2826b70 Bump version 3.6.0 3.6.0 2015-06-15 13:45:50 -07:00
Justin Mayer
68354eb94e Minor fixes to 3.6 release changelog 2015-06-15 13:07:49 -07:00
Justin Mayer
c7ec93466d Update changelog for imminent 3.6 release 2015-06-15 07:53:52 -07:00
Justin Mayer
d19854f4dc Remove references to easy_install in documentation 2015-06-15 07:08:05 -07:00
Justin Mayer
1461197826 Match space with POSIX sed when bumping via bumpr
`\s` will match a space via GNU sed but not the version of sed that
ships with Mac OS X or BSD.
2015-06-14 10:12:52 -07:00