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
Alexis Metaireau
58d98e918f
Merge pull request #326 from neoascetic/_save_as_behavior
...
*_SAVE_AS = False fix
2012-04-26 10:39:56 -07:00
Pavel Puchkin
898ac3808f
Last fix?
2012-04-20 11:28:00 +11:00
Alexis Metaireau
004ff4e7b6
Merge pull request #325 from akavlie/issue-314
...
Better output formatting (see issue #314 )
2012-04-19 01:34:57 -07:00
Aaron Kavlie
5710dc771d
Remove --no-wrap; change para formatting to unicode string.
2012-04-18 22:28:49 -07:00
Aaron Kavlie
36a5344282
Beautify two-line string concat.
2012-04-18 22:14:53 -07:00
Aaron Kavlie
cc30695b72
Correct comment; switch to new style string formatting.
2012-04-18 09:29:47 -07:00
Justin Mayer
602990b80e
Use "endswith" to detect trailing slash on SITEURL
2012-04-18 07:16:51 -07:00
Justin Mayer
f53d902265
Merge branch 'master' into siteurl
2012-04-18 07:12:14 -07:00
Pavel Puchkin
9dcf612f9d
Fixes after review
2012-04-18 23:07:57 +11:00
Pavel Puchkin
6116236ed9
*_SAVE_AS = None fix
...
Ability to disable creating some files when their `_SAVE_AS` setting is
set to none-value. Mostly for disabling creating of `authors` stuff
(when there only one user, see #320 for details)
2012-04-18 18:56:53 +11:00
Aaron Kavlie
9491bb40d4
Add --no-wrap option to pandoc, fixing issue with long links names (another fix for issue #314 )
2012-04-18 00:24:52 -07:00
Aaron Kavlie
6577efc8f4
Wrap paragraphs in <p> tags
2012-04-18 00:20:54 -07:00
Andrew Laski
a0d5596605
Modifed question so that it's more clear
2012-04-16 20:39:41 -04:00
Justin Mayer
e29b54e5e0
Replace omitted slash in feed URL generation
...
This slash was originally present, but I removed it at some point
because it was causing double-slashes. I believe the reason is that I
had a leading slash in my article URL pattern, which in retrospect
should not have been there. Omitting the slash caused problems for other
folks; I should have tested this better. This commit puts the slash back
where it belongs.
2012-04-16 09:10:20 -07:00
Kyle Fuller
51d0e83a21
Merge pull request #307 from kriwil/header-category-link
...
Fixed hardcoded category url in base.html in default themes
2012-04-15 06:48:01 -07:00
Kyle Fuller
4c4c2a9604
Add a missing '
2012-04-15 14:40:10 +01:00
Kyle Fuller
7b5b99aafa
Merge pull request #303 from dafyddcrosby/typos
...
Fix some typos and grammar
2012-04-15 06:33:51 -07:00
Kyle Fuller
ac8f3fc653
Fix misspelling of ftp_target_dir in quickstart
2012-04-15 14:31:34 +01:00
Meir Kriheli
ddf57ca295
Also compile less css files in theme static
2012-04-15 02:52:19 +03:00
