github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2,592 commits 9 branches 66 tags 14 MiB
Commit graph

2,592 commits

This branch
This branch
All branches
Author SHA1 Message Date
Justin Mayer
661ee49eda Merge pull request #1827 from TC01/blogroll_override 
Make name of blogroll/social widgets configurable
 2015-10-12 08:32:20 +09:00
Ben Rosser
a670a3e040 Made name of blogroll/social widgets configurable. 
The BLOGROLL_WIDGET_NAME and SOCIAL_WIDGET_NAME settings are now
respected by notmyidea if they are specified in your config file.
They override the default names of "blogroll" and "links" in the
notmyidea theme.

Used default() in template to simplify template code.

Renaming BLOGROLL setting to LINKS, changed default also.

Updated tests to check 'links' instead of 'blogroll'.

Whoops; links, not link.
 2015-10-11 14:14:14 -04:00
Justin Mayer
44ae54fc42 Merge pull request #1793 from koobs/patch-2 
Add missing *.markdown files to PyPI sdist
 2015-10-11 06:50:00 +09:00
Justin Mayer
72ee73f886 Merge pull request #1828 from andreacorbellini/chr-to-unichr 
Use unichr() instead of chr() with Python 2.
 2015-09-23 09:00:09 -07:00
Justin Mayer
b152aba6c6 Merge pull request #1813 from andreacorbellini/faster-truncation 
When truncating, stop parsing the document immediately after finding the last word
 2015-09-23 08:58:55 -07:00
Andrea Corbellini
c255a35800 Use unichr() instead of chr() with Python 2. 2015-09-22 23:25:24 +02:00
Andrea Corbellini
d583efb861 When truncating, stop parsing the document immediately after finding the last word. 2015-09-20 11:19:41 +02:00
Justin Mayer
178902a692 Merge pull request #1823 from onur/add-index-and-author-replacement-indicators 
Add index and author replacement indicators
 2015-09-19 12:27:32 -07:00
Onur Aslan
a6c258eb7f Add index and author replacement indicators 2015-09-19 13:49:19 +03:00
Justin Mayer
6465a91b65 Merge pull request #1819 from ingwinlu/version_in_debug_log 
Add versioning information to debug output
 2015-09-13 07:40:30 -07:00
derwinlu
6afa7704b1 Add versioning information to debug output 2015-09-11 22:06:58 +02:00
Justin Mayer
8519ccf18c Merge pull request #1814 from ingwinlu/fix_simple_keywords 
Remove article.keywords from simple theme
 2015-09-05 08:36:19 -06:00
derwinlu
b0d41f081b remove article.keywords from simple theme 
We don't process 'keywords' metadata specially, so it never gets
processed into a list.

This prevents issues like #1733.
 2015-09-05 10:53:44 +02:00
Justin Mayer
f16ae07d78 Merge pull request #1797 from TC01/feeds_override 
Add optional override_output to write_feed
 2015-08-31 20:17:59 -07:00
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
Your Name
45ff578f69 Added optional override_output to write_feed. 
The write_feed function now takes an override_output parameter that
does the same thing as override_output does to write_file. Implemented
for custom generators.
 2015-08-10 15:44:13 -04: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
Kubilay Kocak
2ca7aa8c80 Add missing *.markdown files to PyPI sdist 
The following file is missing from the PyPI source distribution (sdist) due to *.markdown not being referenced in MANIFEST.in:

pelican/tests/content/article_with_markdown_extension.markdown

This missing file appears to cause a number of errors running the test suite. An alternative to this change would be to rename the file to .md so that the file is covered by the existing *.md entry.
 2015-08-07 14:46:12 +10: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