justinmayer
98c8041df2
Merge pull request #367 from ametaireau/reload-for-settings
...
Also reload when the settings file changes.
2012-06-10 12:55:00 -07: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
7c48937ea2
pandoc is optional
2012-06-10 13:27:36 +02:00
Alexis Metaireau
6a0937a9e8
merge the plugin branch
2012-06-10 01:14:30 +02:00
Alexis Metaireau
ed8b8bc27e
Also reload when the settings file changes.
...
Fix for #360
2012-06-10 00:24:26 +02:00
Alexis Metaireau
cbe47d4416
Merge pull request #347 from sametmax/pandoc-parse-raw
...
Added strip raw option to wordpress xml importer
2012-06-09 14:27:44 -07:00
Alexis Metaireau
4d5b1ae741
Merge pull request #351 from quodlibetor/warn-on-skip
...
Add warnings for files skipped due to unknown status
2012-06-09 14:26:33 -07:00
Alexis Metaireau
e3919a1b82
Merge pull request #341 from m-r-r/trailing-slashes
...
Trailing slashes removed to avoid category bug
2012-06-09 14:22:03 -07:00
Alexis Metaireau
74bf31b0e9
Merge pull request #337 from saimn/assets
...
Assets management with webassets
2012-06-09 14:16:57 -07:00
Justin Mayer
ae1424a8dd
Strip tags from title when within tag attribute
...
The change mentioned in #336 stripped tags properly in some places but
seems to have forgotten at least one location in the main index.html
2012-06-08 09:56:55 -07:00
Alexis Metaireau
3dd63a012e
Thanks the author of the youtube directive.
2012-06-08 11:23:18 +02:00
Alexis Metaireau
46daadc137
add a youtube directive to pelican
2012-06-08 11:21:52 +02:00
Brandon W Maister
849244f61e
Add warnings for files skipped due to unknown status
2012-05-15 17:48:07 -04:00
Kyle Fuller
a16c19545f
Don't duplicate html across themes
2012-05-14 18:46:27 +01:00
Kyle Fuller
2c1c05923d
Fix a broken URL in the simple template
2012-05-14 18:33:49 +01:00
sam
ba8ed9fb18
Added strip raw option to wordpress xml importer
2012-05-13 23:37:33 +02:00
m-r-r
0444513e90
Trailing slashes removed to avoid category bug
2012-05-12 11:49:49 +02:00
Simon
e6448567a0
add some doc in the code
2012-05-11 22:19:03 +02:00
Simon
263ba2b0fa
Merge remote-tracking branch 'upstream/master'
2012-05-11 21:59:21 +02:00
Simon
ec707930ce
integrate webassets
2012-05-11 21:58:10 +02:00
Simon
252d00834f
strip tags for feed titles
2012-05-11 21:58:10 +02:00
Alexis Metaireau
1779b66f10
Merge pull request #336 from saimn/typogrify
...
Apply typogrify on the title.
2012-05-11 07:23:31 -07:00
Alexis Metaireau
a42446268d
Merge pull request #338 from bbinet/fix-urls
...
prefix urls with '{{ SITEURL }}/' so that urls won't break when #330 is merged
2012-05-11 07:19:12 -07:00
Alexis Metaireau
419a2159e6
Merge remote-tracking branch 'muffinresearch/master'
...
Conflicts:
docs/settings.rst
tests/test_generators.py
2012-05-11 16:17:47 +02:00
Bruno Binet
f12a297466
prefix urls with '{{ SITEURL }}/' so that urls won't break when #330 is merged
2012-05-07 23:07:44 +02:00
Simon
e9996b5cc6
strip tags for feed titles
2012-05-07 13:05:33 +02:00
Simon
4a0d4461e1
Apply typogrify on the title.
...
As it is done when reading the file, we need to remove html tags for the
permalink and the slug (this is done here for the notmyidea and simple themes).
While modifying the themes I also replaced the `pagename` template tag with
`article.url` (`pagename` was an empty variable, no more used ?).
2012-05-07 12:26:17 +02:00
m-r-r
d97fc8f666
Fixed some errors
2012-05-06 12:32:53 +02:00
m-r-r
7c53cc8955
Moved templates in pelican_quistart.py to a directory
2012-05-06 12:07:13 +02:00
Alexis Metaireau
8a842c0de7
merge with master
2012-05-06 02:43:13 +02:00
Alexis Metaireau
0fe1453c50
Merge pull request #306 from mbowcock/master
...
Add output markup option to importer doc and multiple file extensions to file reader
2012-05-05 17:26:27 -07: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
Alexis Metaireau
3f9c87099d
Merge pull request #329 from neoascetic/_save_as_behavior
...
Checking for basestring isinstance, not (str, unicode)
2012-05-05 17:20:02 -07:00
Alexis Metaireau
718f8989f8
Merge pull request #331 from neoascetic/default_category_url
...
Use {slug} instead of {name} for category URL and FILENAME formatting
2012-05-05 17:11:27 -07:00
Albrecht Mühlenschulte
1d6289245a
removed duplication
2012-05-06 02:01:36 +02:00
Albrecht Mühlenschulte
a60fa59514
removed duplication
2012-05-06 01:59:19 +02:00
Albrecht Mühlenschulte
29fed3cc85
merged back master
2012-05-06 01:50:53 +02:00
Stuart Colville
06ba9acdb8
Pass write function to reduce duplication. Simplify logic.
2012-05-02 09:26:33 +01:00
Matt Bowcock
0d5a1f9cf3
Merge remote-tracking branch 'upstream/master'
2012-05-01 23:32:52 -04:00
Matt Bowcock
faecba6035
Changed variable name extension to file_extensions.
2012-05-01 22:34:32 -04:00
Pavel Puchkin
feb1dcc773
Use {slug} instead of {name} for category URL and FILENAME formatting
2012-05-01 16:54:39 +11:00
Stuart Colville
e4f011a697
Refactor generators to aid testing
2012-04-29 10:34:20 +01:00
Pavel Puchkin
19cfe00397
Checking for basestring isinstance, not (str, unicode)
2012-04-29 14:45:34 +11:00
Stuart Colville
cc46ac5d4c
Allow user to customise the save location of direct template pages from settings.
2012-04-28 18:01:19 +01:00
Meir Kriheli
17626b5474
Don't use shell=True
2012-04-28 03:46:43 +03:00
Meir Kriheli
0924a9dd73
Not pdf, but less folder
2012-04-28 03:27:30 +03:00
Meir Kriheli
f558389006
Remove redundant LESS_COMPILER setting
2012-04-28 03:25:54 +03:00
Meir Kriheli
2b93d6d855
Remove empty generate_context
2012-04-28 03:04:58 +03:00
Meir Kriheli
b73d984ec9
Merge branch 'master' of https://github.com/ametaireau/pelican
2012-04-28 00:52:45 +03:00
