Commit graph

1,732 commits

Author SHA1 Message Date
Bruno Binet
d6ec9b2028 update "custom" output for functional tests
LC_ALL=C pelican -o tests/output/custom/ -s samples/pelican.conf.py samples/content/

we really need to merge #539 so that functional tests won't succeed if
output is different...
2012-11-06 23:58:34 +01:00
Bruno Binet
dfa69fd383 Merge branch 'pr/571' (closes #571)
Conflicts:
	docs/changelog.rst
2012-11-06 23:54:08 +01:00
Simon
1b20319074 add a warning for the users of the LESS_GENERATOR setting 2012-11-05 21:56:18 +01:00
Simon
b66a37ccb1 Unit tests for webassets
remove the unit tests for the lesscss generator (TestLessCSSGenerator class) and
replace it with tests for webassets:

- add a sample scss file
- run pelican with example files
- compare the generated css file with a reference one
- look in the html code for the correct link tag
2012-11-05 21:56:18 +01:00
Simon
5f51cffe08 update docs: remove mentions of lesscss compiling and replace with webassets 2012-11-05 21:51:27 +01:00
Simon
d0f5875f66 remove the LessCSSGenerator and the related config option 2012-11-05 21:51:27 +01:00
Alexis Metaireau
e84d2ba594 Merge pull request #572 from davidjb/wp-import-improvements
Import Improvements
2012-11-05 08:40:51 -08:00
David Beitey
1b23a4a8e1 Merge remote-tracking branch 'davidjb/decode-html-wp-titles' into wp-import-improvements
Conflicts:
	docs/changelog.rst
2012-11-04 14:09:25 +10:00
David Beitey
528747684d Split post content on all types of line endings for adding paragraph tags 2012-11-04 14:08:58 +10:00
David Beitey
121bc0ad5e Optimize social icons 2012-11-04 12:49:05 +10:00
David Beitey
9fdd378687 Add Google+ social icon 2012-11-04 12:25:02 +10:00
David Beitey
41d3a1e8dd Merge branch 'github-social-icon' into improved-icons
Conflicts:
	docs/changelog.rst
2012-11-04 12:09:28 +10:00
David Beitey
705ab7b0f8 Improve linkedin icon 2012-11-03 22:27:33 +10:00
David Beitey
4afc32c425 GitHub icon also works for git.io addresses in social 2012-11-03 22:21:02 +10:00
David Beitey
868ef2079c Add GitHub social icon support in default theme
Conflicts:
	docs/changelog.rst
2012-11-03 22:13:26 +10:00
David Beitey
e2c3701757 Decode HTML entities in titles on WP import 2012-11-03 21:55:56 +10:00
Alexis Métaireau
bfc963a065 We pass lists, not dicst! 2012-10-30 18:57:06 +01:00
Alexis Métaireau
ac85e9c819 Merge branch 'pr/223' 2012-10-30 11:18:24 +01:00
Bruno Binet
3734c48489 add test for TemplatePagesGenerator 2012-10-30 09:56:10 +01:00
Bruno Binet
54eee3f28a update TemplatePagesGenerator:
* bugfix: now supports custom path for path where to find the content files
* TEMPLATE_PAGES settings is now of the form:
    { 'jinja2/src/file.html': 'dest/file.html' }
* update doc
2012-10-30 09:56:10 +01:00
Bruno Binet
e0e1b3eecf rename STATIC_PAGES to TEMPLATE_PAGES 2012-10-30 09:56:10 +01:00
Tarek Ziade
083a8cc172 added some doc about STATIC_PAGES
Conflicts:
	docs/settings.rst
2012-10-30 09:56:10 +01:00
Tarek Ziade
a91f1cab5d activate the static page generator only if the option is used
Conflicts:
	pelican/__init__.py
2012-10-30 09:56:10 +01:00
Tarek Ziade
7127676f71 added a static pages generator
Conflicts:
	pelican/__init__.py
	pelican/generators.py
	pelican/settings.py
2012-10-30 09:56:08 +01:00
Alexis Métaireau
84c708b74b Revert "Get HtmlReader to work again"
This reverts commit 39db9ddcfd.

Conflicts:

	tests/test_readers.py
2012-10-29 00:36:42 +01:00
Alexis Métaireau
4349a5e815 Update settings documentation. Fix #562 2012-10-28 23:52:16 +01:00
Alexis Métaireau
92d8208309 Merge branch 'master' of github.com:getpelican/pelican 2012-10-28 23:50:49 +01:00
Alexis Metaireau
4234bfc1c2 Merge pull request #564 from edthedev/master
Docs: Added missing link to issue tracker.
2012-10-28 15:48:20 -07:00
Bruno Binet
c0ed9e1cff add test for USE_FOLDER_AS_CATEGORY setting (#517) 2012-10-28 20:54:39 +01:00
Martin Brochhaus
47c972e21a Added USE_FOLDER_AS_CATEGORY setting.
This allows users to organize their files in ways where the subfolder name
would not make a good category name (i.e. /2012/09/). Set this to ``False``
and the subfolder will no longer be used as a standard category,
`DEFAULT_CATEGORY` will be used instead.
2012-10-28 20:43:45 +01:00
Edward Delaporte
318518ee1f Added a second link to the issue tracker - for those who jump directly to the section without seeing the earlier section. 2012-10-28 14:32:48 -05:00
Brendan Wholihan
f7a2f8ea47 Removed AUTHOR defaulting to OS User /John Doe, so both a blank or undefined (None) author is possible.
Reverted templates back to checking author object, since a None object is possible. Name could be checked for blank if required
ATOM spec states an author element should be provided, so passes a blank name if not specified
Updated unit test
2012-10-26 18:20:05 +01:00
Alexis Metaireau
a282499055 Merge pull request #559 from saimn/importer
refactor the check of executable for unit tests
2012-10-25 15:50:24 -07:00
Simon
ae8cf9defd refactor the check of executable for unit tests
pandoc was checked directly with a `os.system` call, and the output with version
and copyright of pandoc was displayed when running tests.

- replace the pandoc check with the `skipIfNoExecutable` function.
- in `skipIfNoExecutable`, the `valid_exit_code` is not needed, the executable
  is not found if an `OSError` exception is catched.
2012-10-25 22:50:29 +02:00
Alexis Métaireau
0ebba1c4ab merge with master 2012-10-25 14:54:19 +02:00
Alexis Métaireau
dd299d272b merge win-encoding 2012-10-25 14:47:57 +02:00
Alexis Métaireau
b349bdd80f Make it obvious in the docs that you need to indent the identifier as well 2012-10-25 14:37:19 +02:00
Bruno Binet
324c7c3674 Merge branch 'bstpierre-files-to-copy-missing-dir' 2012-10-25 14:25:03 +02:00
Bruno Binet
b6cc6bd2d4 remove useless try/except clause
exception will be caught and logged later in Pelican stack
2012-10-25 14:24:17 +02:00
Alexis Métaireau
93c04cd79f merge with master 2012-10-25 13:20:27 +02:00
Thanos Lefteris
d38b32abfd Docs for FILES_TO_COPY setting 2012-10-23 02:04:40 +02:00
Bruno Binet
0856b72c3c cosmetics
lines should be < 80 chars
2012-10-22 23:05:18 +02:00
jawher
a11726783e TRANSLATION_FEED is now split into TRANSLATION_FEED_ATOM and TRANSLATION_FEED_RSS to match the other feed configuration keys
Incidentally, Pelican can now generate RSS translation feeds.
2012-10-22 22:52:06 +02:00
Bruno Binet
4f1e3293ff Merge pull request #547 from bbinet/refactor-settings
Refactor how settings are handled
2012-10-21 15:37:02 -07:00
Bruno Binet
ba99bc5528 Merge commit 'bc0f7ae4f6' 2012-10-21 23:59:11 +02:00
Alexis Metaireau
25e9cccbdf Merge pull request #544 from Lothiraldan/plugins
Add a multi_part plugin
2012-10-20 14:27:56 -07:00
Alexis Metaireau
ddcb4ec72f Merge pull request #543 from Lothiraldan/master
Add a new signal article_generator_finalized, called at the end of ArticleGenerator.generate_context
2012-10-20 14:27:19 -07:00
Brendan Wholihan
bc0f7ae4f6 Amended utils copy so that a warning is produced if a source file is not found in FILES_TO_COPY whilst copying. eg if there is a typo in the file name, or the file is moved. 2012-10-20 16:35:24 +01:00
Brendan Wholihan
94877e033b So that Authors display and output can be disabled for single user sites, allow the AUTHOR setting to be set to an empty string ''.
An author is needed, but was defaults to OS user, or 'John Doe'. If a blank author is provided, it generated authors/.html file, and templates display just "by "
Updated generators.py and templates to ignore Authors objects which have a blank name
2012-10-18 19:55:00 +01:00
Bruno Binet
4029f2ec82 refactoring so that command line options override settings
and Pelican class now accepts a single parameter ``settings``
2012-10-16 01:35:39 +02:00