1
0
Fork 0
forked from github/pelican
Commit graph

82 commits

Author SHA1 Message Date
dave mankoff
1d5228388b git pull git://github.com/ametaireau/pelican.git 2012-06-11 10:21:13 -04:00
dave mankoff
c6f1d0aada fix SUMMARY_MAX_LENGTH, document it, and test it 2012-06-11 08:39:13 -04:00
dave mankoff
9fb5969c59 Allow settings to specify a summary length, optionally allowing unlimited summary length 2012-06-10 17:58:05 -04:00
Alexis Metaireau
7682f657a4 don't do anything with webassets if the setting is set to false (default) 2012-06-10 21:46:32 +02:00
Alexis Metaireau
4ed8c6a09c don't test webassets key if it can be unset 2012-06-10 13:32:23 +02:00
Alexis Metaireau
6a0937a9e8 merge the plugin branch 2012-06-10 01:14:30 +02:00
Simon
a6788f83c2 integrate webassets 2012-05-07 17:15:09 +02:00
Alexis Metaireau
4370b51f02 Merge pull request #318 from MeirKriheli/master
Generator to compile less css files
2012-05-05 17:23:55 -07:00
Pavel Puchkin
feb1dcc773 Use {slug} instead of {name} for category URL and FILENAME formatting 2012-05-01 16:54:39 +11:00
Meir Kriheli
f558389006 Remove redundant LESS_COMPILER setting 2012-04-28 03:25:54 +03:00
Meir Kriheli
b73d984ec9 Merge branch 'master' of https://github.com/ametaireau/pelican 2012-04-28 00:52:45 +03:00
Justin Mayer
602990b80e Use "endswith" to detect trailing slash on SITEURL 2012-04-18 07:16:51 -07:00
Meir Kriheli
50f2cd295f Implement LessCSSGenerator 2012-04-15 02:20:20 +03:00
Justin Mayer
34310a61f5 Feed link inside feed should use FEED_DOMAIN
The initial work on enabling feeds to be served from a different domain
than the site domain focused on the feed link displayed inside the
base template. But there is also a feed link inside the generated feed
itself, which this commit updates to use the FEED_DOMAIN value (if
defined).

Also, it turns out that the FEED_MAIN_URL setting is not necessary; the
existing FEED and FEED_RSS functionality is simpler and can address the
targeted use case just as easily. That attribute has been removed from
the settings and template, along with corresponding changes to the docs.
Refs #177.
2012-03-31 08:10:40 -07:00
Justin Mayer
65b93dbfd4 Remove trailing slash from SITEURL if present 2012-03-23 07:16:23 -07:00
Kyle Fuller
0ed6cf7743 Follow the PATH variable in settings 2012-03-23 09:05:47 +00:00
Justin Mayer
6e467172e5 Merge branch 'master' into feeddomain
Conflicts:
	pelican/settings.py
	tests/test_settings.py
2012-03-22 08:29:27 -07:00
Justin Mayer
1623394da8 Add tests for pull request #262 2012-03-22 07:58:04 -07:00
Andrea Crotti
0922efa371 change the way logging is done, using the standard log tree instead of
calling the module-level functions on an unitialised logging object.

This allows to
- simplify log.py
- use one logger object for each file
2012-03-20 13:01:21 +00:00
Bruno Binet
4fe67b8947 Merge remote-tracking branch 'ametaireau/plugins' into plugins
Conflicts:
	docs/settings.rst
	pelican/__init__.py
	pelican/generators.py
	pelican/settings.py
	setup.py
2012-03-20 01:07:25 +01:00
Justin Mayer
8819d02600 Allow for serving feeds from a separate domain.
This (indirectly) enables support for FeedBurner. Added docs for
FeedBurner configuration. Clarify how defining the SITEURL attribute
affects URL structure. Closes #177.
2012-03-16 20:27:26 -07:00
Alexis Metaireau
189da25c5b Merge branch 'master' of github.com:ametaireau/pelican 2012-03-11 02:50:37 +01:00
Alexis Metaireau
d43bd1dcb8 Add a way to use Typogrify to enhance the generated HTML. 2012-03-11 02:48:36 +01:00
Alexis Metaireau
d6be2fb44c Put deprecation code in a separate place 2012-03-11 01:59:22 +01:00
Bruno Binet
0ca9997e10 paths for finding articles and pages are now parametrable 2012-03-11 01:22:16 +01:00
Alexis Metaireau
1c219d14bb Use the slug as default URL for tags and authors. 2012-03-11 01:16:32 +01:00
Alexis Metaireau
8499ce3340 add some url and saveas settings that weren't present in the default settings dict 2012-03-10 13:23:50 +01:00
Alexis Metaireau
6cde7fd27a PEP8-ify.
Wrap to 80 chars, sanitize imports.
2012-03-09 16:21:38 +01:00
Kyle Fuller
a39787c1a2 Add settings to change the URL's and SAVE_AS paths
Example usage:

* ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'
* ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'

This removes CLEAN_URLS and ARTICLE_PERMALINK_STRUCTURE because these
new settings can produce the same result.
2012-03-06 16:41:35 +00:00
Kyle Fuller
2be58aa51a Remove WITH_PAGINATION, only have a DEFAULT_PAGINATION setting
DEFAULT_PAGINATION can be set to False instead of using WITH_PAGINATION
2011-12-22 14:02:31 +00:00
Jökull Sólberg Auðunsson
dc22d2b131 Added WITH_FUTURE_DATES settings, which if true treats future dated content as drafts. 2011-11-26 23:23:19 +00:00
Alexis Metaireau
96b52a2283 issue a warning in case no timezone is defined 2011-08-18 13:58:04 +02:00
Borgar
cd277672d0 Add a setting to limit feeds to a max number of items.
This adds FEED_MAX_ITEMS, which dictates the maximum number of items allowed in a feed.
2011-08-02 23:29:34 +00:00
mviera
a13ae91f0b Adding more documentation about ARTICLE_PERMALINK_STRUCTURE in settings. Also, i deleted the try except because strftime never raises an exception. Issue #145
I set the ARTICLE_PERMALINK_STRUCTURE option as null in settings.py and remove it from pelican sample config file.
2011-07-29 22:09:09 +02:00
mviera
2609004719 I change PERMALINK_STRUCTURE to ARTICLE_PERMALINK_STRUCTURE and updating the settings.rst documentation.
Also I have implemented other options to this setting, such as the category, the date, the author, this kind of things.

Finally, I have setted the ARTICLE_PERMALINK_STRUCTURE option as null in pelican.conf.py sample file.
2011-07-29 01:11:35 +02:00
mviera
068a3d2f1d Year and month in URL. Issue #145 2011-07-27 23:47:50 +02:00
Mario Rodas
dc6934be43 all test pass 2011-07-02 15:15:21 -05:00
Alexis Metaireau
28c0644eb6 Plugins doc + minor design changes. 2011-06-18 01:03:53 +02:00
Alexis Metaireau
7184484488 merge nduhamel/plugins 2011-06-17 22:33:54 +02:00
derdon
1288676302 check the actual value in the settings 2011-06-13 01:34:36 +02:00
derdon
ac0b1a6f82 check only paths (i.e. not None) for being absolute when reading the settings 2011-06-13 01:25:29 +02:00
Alexis Metaireau
515e02bcc6 Add the OUTPUT_PATH as a relative path. 2011-06-12 22:31:26 +02:00
Rory McCann
fee2b50cb9 If the PATH settings is set to a non-absolute path, then use normalize it relative to the settings file. This should probably be done for other settings aswell 2011-06-12 18:52:42 +01:00
Alexis Metaireau
1c6ea5aab2 Fix locale setup in settings.py 2011-05-31 12:44:40 +02:00
Alexis Metaireau
44c1fe4840 Definitely a bad day for commits. Thanks kmike for reviewing 2011-05-19 18:10:21 +01:00
Alexis Metaireau
f759491279 Oops. This is it. See #115. 2011-05-19 18:00:17 +01:00
Alexis Metaireau
5277b9dc16 Add the possibility to specify a list of alternatives for locales. Fixes #115 2011-05-19 17:28:45 +01:00
Alexis Metaireau
371892ceaa Merge branch tests into main. (See #44)
Conflicts:
	pelican/contents.py
	pelican/settings.py
	samples/pelican.conf.py
2011-05-10 23:18:11 +01:00
Alexis Metaireau
6b44d93780 Add the possibility to publish drafts. Fixes #111 2011-05-08 14:58:57 +01:00
Alexis Metaireau
04da794b6b Add a feature to copy files from src to dest.
Fixes #86
2011-05-07 22:47:30 +01:00