Commit graph

1,420 commits

Author SHA1 Message Date
Michael Reneer
103ae436c9 Update docs/settings.rst
Updated commit based on the discussion in the pull request.
2012-11-26 13:03:25 -05:00
Michael Reneer
4de668159d Update docs/settings.rst
Updated the documentation for the MARKUP setting to reflect the current supported markup file extensions.
2012-11-26 11:26:33 -05:00
Bruno Binet
0fbf96b4be Merge pull request #596 from tpievila/doc_fix
Metadata parity for RST/MD, document summary.
2012-11-24 03:41:01 -08:00
Tomi Pieviläinen
a6f328516a Metadata parity for RST/MD, document summary. 2012-11-24 13:18:49 +02:00
Bruno Binet
1c44f49d1b remove importlib dependency
importlib is only available for python >= 2.7
2012-11-23 15:51:01 +01:00
Bruno Binet
5fd6eac477 update changelog (new webassets plugin) 2012-11-23 15:38:41 +01:00
Bruno Binet
801bc755b5 Merge branch 'pr/558'
Conflicts:
	docs/settings.rst
	pelican/signals.py
2012-11-23 15:32:17 +01:00
Simon
816e8d88e0 Change webasset tests organization to avoid running pelican twice for each test.
As setUp is run for each test, the previous implementation was running pelican
twice (once for relative urls and once for absolute) for each test, which was not
really optimal :-).

