Commit graph

2,149 commits

Author SHA1 Message Date
Mario Lang
e49cd3a6d8 Merge branch 'master' of https://github.com/getpelican/pelican
Conflicts:
	pelican/themes/notmyidea/templates/authors.html
2014-02-14 09:03:28 +01:00
Justin Mayer
826ff4df50 Merge pull request #1247 from paylogic/multiple-authors
Multiple authors implementation for #956
2014-02-13 19:08:34 -08:00
Anatoly Bubenkov
2c25e488c4 multiple authors implemented 2014-02-14 03:21:06 +01:00
Justin Mayer
57155b561a Merge pull request #1262 from utdemir/master
Fix issue #1258
2014-02-13 17:30:00 -08:00
Utku Demir
e55e550198 Fix issue #1258
Correctly handle DEFAULT_DATE = None .
2014-02-13 12:21:29 +02:00
Mario Lang
0eb79f3a8f Merge branch 'master' of https://github.com/getpelican/pelican 2014-02-12 20:40:17 +01:00
Justin Mayer
00e1b68e74 Revert to newly-revived Typogrify project
Since the Typogrify project will be actively maintained going forward,
there is no need for the fork.
2014-02-12 10:54:56 -08:00
Mario Lang
828e7bcb4c Fix stray ol and section end tag if only one article was displayed.
We already check if loop.length > 1 before outputting <section> and <ol>
tags, but we neglected to do the same check when outputting the corresponding
end tags.
2014-02-12 12:42:27 +01:00
Mario Lang
b9846b5a7f Simplify unnecessarily complicated conditional.
if (a) if (a and (b or not b and c))
can be simplified as
if (a) if (b or c)
2014-02-12 12:34:22 +01:00
Mario Lang
18d089e8ea HTML error in notmyidea/authors.html: li not allowed in section.
li tags need to be inside of ul or ol.
2014-02-12 12:19:10 +01:00
Mario Lang
3d4eff922a HTML error in notmyidea/tags.html: li not allowed in section.
li tags need to be inside of ul or ol.
Thanks to the w3c_validate plugin for finding this.
2014-02-12 11:47:22 +01:00
Mario Lang
66ac2bf2da Merge branch 'master' of https://github.com/getpelican/pelican 2014-02-10 17:14:00 +01:00
Justin Mayer
6b0a99932f Revert test-failing change from #1114 2014-02-09 08:45:06 -08:00
Mario Lang
3cc4523310 Some browsers like Lynx render adjacent links without implicit spaces.
Put an extra space at the end of each link to a tag so that Lynx doesnt render
the tags as a single word.
2014-02-09 15:17:23 +01:00
Justin Mayer
c60e0d03fb Merge pull request #1114 from brannerchinese/master
xml => lxml for bs4, in pelican-import.wp2fields()
2014-02-08 15:38:06 -08:00
Justin Mayer
e58cab0250 Merge pull request #1178 from robulouski/devserver_fix
Fix issue in devserver introduced in v3.3
2014-02-08 15:36:14 -08:00
Justin Mayer
a9d1fdae3d PY and PELICAN env variable overrides for Make
This allows the user to set PY and/or PELICAN environment variable
overrides, which will be respected by the Makefile and devserver.sh.
If, for example, the default Python on your system were Python 3 and
you wanted to run Make with Python 2, using bash you could run
`PY=python2 make`. Refs #915.
2014-02-08 14:32:58 -08:00
Justin Mayer
9b36437d97 Merge pull request #1246 from fenekku/period-to-archive-context
Add period to period_archives context. Refs #1044.
2014-02-08 12:19:36 -08:00
Justin Mayer
05f392c6bc Merge pull request #1249 from smartass101/split_articles_generate_context
Add article_generator_pretaxonomy signal
2014-02-08 12:13:23 -08:00
Justin Mayer
45e1aa112f Clarify docs re: settings file 2014-02-07 17:05:15 -08:00
Ondrej Grover
22762f2c16 add signal article_generator_pretaxonomy
invoked before categories and tags lists are created
useful when e.g. modifying the list of articles to be generated
so that removed articles are not leaked in categories or tags
2014-02-07 08:34:27 +01:00
Justin Mayer
dcadf33988 Merge pull request #1183 from Rogdham/pelican-fixcopy
Fix `utils.copy` for copying files
2014-02-05 08:19:34 -08:00
Justin Mayer
89de903925 Merge pull request #1200 from tomtung/patch-1
`ctrl+c` correctly terminates&reenables `fab serve`
2014-02-05 08:11:20 -08:00
Justin Mayer
9dd8e3954c Merge pull request #1202 from tomtung/patch-2
Update settings.rst to match tag cloud code
2014-02-05 07:43:51 -08:00
fenekku
f6e27617f8 Add period to period_archives context. Refs #1044.
* Adds period tuple of (year, month, day) matching the time
  period of the current archive. Note that this is done
  to the archive context if period_archives.html doesn't exist.
