Commit graph

2,022 commits

Author SHA1 Message Date
Kyle Mahan
0ddabb95c3 Modify notmyidea to include class="active" on pages 2013-07-27 12:30:24 -07:00
Russ Webber
b527fd594d added testing for default locale setting
removed LOCALE="" from default conf as it looks weird and you
shouldn't need to set a blank LOCALE for the system to work.
2013-07-21 14:12:21 +08:00
Russ Webber
2ace30cdb0 fix it not setting the default locale
If LOCALE was not specified in the settings file it would default
to [] insted of [''], where '' is used by locale.setlocale
to mean the user's default locale.
2013-07-21 13:31:11 +08:00
Justin Mayer
e32c893aa1 Support Gaug.es analytics in notmyidea theme 2013-07-18 10:26:45 -07:00
Justin Mayer
d4b64a3c8e Merge pull request #873 from xlz/tumblr-import
Support importing Tumblr
2013-07-18 09:17:26 -07:00
Russ Webber
3445066b11 fix an exception not correctly reporting if the locale is not set 2013-07-18 09:44:46 +08:00
Jude N
c5008f61e0 Adding a FEED_ALL_ATOM check in the "social" div.
The head section has a tests for FEED_ALL_ATOM when building the atom link.  This diff add a similar test in the "social" div.
2013-07-16 23:44:53 -04:00
Justin Mayer
9b0cfd9884 Merge pull request #883 from ben2367/author-filter
Add filter-author option to importer
2013-07-16 08:22:26 -07:00
Justin Mayer
f43742c3f0 Add missing SITEURL variable to tag cloud docs 2013-07-15 14:25:39 -07:00
Justin Mayer
b282b7c72d Merge pull request #965 from cdhowie/master
Update tag cloud documentation
2013-07-15 13:59:23 -07:00
Chris Howie
4ca5d908ff Update tag cloud documentation for SLUG_SUBSTITUTIONS 2013-07-15 16:48:08 -04:00
Nick Moore
9b7ae20aa9 test for author & category slugification 2013-07-15 00:22:05 +10:00
Nick Moore
6c5444eb68 do slug_substitutions on category and author ... 2013-07-14 23:01:16 +10:00
Alexis Metaireau
9f0ad2bd95 Merge pull request #958 from hrbonz/dev_server_port
Dev server port
2013-07-14 05:04:42 -07:00
Alexis Metaireau
5e73b7b40e Merge pull request #954 from ajma/master
Adding stackoverflow to social icons
2013-07-14 03:35:13 -07:00
Alexis Metaireau
fe33d3eed5 Merge pull request #931 from Cartroo/slugsubstitutions
Allow text substitutions when generating slugs
2013-07-14 03:31:11 -07:00
Benjamin Port
cb650c1c99 Add filter-author option to importer
Allow to import post from only one author when importing data
2013-07-13 16:15:45 +02:00
Stefan hr Berder
689632835e add port option to Makefile target serve/devserver 2013-07-07 14:28:31 +02:00
Stefan hr Berder
3a5db543bb add port parameter to bash script 2013-07-07 13:27:50 +02:00
Lingzhu Xiang
241ac2400a Use better titles than None for Tumblr posts without title 2013-07-07 19:05:21 +08:00
Lingzhu Xiang
75263fa852 Fix importing Tumblr photo caption
Besides each photo's caption, the general caption is also needed.

While we're at it, also add a linefeed at the end of file.
2013-07-07 19:05:21 +08:00
Lingzhu Xiang
00a1cbb6b8 Support importing Tumblr
Try to integrate Tumblr's various post types without using
additonal templates.
2013-07-07 19:05:21 +08:00
Stefan hr Berder
3da4c2e13e add port option to pelican.server 2013-07-07 12:44:21 +02:00
Andy Pearce
39518e15ef Allow text substitutions when generating slugs
The `slugify()` function used by Pelican is in general very good at
coming up with something both readable and URL-safe. However, there are
a few specific cases where it causes conflicts. One that I've run into
is using the strings `C++` and `C` as tags, both of which transform to
the slug `c`. This commit adds an optional `SLUG_SUBSTITUTIONS` setting
which is a list of 2-tuples of substitutions to be carried out
case-insensitively just prior to stripping out non-alphanumeric
characters. This allows cases like `C++` to be transformed to `CPP` or
similar. This can also improve the readability of slugs.
2013-07-04 12:17:21 +01:00
Justin Mayer
7ec4d5faa2 Merge pull request #880 from joeshaw/pre-index-fix
Exception on WP import looking for <pre> tag
2013-06-29 08:02:27 -07:00
Justin Mayer
ddb6d89be3 Document how to stop generation of certain pages
The documentation doesn't make it very clear how to prevent certain
pages from being generated, such as the Authors, Tags, and Categories
collection pages. This change makes it slightly more obvious how to
prevent these pages from being generated. Fixes #940.
2013-06-28 19:59:00 -07:00
Andrew Ma
bed53d1c0b Updating unit tests 2013-06-28 15:09:36 -07:00
Andrew Ma
298151237e Adding stackoverflow to social icons 2013-07-03 22:36:52 -07:00
Justin Mayer
1448db9603 Merge pull request #951 from dbrgn/document_tags_save_as
More explicit settings docs concerning list templates
2013-06-27 19:16:50 -07:00
Danilo Bargen
931d571606 More explicit settings docs concerning list templates
I think the author list and tag list are so common that they should be
listed explicitly in the settings.
2013-06-28 00:55:22 +02:00
Justin Mayer
5c70e2bcb1 Merge pull request #948 from justinmayer/make-clean
Remove "clean" task from "make html"; revert "make clean" behavior to "rm -rf"
2013-06-26 17:08:19 -07:00
Justin Mayer
5d000ca290 Add more missing -s flags to tips doc page 2013-06-26 06:39:09 -07:00
bas smit
0d63b4520a Add info about debugging to the help output of the makefile 2013-06-26 14:01:01 +02:00
bas smit
12fd53c27e Add debug target to the template makefile
If the DEBUG variable is set (e.g. DEBUG=1 make target) debugging will
be enabled by using pelicans -D flag.
2013-06-26 14:00:45 +02:00
Justin Mayer
7d37cfa748 Missing -s flag added to command on tips doc page 2013-06-25 19:17:40 -07:00
Justin Mayer
d2ef893b72 Merge pull request #944 from justinmayer/vcs-data
Keep certain files when cleaning output; fix #574
2013-06-25 19:12:57 -07:00
Justin Mayer
6f36b0a246 Keep certain files when cleaning output; fix #574
If DELETE_OUTPUT_DIRECTORY is set to True, all files and directories are
deleted from the output directory. There are, however, several reasons
one might want to retain certain files/directories and avoid their
deletion from the output directory. One such use case is version control
system data: a versioned output directory can facilitate deployment via
Heroku and/or allow the user to easily revert to a prior version of the
site without having to rely on regeneration via Pelican.

