1
0
Fork 0
forked from github/pelican
Commit graph

1,922 commits

Author SHA1 Message Date
Justin Mayer
97c2598cdf Merge pull request #1006 from saimn/fix_docutils
Use the `docutils` variable to check if docutils is installed, not `core`
2013-08-04 20:58:39 -07:00
Justin Mayer
d4ba9dcf21 Merge pull request #895 from Rogdham/empty_alt
Add warnings for img with empty alts. Fixes #647.
2013-08-04 20:54:23 -07:00
Justin Mayer
23f7a12b52 Merge pull request #1010 from kylewm/pdf-plugin
Move PDF generation to a plugin (Fixes #1009)
2013-08-04 20:30:31 -07:00
Justin Mayer
f9a6d10eec Merge pull request #1004 from russkel/hgrm
Remove old mercurial files
2013-08-04 20:15:53 -07:00
Justin Mayer
8c4b2a0d2e Merge pull request #1003 from russkel/tumblrfix
fix missing 'kind' arg in tumblr importer
2013-08-04 20:09:11 -07:00
Kyle Mahan
dfc3a7ce2f Move PDF generation to a plugin. Fixes #1009 2013-08-04 18:01:56 -07:00
Rogdham
a75eac6c0f Add warnings for img with empty alts. Fixes #647.
Unify Rst and Mkd: if alt is not specified at all, create an empty alt.
Warns the user in case of empty alts.
2013-08-04 16:03:39 +01:00
Justin Mayer
1b904ae767 Merge pull request #943 from Rogdham/override_save_as_url
Deliberate overriding and overwrite detection. Fixes #938
2013-08-04 07:21:10 -07:00
Simon Conseil
a268d9e952 Use the docutils variable to check if docutils is installed, not core.
+ remove duplicate import
2013-08-04 14:27:29 +02:00
Rogdham
a495527e2b Delib. overriding and overwrite detect. Fixes #938
Make deliberate overriding (*) works with overwrites detection.

(*) first introduced by d0e9c52410

The following are decided to be deliberate override:
 - articles using the `save_as` metadata
 - pages using the `save_as` metadata
 - template pages (always)

Pelican now exits in the following 2 cases:
 - at least 2 not deliberate writes to the same file name (behaviour introduced
   by the overwrite detection feature ff7410ce2a)
 - at least 2 deliberate writes to the same file name (new behaviour)

Also added info logging when deliberate overrides are performed.

Switched to StandardError instead of IOError, thanks to @ametaireau and
@russkel.
2013-08-04 12:09:26 +01:00
Rogdham
0999d4d691 Deliberate overriding of an existing file to tests
Deliberate overriding via `save_as` metadata should be allowed, even after the
overwrite detection feature. This commit is to add tests for deliberate
overriding. As a result, the relevant tests *should fail* after this commit.

Added a page and an article, both to override a tag, with very old dates so
it limits the amount of diff in the generated pages.

Overriding feature introduced by d0e9c52410
Overwrite detection introduced by ff7410ce2a
2013-08-04 12:07:40 +01:00
Russ Webber
e0a2f1906d Remove old mercurial files 2013-08-04 18:52:53 +08:00
Russ Webber
dc58a17e64 fix missing 'kind' arg in importer
fixes #983
2013-08-04 17:21:35 +08:00
Justin Mayer
a14dc4dad2 Merge pull request #1001 from russkel/issue927
fix: clear directory before generation of context
2013-08-04 00:04:18 -07:00
Justin Mayer
6d32fb2bb7 Merge pull request #995 from karlcow/master
Fixing documentation according to  Issue #362.
2013-08-04 00:03:31 -07:00
Russ Webber
4977de8453 fix: clear directory before generation of context
fixes #927
2013-08-04 14:00:56 +08:00
Justin Mayer
72ea20f06a Merge pull request #871 from dknecht/master
Sort author and category pages using same sort as tags
2013-08-03 22:51:30 -07:00
Justin Mayer
122ec39a27 Merge pull request #932 from qdot/master
Change meta tag "contents" attribute to "content" to conform to HTML spec
2013-08-03 22:40:18 -07:00
karl
a4ce664f17 fixing the inline code markup 2013-08-03 22:31:54 -04:00
Dane Knecht
10dc5ef0b7 sort author and category pages same way as tags 2013-08-03 19:17:14 -07:00
Justin Mayer
2a53934834 Merge pull request #950 from fbs/makedebug
Add a debug target to the template makefile
2013-08-03 16:51:23 -07:00
Justin Mayer
2aa0c6e24b Merge pull request #968 from russkel/encodingfix
Fix setting default locale and exception encoding
2013-08-03 16:42:37 -07:00
Justin Mayer
1abd5ef447 Merge pull request #894 from dominiqueplante/quickstart-debuggable
make Pelican-quickstart debuggable in PyCharm
2013-08-03 16:35:36 -07:00
Justin Mayer
76fa457654 Normalize whitespace via lstrip Jinja parameter
This adds the lstrip_blocks Jinja parameter and removes unnecessary
whitespace from a few notmyidea templates.

Note: The lstrip_blocks parameter requires Jinja 2.7+, which has been
noted in Pelican's setup.py.

Credit for this commit goes entirely to Russ Webber, who has earned my
eternal thanks for discovering and applying this useful Jinja parameter.

Refs #969
2013-08-03 16:17:26 -07:00
Justin Mayer
23e62b0056 Merge pull request #966 from jude/patch-1
Adding a FEED_ALL_ATOM check in the "social" div.
2013-08-03 15:16:58 -07:00
Justin Mayer
1443131fde Merge pull request #976 from kylewm/notmyidea-active-pages
Modify notmyidea to include class="active" on pages
2013-08-03 15:12:52 -07:00
Justin Mayer
bea03bb4bb Merge pull request #979 from nyergler/pagination_conf
Support flexible pagination configuration
2013-08-03 14:58:47 -07:00
Justin Mayer
0de44cc844 Merge pull request #964 from nickzoic/master
Slugify {category} in URLs. Fixes #926
2013-08-03 14:45:07 -07:00
Nathan Yergler
d61ef0c66c Adding basic documentation for PAGINATION_PATTERNS. 2013-08-03 14:06:16 -07:00
Nathan Yergler
50ff7ce89f Fall back to the default PAGINATION PATTERNS when none specified. 2013-08-03 14:04:58 -07:00
Justin Mayer
4d614c173b Merge pull request #999 from nicholaskuechler/group_pdf_settings
Group PDF related settings together.
2013-08-03 14:00:17 -07:00
Nathan Yergler
5ffbf907de Create new formatting context dict instead of using self.__dict__
Using self.__dict__ is fine, but when its mutated it changes the
object's state. Creating a new dict avoids needing to think about
that, and doesn't introduce Python 3 issues (ie, where self.number is
accidentally set to '').
2013-08-03 13:49:43 -07:00
Nicholas Kuechler
92f5c06ba6 Group PDF related settings together. 2013-08-03 14:58:52 -05:00
karl
6a0d19ef5c Adding context to the documentation for metadata
Giving a longer description Thanks to justin mayer for #995
2013-08-03 12:47:44 -04:00
karl
03e9d0182d Fixing documentation according to Issue #362.
The documentation as it is right now produces a  CRITICAL: 'article' is
undefined
2013-08-03 00:31:43 -04:00
Justin Mayer
4c1b5c3429 Correct URL for pip install editable in docs
Refs # 975
2013-08-01 15:13:32 -07:00
Justin Mayer
1cebd345aa Merge pull request #970 from russkel/themestaticdir
added THEME_STATIC_DIR setting
2013-08-01 08:42:13 -07:00
Alexis Metaireau
65a716ec02 Merge pull request #989 from getpelican/plugins-recipes
Start a section about plugin recipes in the docs
2013-08-01 05:48:53 -07:00
Alexis Métaireau
4fa9184b01 Start a section about plugin recipes in the docs 2013-08-01 14:47:56 +02:00
Nathan Yergler
74c7c72fb3 Use six.u instead of unicode. 2013-07-31 21:31:08 -07:00
Russ Webber
89034f8b3f added THEME_STATIC_DIR setting
The theme static output directory path is now customisable via settings.
i.e. you can now use 'assets' instead of 'theme'.
2013-08-01 11:02:38 +08:00
Nathan Yergler
9abc08ea9f Don't assume that PAGINATION_PATTERNS will always be present. 2013-07-31 18:57:21 -07:00
Kyle Fuller
51dc02f298 Add documentation for WITH_FUTURE_DATES
Closes #952
2013-07-31 23:08:42 +01:00
Kyle Fuller
80a7c3f293 Merge pull request #986 from TheHippo/patch-1
Fix file endings for examples
2013-07-31 14:55:06 -07:00
Philipp Klose
0e0775b74a Fix file endings for examples
reStructured should use reStructured for linked documents. Markdown should use Markdown for linked documents.
2013-07-31 22:43:02 +02:00
Justin Mayer
30192b2318 Add fabfile generation to pelican-quickstart
This commit adds optional fabfile.py generation during the
pelican-quickstart process. Reasons include:

* "make" is cumbersome to install on Windows
* Fabric runs in any Python environment
* fabfile is just Python and thus more flexible and extensible

This is an initial implementation and does not currently provide as many
upload options as its Makefile counterpart.

Refs #584.
2013-07-29 11:03:14 -07:00
Nathan Yergler
95890a2a61 Allow definition of pagination rules by page index. 2013-07-29 08:10:28 -04:00
Ross McFarland
71e83635ea remove u prefix from string literal, using unicode_literals 2013-07-29 08:09:45 -04:00
Ross McFarland
0caa101ec7 use six.string_types for python 3 compat 2013-07-29 08:09:44 -04:00
Ross McFarland
e07b39dfcb more robust PAGINATION_(URL|SAVE_AS) support
- add base_name and number_seperator to context to give more flexibility
  when naming things
2013-07-29 08:09:44 -04:00