* Adds tests to verify this.
* Adds documentation in themes.rst about period in period_archives.html.
2014-02-03 20:26:38 -05:00
Justin Mayer
24866b77c7 Merge pull request #1234 from alistairmagee/wp-custom-posts-and-attachment-download
WordPress custom posts and attachment download
2014-02-03 10:08:17 -08:00
Alistair Magee
ea3e160db1 Extra functionality for pelican-import for wordpress imports 2014-02-03 17:36:41 +00:00
Justin Mayer
d91750090b Merge pull request #1244 from alistairmagee/article-writer-signal
add the new signal to the docs
2014-01-26 15:06:12 -08:00
Alistair Magee
45bc018672 add the new signal to the docs 2014-01-25 20:44:15 +00:00
Justin Mayer
f232958daf Merge pull request #1242 from alistairmagee/article-writer-signal
Add signal upon writing pages and feeds
2014-01-24 13:01:00 -08:00
Alistair Magee
752e862b80 Needed a signal for my subcategory plugin 2014-01-24 06:31:26 +00:00
Justin Mayer
23e7ac3659 Merge pull request #1094 from mua/master
Watch static folders in Autoreload mode
2014-01-22 07:54:12 -08:00
M. Utku Altinkaya
cda21c5481 Update __init__.py
Watch static folders using utils.folder_watcher
2014-01-22 01:55:46 +02:00
Justin Mayer
e60b5602ec Merge pull request #1228 from getpelican/testing
Clean up unit testing dependencies
2014-01-21 10:35:39 -08:00
Justin Mayer
960291c2f2 Merge pull request #1227 from alistairmagee/test_absolute_import
Fix test-suite import error
2014-01-19 12:08:16 -08:00
Justin Mayer
7a15045fbc Merge pull request #1232 from hlapp/fix-sitelink
Append slash to href of link to site home
2014-01-13 09:46:56 -08:00
Hilmar Lapp
5eb9fa6d16 Append slash to href of link to site home
This is necessary to make the link to the site home work locally, because then SITEURL may be set to an empty string (in fact the Pelican default configuration sets it to an empty string in pelicanconf.py).
2014-01-13 12:37:15 -05:00
Alistair Magee
dc552bb869 fix test-suite import error 2014-01-10 16:33:02 +00:00
Kyle Fuller
8dfa7c23f3 Use dev_requirements.txt for tox dependencies 2014-01-10 07:34:13 +00:00
Kyle Fuller
d8e50d56da travis: Use dev_requirements.txt for dependencies 2014-01-10 07:33:41 +00:00
Justin Mayer
f6d012adf8 Merge pull request #1220 from saimn/misc
Clarify docs about the DIRECT_TEMPLATES _SAVE_AS and _URL settings.
2014-01-05 14:53:11 -08:00
Simon Conseil
6264cf8916 Clarify docs about the DIRECT_TEMPLATES _SAVE_AS and _URL settings. 2014-01-05 23:37:44 +01:00
Simon Conseil
fb4b894b77 More pep8 fixes and refactor the check for old settings. 2014-01-05 23:34:46 +01:00
Simon Conseil
18e6ec9f02 Simplify a bit pagination code. 2014-01-05 23:34:46 +01:00
Simon Conseil
c90a62ea13 pep8 fixes 2014-01-05 23:34:46 +01:00
Justin Mayer
226672da9f Merge pull request #1219 from iurisilvio/categories_url
Set CATEGORIES_URL and CATEGORIES_SAVE_AS
2014-01-05 13:19:44 -08:00
Iuri de Silvio
fb1cfc35bf Change CATEGORIES_URL and CATEGORIES_SAVE_AS docs to
make it consistent with TAGS_URL and TAGS_SAVE_AS.

Add default values to CATEGORIES_URL and CATEGORIES_SAVE_AS.
2014-01-05 18:34:23 -02:00
Justin Mayer
b25001333d Merge pull request #1214 from hrbonz/article_generator_write_article
Add a signal on article writing
2014-01-05 09:03:09 -08:00
Justin Mayer
f73484a4f4 Merge pull request #1215 from justinmayer/typogrify
Use the actively maintained typogrify-web package
2014-01-03 15:02:43 -08:00
Justin Mayer
127f60c3e9 Update Travis config with new Typogrify package 2014-01-03 14:27:19 -08:00