This change introduces the OUTPUT_RETENTION setting, a tuple of
filenames that will be preserved when the clean_output_dir function in
pelican.utils is run. Setting OUTPUT_RETENTION = (".hg", ".git") would,
for example, prevent the relevant VCS data from being deleted when the
output directory is cleaned.
2013-06-25 19:03:32 -07:00
Justin Mayer
bf0a50880d Revert "make clean" behavior to rm -rf. Fixes #773
The change to the "make clean" task in 764a2cf from "rm -rf" to instead
relying on GNU "find" appears to have broken cross-platform portability,
likely causing problems on *BSD and other platforms. This commit reverts
that change back to the previous "rm -rf" behavior.
2013-06-24 13:40:32 -07:00
Justin Mayer
e9fec3b1dc Remove "clean" task from "make html"; fixes #637
This change removes the "clean" task from the "html" and "regenerate"
tasks in the default Makefile generated by pelican-quickstart. The
previous behavior ignored whether the DELETE_OUTPUT_DIRECTORY
setting was set to True or not and deleted everything in the output
directory every time the "make html" or "make regenerate" task was run.
In addition to violating the Principle of Least Astonishment, there was
also the potential for data loss if the user wasn't careful when
defining the output directory location in the Makefile.

The new behavior therefore relies primarily on the
DELETE_OUTPUT_DIRECTORY setting to control if and when the output
directory is cleaned. The default settings and Makefile generated by the
pelican-quickstart command, for example, no longer clean the output
directory when the "make html" task is run. If the user wants to change
this behavior and have the output directory cleaned on every "make html"
run, the recommended method would be to set DELETE_OUTPUT_DIRECTORY to
True in pelicanconf.py. Alternatively, the user can manually run "make
clean", with the caveat that the output directory and its contents will
be entirely destroyed, including any otherwise to-be-retained files or
folders specified in the OUTPUT_RETENTION setting. It is for that reason
that relying on the DELETE_OUTPUT_DIRECTORY setting is instead
recommended.

As before, DELETE_OUTPUT_DIRECTORY is set to True in the publishconf.py
settings file generated by the pelican-quickstart script. This way, any
potentially old and irrelevant files will be automatically removed
before the latest version of the site is transferred to the production
server environment.

In summary, this change allows for the sanest possible default settings,
while still allowing end users to customize output cleaning to their
preferred behavior with a minimum of confusion.
2013-06-24 13:05:00 -07:00
Justin Mayer
dd9f55c8bb Clean up minor text formatting, spelling, grammar 2013-06-22 12:28:37 -07:00
Alexis Metaireau
4a204f19c9 Merge pull request #936 from dbrgn/isinstance_iterable
Better duck typing in isinstance check
2013-06-19 15:33:04 -07:00
Danilo Bargen
d8c9fb31d0 Better duck typing in isinstance check 2013-06-20 00:13:57 +02:00
Justin Mayer
2188f4de68 Merge pull request #898 from saimn/fix-markup-cli
Ensure that markup is a tuple.
2013-06-19 06:51:59 -07:00
Alexis Metaireau
4f444ee6a8 Merge pull request #934 from wking/generator-init-kwargs
Use keyword arguments to initialize Generators
2013-06-19 00:57:50 -07:00
Kyle Machulis
39dd4a0255 Changed meta tag "contents" attribute to "content", to conform to HTML spec. Fixes #918 2013-06-16 10:56:50 -07:00
W. Trevor King
12dd35ef36 generators: Remove wonky argument handling from Generator.__init__ 2013-06-16 13:31:16 -04:00
W. Trevor King
6e527e7416 test_generators: Use keyword arguments to initialize Generators 2013-06-16 13:30:59 -04:00
W. Trevor King
0d1866b393 Pelican.run: Use keyword arguments when initializing generators
This makes it easier to add new arguments to Generator subclasses.
2013-06-16 12:15:26 -04:00
Justin Mayer
8f295f7a03 PyPI now has CDN; Travis shouldn't use mirrors
Now that PyPI utilizes a CDN, the "--use-mirrors" setting slows down the
install process and has essentially been deprecated.
2013-06-16 08:53:45 -07:00
Justin Mayer
a650dd9d64 Merge pull request #933 from wking/no-static-for-pictures
samples: Remove EXTRA_PATH_METADATA entries for pictures
2013-06-16 08:38:23 -07:00