1
0
Fork 0
forked from github/pelican
Commit graph

434 commits

Author SHA1 Message Date
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
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
Aaron Kavlie
6888a04636 Issue #311
Catch BeautifulSoup ImportError.
2012-04-12 19:38:59 -07:00
Aldiantoro Nugroho
424cfe1b1e Fixed hardcoded category url in base.html. 2012-04-10 17:30:42 +08:00
Dafydd Crosby
28a1e0f432 Fix some typos and grammar 2012-04-07 18:02:40 -06:00
Stéphane Raimbault
ae97cbfb72 Fix misspelling of ssh_target_dir in quickstart 2012-04-07 17:33:23 +02:00
Rémy HUBSCHER
b509fe70cd Add rsync_upload 2012-04-06 09:55:15 +02:00
Alexis Metaireau
e5f58c9594 Merge branch 'master' of github.com:ametaireau/pelican 2012-04-03 11:59:30 +02:00
Alexis Metaireau
b845db30de Add a way to know what metadata exists.
This allows in a theme to have a look at the "metadata" attribute of a content
to know what are the metadata fields defined by it.
2012-04-03 11:58:31 +02:00
Tshepang Lekhonkhobe
2db2b671f2 fix #293: pelican-importer for Wordpress doesn't add tags 2012-04-02 01:06:27 +02:00
Alexis Metaireau
373ccdebf2 Add style for the note marker. Fix #257 2012-04-01 13:42:28 +02:00
Alexis Metaireau
ebe5c0b2bf Enhance warnings. Fix #196 2012-04-01 13:37:35 +02:00
Alexis Metaireau
2d55eacc57 Fix the autogenerated makefile.
Fix #278
2012-04-01 13:21:44 +02:00
Alexis Metaireau
af2b588ea6 Merge pull request #289 from bbinet/fix_index_template
Fix index.html template
2012-03-31 18:08:30 -07:00
Alexis Metaireau
3cabdb2dbf Merge pull request #285 from yumike/summary_markup
Fix markup for single-paragraph summary in reST metadata
2012-03-31 18:03:26 -07:00
Alexis Metaireau
d20ea30add Merge pull request #284 from m-r-r/log
pelican/log.py simplified a bit
2012-03-31 18:01:51 -07:00
Alexis Metaireau
520d9b73c0 Merge pull request #281 from m-r-r/master
Patch for issue #271 (« Unicode issue in category name »)
2012-03-31 17:59:56 -07:00
Justin Mayer
56b8a88b1f Improve uniqueness of feed entry ID
The ID of a feed entry should never change, but the previous method of
generating the ID -- i.e., using the entry URL -- results in an ID that
is not permanent and can change. Switching to the tag URI method from
RFC 4151 should help improve the long-term uniqueness and permanence of
entry IDs, as espoused here:
<http://web.archive.org/web/20110514113830/http://diveintomark.org/archives/2004/05/28/howto-atom-id>

Also added a trailing slash to the site URL inside the feed; the lack
thereof was causing a feed validation warning.
2012-03-31 10:08:16 -07: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
Bruno Binet
64e12b1809 fix missing </ol> and </section> tags 2012-03-30 14:20:55 +02:00
Mike Yumatov
4df6179954 Fix markup for single-paragraph summary in reST metadata 2012-03-25 21:39:41 +04:00
m-r-r
5aa12b2319 pelican/log.py simplified a bit 2012-03-25 18:47:14 +02:00
draftcode
4efca13c33 Fix a bug that ArticlesGenerator doesn't see DEFAULT_CATEGORY.
When you set ARTICLE_DIR which is not equal to PATH, ArticlesGenerator
doesn't use DEFAULT_CATEGORY but use ARTICLE_DIR's dirname.
2012-03-24 11:53:07 +09:00
m-r-r
fc584969c9 patch for bug #271 (Unicode issue in category name) 2012-03-23 19:31:44 +01: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
bc7c8c14f4 - split main and parse arguments in two function
- add '.' as default value for the path
2012-03-22 07:02:06 +00: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
Alexis Metaireau
9c4b40fd35 Keep raw metadata text (but for summary) 2012-03-18 15:12:06 +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
4819a83003 Fix #171. Handle unicode filenames 2012-03-16 21:13:24 +01:00
Alexis Metaireau
e38e3e14e6 Merge branch 'master' of github.com:ametaireau/pelican 2012-03-16 19:59:19 +01:00
Alexis Metaireau
c75ab513da use 'summary' rather than ':summary:' in comments 2012-03-16 19:59:03 +01:00
Alexis Metaireau
8b8b9f59a1 Merge pull request #261 from AndreaCrotti/package
move tools in pelican.tools and add the pelican.tools package to setup.p...
2012-03-16 11:56:45 -07:00
Alexis Metaireau
ad36beed1f Merge pull request #259 from AndreaCrotti/version
Version
2012-03-16 11:54:51 -07:00
Andrea Crotti
4e4af9d011 move tools in pelican.tools and add the pelican.tools package to setup.py 2012-03-16 18:53:08 +00:00