Solution: make a base class which is inherated by a class for relative urls and
another for absolute urls.
2012-11-22 13:22:49 +01:00
Alexis Métaireau
09ddd92efc update the output for functional tests 2012-11-21 16:39:05 +01:00
Alexis Métaireau
587184c778 trim the blocks when generating templates. 2012-11-21 16:38:27 +01:00
Alexis Métaireau
c022f4d483 Merge branch 'master' of github.com:getpelican/pelican 2012-11-21 16:16:52 +01:00
Alexis Metaireau
6adfec2bd5 Merge pull request #589 from tpievila/translated_pages
List of translations for simple and notmyidea pages
2012-11-21 07:13:26 -08:00
Alexis Métaireau
aee59f42ef Merge branch 'master' of github.com:getpelican/pelican 2012-11-21 15:58:16 +01:00
Tomi Pieviläinen
3e454045e9 Update test data 2012-11-21 15:45:50 +02:00
Tomi Pieviläinen
429991c3f9 List of translations for simple and notmyidea pages 2012-11-21 15:45:50 +02:00
Bruno Binet
a9cdf3c5a1 remove old import statement 2012-11-21 14:24:40 +01:00
Alexis Metaireau
6d11f6d063 Merge pull request #583 from egh/master
create a preread signal
2012-11-21 04:53:42 -08:00
Alexis Métaireau
4aeb65512d delete the TODO file 2012-11-21 13:03:29 +01:00
Tomi Pieviläinen
e006cf04bb Kill SimpleHTTPServer also on OS X 2012-11-21 14:02:56 +02:00
Simon
f413a8da79 Change webassets configuration for relative urls.
Set the ASSET_URL to be relative to the 'theme/' url, which requires to use
{{ SITEURL }}/{{ ASSET_URL }} in the template and make it works with both
relative and absolute urls.
2012-11-20 23:42:52 +01:00
Simon
67af48eed4 travis configuration for webassets tests: install webassets, cssmin and sass. 2012-11-20 23:42:41 +01:00
Simon
00d1ea6157 Use the new generator_init signal for the assets plugin.
This allows to have the assets_environment in all generators.
2012-11-20 23:42:41 +01:00
Simon
09c893f3a3 Add a new signal generator_init, invoked at the end of Generator.__init__. 2012-11-20 23:42:31 +01:00
Simon
7ff0d0e686 Move webassets tests in their own file. 2012-11-20 23:42:11 +01:00
Erik Hetzner
fb562ec7d3 add docs for article_generate_preread signal 2012-11-16 08:09:35 -08:00
Alexis Metaireau
67c576add6 Merge pull request #539 from bbinet/recursive-diff
directory comparison should be recursive in functional tests
2012-11-16 01:07:01 -08:00
Alexis Métaireau
5523240553 What would be a commit without his "fix typo" brother, uh? 2012-11-15 20:09:21 +01:00
Alexis Métaireau
43b1555e5d Mention that FILES_TO_COPY is able to copy dirs. 2012-11-15 20:07:08 +01:00
Erik Hetzner
6d745f32c0 add preread signal 2012-11-14 22:12:46 -08:00
Bruno Binet
ec42fa837f docfix: fix default values for _URL and _SAVE_AS settings
(AUTHOR_URL, AUTHOR_SAVE_AS, CATEGORY_URL, CATEGORY_SAVE_AS)
2012-11-13 01:46:43 +01:00
Bruno Binet
8336df2b9b update changelog: blank author are now allowed
(refs: #555)
2012-11-13 01:41:39 +01:00
Bruno Binet
c787e02dcc Merge branch 'pr/555'
Conflicts:
	pelican/contents.py
2012-11-13 01:23:31 +01:00
Bruno Binet
f49336f087 Merge branch 'pr/551' (closes #551) 2012-11-12 23:57:37 +01:00
Bruno Binet
960c35596c update "custom" output for functional tests
LC_ALL=C pelican -o tests/output/custom/ -s samples/pelican.conf.py samples/content/
2012-11-12 23:56:38 +01:00
Bruno Binet
e56d2b14c8 docfix: updates docs/settings.rst and docs/faq.rst 2012-11-12 23:44:12 +01:00
jawher
1b81f8b830 Move SITEURL check for feed generation from generators.py to settings.py 2012-11-12 23:01:17 +01:00
jawher
cf95b02bc0 Update the faq and changelog 2012-11-12 23:01:17 +01:00
jawher
13f444260c Avoid iterating over all settings keys to detect if a feed is enabled 2012-11-12 23:01:17 +01:00
jawher
8a72b11e3d code style: remove unnecessary trailing \ 2012-11-12 23:01:17 +01:00
jawher
578f9ea21e Update the test sample config to set FEED_ALL_RSS instead of FEED_RSS (fixes the custom generation tests) 2012-11-12 23:01:17 +01:00
jawher
b6db45420c Default to using FEED_ALL_ATOM instead of FEED_ATOM (and likewise for RSS) in the notmyidea theme 2012-11-12 23:01:17 +01:00
jawher
fd18f2efa9 Generate links for FEED_ALL_ATOM and FEED_ALL_RSS in the simple them's head. 2012-11-12 23:01:17 +01:00
jawher
a79904c075 Update the generators tests to use FEED_ALL_ATOM as the default set atom feed instead of FEED_ATOM 2012-11-12 23:01:17 +01:00
jawher
93905e828d Split long if condition in 2 lines 2012-11-12 23:01:17 +01:00
jawher
537e9df3ed Reworked the "unset feed_domain" warning to handle all feed variables 2012-11-12 23:01:16 +01:00
jawher
5593670759 The default settings sets up FEED_ALL_ATOM (instead of FEED_ATOM) to all.atom.xml 2012-11-12 23:01:16 +01:00
jawher
c7d87feec3 Reverted FEED_ATOM and FEED_RSS to their original behaviour and added FEED_ALL_ATOM and FEED_ALL_RSS
FEED_(ATOM|RSS) generated feeds include the version in the default language of a translated article,
whereas FEED_ALL(ATOM|RSS) would include *really* all posts, regardless of their language.
2012-11-12 23:01:16 +01:00
jawher
593acfc37a Remove comment 2012-11-12 23:01:16 +01:00
jawher
721a422e5e The all Atom and RSS feed generators should include all articles, regardless of the article's language or the site's. Fixes #550. 2012-11-12 23:01:16 +01:00
Simon
7088135f5e Add tests for webassets: test absolute url and Jinja configuration 2012-11-07 00:18:48 +01:00