Commit Graph

9563 Commits (76e8e4ea838516ebdb8e981fff47efa6af836079)

Author SHA1 Message Date
Joey Hess a1aa71efc9 document the gitbranch template 2010-04-17 13:49:20 -04:00
Joey Hess 9fbef7e1d2 reformat 2010-04-17 13:42:50 -04:00
Joey Hess c721a9ef87 my autotag branch 2010-04-17 13:41:06 -04:00
Joey Hess 7fcc0faf83 few more suggestions 2010-04-17 12:45:20 -04:00
Joey Hess c769a33392 autoindex: Switch to using %wikistate instead of abusing $pagestate{index}. 2010-04-17 12:20:50 -04:00
Joey Hess c6c03768da add list of compatability breaking changes 2010-04-16 19:42:18 -04:00
Joey Hess e31b1b27f8 remove note about needing --gettime; automatically run on first build now 2010-04-16 19:25:25 -04:00
Joey Hess b13bb0c83c implement rcs_getmtime for svn
This is a slow implementation; it runs svn log once per file
still, rather than running svn log once on the whole srcdir.

I did it this way because in my experience, svn log, run on a directory,
does not always list every change to files inside that directory.
I don't know why, and I use svn as little as possible these days.
2010-04-16 18:46:20 -04:00
Joey Hess dee2940c0b automatically run --gettime, and optimise it for git
* Automatically run --gettime the first time ikiwiki is run on
  a given srcdir.
* Optimise --gettime for git, so it's appropriatly screamingly
  fast. (This could be done for other backends too.)
* However, --gettime for git no longer follows renames.
* Use above to fix up timestamps on docwiki, as well as ensure that
  timestamps on basewiki files shipped in the deb are sane.
2010-04-16 18:30:56 -04:00
Joey Hess d3ebc80cd0 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-16 17:53:31 -04:00
Cord e3e245956f typo 2010-04-16 21:48:35 +00:00
Joey Hess b14f84c4ac --gettime revamp
* Rename --getctime to --gettime. (The old name still works for
  backwards compatability.)
* --gettime now also looks up last modification time.
* Add rcs_getmtime to plugin API; currently only implemented
  for git.
2010-04-16 17:02:29 -04:00
http://oblomov.myopenid.com/ ff5b73163f Proposal for tags/meta/field coalescing 2010-04-16 18:20:29 +00:00
http://smcv.pseudorandom.co.uk/ 7205228598 ... and indeed there is a better way to store it 2010-04-16 17:51:51 +00:00
David Riebenbauer a70c2518af answer to clarification. 2010-04-16 18:16:47 +02:00
Joey Hess 49be30eae8 clarify re %pagestate persistence 2010-04-16 12:08:12 -04:00
http://smcv.pseudorandom.co.uk/ 18b39ff975 try to clarify 2010-04-16 15:31:31 +00:00
David Riebenbauer e26ac520bf typo 2010-04-16 17:21:54 +02:00
David Riebenbauer 5c263623c2 answer about the `%pagestate` of autopages. 2010-04-16 17:19:44 +02:00
http://kerravonsen.dreamwidth.org/ 208a77a977 response 2010-04-16 03:41:25 +00:00
Joey Hess 4efc897fdf Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-15 20:12:25 -04:00
Joey Hess 142e025ae4 calendar: Improved display of arrows. 2010-04-15 20:12:03 -04:00
http://smcv.pseudorandom.co.uk/ b5e7f7a67f slight clarification 2010-04-15 23:39:02 +00:00
http://smcv.pseudorandom.co.uk/ f0ed76441d some comments about this and autoindex 2010-04-15 23:36:42 +00:00
Joey Hess 425f6a8de2 reduce border 2010-04-15 19:21:01 -04:00
Joey Hess a0a472d577 fix tagspec 2010-04-15 17:57:35 -04:00
Joey Hess f41ebb8862 reorg 2010-04-15 17:56:36 -04:00
Joey Hess 4c6f5a48bc fix sidebar directive parameter handling 2010-04-15 17:50:43 -04:00
Joey Hess 4bbbd77a48 typo 2010-04-15 17:49:32 -04:00
Joey Hess bbb3a8aac7 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-15 17:40:18 -04:00
Joey Hess d63e043f0a allow sidebar directive to enable use of sidebar page
This way, the example blog always has a sidebar on the index page,
but not the overhead of sidebars on all the other pages. And if a
user wants to, they can enable global_sidebars to switch to sidebars on
every page.
2010-04-15 17:38:13 -04:00
Joey Hess 1f7175e891 sidebar: Add global_sidebars setting. 2010-04-15 17:31:50 -04:00
Joey Hess 37a0c2d40b add note if ikiwiki-calendar needs to be run 2010-04-15 16:55:20 -04:00
Joey Hess 358fa953e1 sidebar: Now a sidebar directive can be used to override the sidebar shown on a page. 2010-04-15 16:51:27 -04:00
Joey Hess 843ce484fc update 2010-04-15 16:21:06 -04:00
Joey Hess 5143d790b0 sidebar styling improvements
Added a visible border; tuned down the whitespace/borders.

Note the use of the -1 pixel margin-top -- this makes the sidebar appear
to hang down from the line under the actions at the top of the page.
2010-04-15 16:08:33 -04:00
Joey Hess 3fbc9e411e increase sidebar width from 20 to 30 ex
This makes it big enough to fit a month calendar.
2010-04-15 15:38:23 -04:00
Joey Hess baaa848f6c CSS and templates for sidebar changed to use a class, not an id.
Multiple sidebars should be possible; also, I want to add a sidebar
template.
2010-04-15 15:04:17 -04:00
Joey Hess d6bfe2a25e don't link to ikiwiki-calendar, broken link on basewiki 2010-04-15 14:32:53 -04:00
Joey Hess fe733e2a42 enhance pagestats and rework example blog front page
* pagestats: Class parameter can be used to override default class for
  custom styling.
* pagestats: Use style=list to get a list of tags, scaled by use like
  in a tag cloud. This is useful to put in a sidebar.
* Rework example blog front page.
2010-04-15 14:29:14 -04:00
Joey Hess 3131433f64 calendar: Add archive_pagespec, which is used by ikiwiki-calendar to specify which pages to include on the calendar archive pages. (The pagespec can still also be specified on the ikiwiki-calendar command line.) 2010-04-15 13:40:53 -04:00
Joey Hess 81ce1cf9da remove example comments_pagespec setting
auto-blog.setup configures this automatically now
2010-04-15 13:38:24 -04:00
http://oblomov.myopenid.com/ 55d4e6bdce Reply to KA about collapsing metadata functionality 2010-04-15 13:54:54 +00:00
http://kerravonsen.dreamwidth.org/ 19700c70e5 response, alternative proposal 2010-04-15 07:39:32 +00:00
http://oblomov.myopenid.com/ 2f6da5fd2b Describe my tag type proposal 2010-04-15 07:19:47 +00:00
Joey Hess 43ed0cd07e note link types are now available 2010-04-14 16:04:52 -04:00
PaulePanter 53c8e674ac Correct comment. We want to merge the branch *doc* into branch *master* as the sample output suggests. 2010-04-14 17:38:39 +00:00
http://oneingray.myopenid.com/ e6e77d2311 Fixed a typo. 2010-04-14 16:03:20 +00:00
http://oneingray.myopenid.com/ 766ad1cb4c Fixed the double quotes. 2010-04-14 15:56:45 +00:00
http://oneingray.myopenid.com/ 43ad6bf961 More details on my personal preferences (as related to Ikiwiki.) 2010-04-14 15:54:49 +00:00
http://oneingray.myopenid.com/ 46551be9ef Give a bit more details about the Wikis (now one more) I run. 2010-04-14 15:42:25 +00:00
Joey Hess aaaef74010 update 2010-04-12 16:46:38 -04:00
Joey Hess 24fb346938 fix bug 2010-04-12 16:04:49 -04:00
Joey Hess 5ce4c89dee Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-12 15:03:42 -04:00
Joey Hess df022df35e implemented the other half of this
Writing my own sort code actually was faster than the built in sort. Whee!
(That's not supposed to happen, is it. ;)

But, I need to make sure influences are calculated alright.
2010-04-12 15:02:18 -04:00
Simon McVittie 9060cb0cf8 Space sorting orders consistently
Markdown interprets the empty lines resulting from [[!if]] as a request
that each <li> contain a <p>. For consistent spacing in the HTML, either
the unconditional items should have blank lines between (resulting in
each <li> having a <p>), or the conditional items should not (resulting
in messy source code, and no <li> having a <p>). I think the former
looks nicer.
2010-04-11 14:32:18 +01:00
Joey Hess 0bfc364a7d optimization: pagespec_match_list with no num limit matches before sorting
This can be a lot faster, since huge numbers of pages are not sorted
only to mostly be thrown away. It sped up a build of my blog by at least
5 minutes.
2010-04-11 01:30:03 -04:00
Joey Hess cecbd52938 plan for more efficient pagespec_match_list sorting
(smcv please note)
2010-04-11 00:30:27 -04:00
Joey Hess bb09a1f001 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-10 18:29:20 -04:00
Joey Hess d2c36a6f4b close 2010-04-10 15:29:31 -04:00
Cord a8761a086e 2010-04-10 07:06:06 +00:00
Joey Hess 1c1c76c53e close bug, was fixed in 3.20100403 2010-04-09 12:25:10 -04:00
http://kerravonsen.dreamwidth.org/ ce9cf967d0 formatting 2010-04-07 23:33:04 +00:00
http://kerravonsen.dreamwidth.org/ 15a65ffae6 further response to smcv on pagetemplates 2010-04-07 23:29:25 +00:00
Jon Dowland c127e964f1 expand my response 2010-04-07 21:25:26 +01:00
http://smcv.pseudorandom.co.uk/ e46a3b7534 "safe" and "unsafe" too simplistic, I suspect 2010-04-07 17:39:04 +00:00
http://kerravonsen.dreamwidth.org/ 2e9fae5c11 response about XSS, meta and pagetemplates 2010-04-07 15:12:39 +00:00
Joey Hess ef1ebf6079 add peter's git repo 2010-04-07 00:28:56 -04:00
Joey Hess d58444a3e9 note about sort and dependency types
There's a gotcha where pagespec_match_list is used with a dependency type
that is not a full content dependency, and so ikiwiki does not know that
a content change to a page that sorted too low to match needs to trigger
a rebuild, since its sort order may have changed.

Inline is mostly ok re this, as it does use content dependencies. Except
for in the case of raw mode. But then, page metadata is documented to not
be loaded, so it doesn't make sense to use sortspecs that depend on
metadata. I hope. :)
2010-04-07 00:09:22 -04:00
Joey Hess 32ce94f5a3 close (but one question remains!) 2010-04-06 23:30:10 -04:00
Joey Hess 04a9d8e867 remove note about more sort types possibly being available
Good plugins should document them :)
2010-04-06 23:26:59 -04:00
Joey Hess dad7ac5a21 question 2010-04-06 23:24:22 -04:00
Joey Hess be2af2e5c1 add cpan link 2010-04-06 23:19:00 -04:00
Joey Hess bab8fec524 Merge remote branch 'smcv/ready/sort-package'
Conflicts:
	debian/NEWS
2010-04-06 23:15:33 -04:00
Joey Hess 9dc220711d Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-06 23:05:04 -04:00
Joey Hess fcd810d236 close 2010-04-06 23:04:54 -04:00
http://smcv.pseudorandom.co.uk/ e12cd5f293 update fieldsort plugin again; remove obsolete bug + fix note (thanks!) 2010-04-07 03:03:40 +00:00
Joey Hess f2a87addc6 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-06 22:59:57 -04:00
Joey Hess 3b1dd03c7e improve wording to not encourage explicitly passing undef 2010-04-06 22:57:02 -04:00
http://smcv.pseudorandom.co.uk/ 1158fe8f44 further discussion, point out potential XSS 2010-04-07 02:55:50 +00:00
Joey Hess f6fd7639da Merge remote branch 'smcv/ready/link-types' 2010-04-06 22:50:19 -04:00
http://kerravonsen.dreamwidth.org/ 811d398646 response 2010-04-06 23:20:49 +00:00
http://kerravonsen.dreamwidth.org/ c7eaf3c262 response 2010-04-06 23:19:18 +00:00
http://kerravonsen.dreamwidth.org/ 121405e8aa response to Joey and smcv 2010-04-06 23:09:59 +00:00
http://kerravonsen.dreamwidth.org/ af99d4cb10 reply 2010-04-06 22:24:24 +00:00
http://smcv.pseudorandom.co.uk/ 899639f10d fixed 2010-04-06 20:03:26 +00:00
Simon McVittie b8f4ffdc5d Remove typedlink from [[ikiwiki/pagespec]]
It's not supported in this branch any more.
2010-04-06 21:00:48 +01:00
Joey Hess 1a646f7e77 Revert spam
This reverts commit e496920e51.

"Twice is enemy action"; enjoy your ban!
2010-04-06 15:12:54 -04:00
webkatalog e496920e51 2010-04-06 18:43:08 +00:00
Joey Hess 4568ba8a62 Revert spam
This reverts commit b29c50c731.

Nice try, no cigar.
2010-04-06 14:39:51 -04:00
webkatalog b29c50c731 2010-04-06 18:38:17 +00:00
Joey Hess 407a349359 nearly there! 2010-04-06 14:20:44 -04:00
Joey Hess ff267e7ac3 comment 2010-04-06 14:09:02 -04:00
Joey Hess 6fd59908ba comment 2010-04-06 14:06:29 -04:00
Joey Hess 33d934b5ca comment 2010-04-06 14:05:00 -04:00
Joey Hess c87ddb6908 idea 2010-04-06 13:58:55 -04:00
Joey Hess 089a7faff8 first question 2010-04-06 13:25:26 -04:00
http://smcv.pseudorandom.co.uk/ 2efec70c7e oops, branch returned now 2010-04-06 10:47:28 +00:00
http://kerravonsen.dreamwidth.org/ ee1e7079eb more flexible underlays, please? 2010-04-06 04:41:55 +00:00
http://kerravonsen.dreamwidth.org/ 06f58b1b88 response 2010-04-06 04:00:47 +00:00
http://kerravonsen.dreamwidth.org/ 5f8df58288 2010-04-06 03:59:09 +00:00
http://smcv.pseudorandom.co.uk/ 1f112d570e if applied, reverting this would be problematic 2010-04-06 00:55:54 +00:00
http://smcv.pseudorandom.co.uk/ 315bcf866c tag as patch 2010-04-06 00:51:27 +00:00
http://smcv.pseudorandom.co.uk/ 0ed94696c0 pages talking about escaping should really be escaped correctly 2010-04-06 00:50:51 +00:00
http://smcv.pseudorandom.co.uk/ 26bf69d17a as seen on IRC 2010-04-06 00:49:38 +00:00
http://smcv.pseudorandom.co.uk/ 1fb5b9f61c switch branch for review to use ready/foo convention 2010-04-06 00:04:47 +00:00
http://smcv.pseudorandom.co.uk/ b186ec1b4c ready for review, I think 2010-04-06 00:02:18 +00:00
Simon McVittie cb8b2f80b2 Use $a and $b for SortSpec cmp callbacks 2010-04-05 22:50:51 +01:00
Joey Hess f8457f9a90 fix bug that left stray </p> tags
Both markdown and tidy add paragraph tags around text, that needs to be
stripped when the text is a short, one line fragment that is being inserted
into a larger page. tidy also adds several newlines to the end, and this
broke removal of the paragraph tags.
2010-04-05 17:18:30 -04:00
Joey Hess a01028ae81 txt: Add a special case for robots.txt. 2010-04-05 17:02:10 -04:00
Joey Hess 10f4695abd response 2010-04-05 15:28:54 -04:00
http://smcv.pseudorandom.co.uk/ 861080b918 potential performance improvements 2010-04-05 19:19:00 +00:00
Joey Hess b51703569d speed 2010-04-05 14:59:29 -04:00
Joey Hess 6876c5a588 close bug, comment 2010-04-04 12:28:12 -04:00
http://smcv.pseudorandom.co.uk/ f6dde92957 advertise some bugfixes 2010-04-04 14:05:42 +00:00
http://smcv.pseudorandom.co.uk/ 834936a408 bug report + patch: unnecessary YAML::Any dependency 2010-04-04 14:03:51 +00:00
http://hendry.iki.fi/ 3a02cfca99 2010-04-04 13:00:52 +00:00
PaulePanter 7060b774e4 Typo. 2010-04-04 12:03:41 +00:00
http://liw.fi/ 6b746ed72b 2010-04-04 09:23:05 +00:00
http://liw.fi/ 3190e3be93 2010-04-04 09:13:01 +00:00
http://liw.fi/ 3e2a78840a 2010-04-04 09:12:23 +00:00
https://mukund.startssl.com/ 17cc857378 Add the Banu website 2010-04-04 07:16:41 +00:00
https://mukund.startssl.com/ ed26f287b2 Remove my homepage 2010-04-04 07:13:51 +00:00
Simon McVittie 490f95616a Rename sort parameter to meta title/author to sortas=bar
Joey pointed out that sort=x usually takes a sort order.
2010-04-04 01:43:02 +01:00
Simon McVittie 618bbaee38 meta: generalize meta_title into meta(title); support author, updated, date
I've left meta_title in, undocumented, as a possible replacement for
sort=title in IkiWiki 4.0 or something.
2010-04-04 01:43:02 +01:00
http://smcv.pseudorandom.co.uk/ 61a31a3d63 updated branch 2010-04-04 00:34:36 +00:00
http://smcv.pseudorandom.co.uk/ 20040772ce update fieldsort plugin to be compatible with the latest version of my branch 2010-04-04 00:27:20 +00:00
Simon McVittie ef63441440 Remove tagged_is_strict option, and just behave as though it was enabled
Jon was worried about the backwards-compatibility break involved in making
tagged() not match non-tag links, but Joey seems less concerned about it.
2010-04-04 00:43:58 +01:00
Simon McVittie c1a42e76bc implement typed links; add tagged_is_strict config option 2010-04-04 00:43:48 +01:00
David Riebenbauer 129bea3177 answer about autofiles for tags 2010-04-03 23:42:35 +02:00
David Riebenbauer 36202d461f link to commits 2010-04-03 23:42:35 +02:00
Joey Hess 195943e588 slightly more consistent capitalisation of ikiwiki
For a while, I was avoiding capitalizing ikiwiki at the beginning of a
sentence. I now think that's a bad idea (unless explicitly referring to
the `ikiwiki` command). Still, I don't go all the way and always cap it,
as a proper noun. That would make the logo look bad. ;)

I also tend to avoid capping it as IkiWiki, except when referring to the
perl internals, which do use that capitalization. (Too late to change
that.) However, it's also reasonable to do so in a WikiLink, as a nod to
historical camelcase wikis.
2010-04-03 16:07:32 -04:00
Joey Hess af2bf28515 add news item for ikiwiki 3.20100403 2010-04-03 15:15:25 -04:00
http://smcv.pseudorandom.co.uk/ 56c64ff196 updated branch 2010-04-03 13:39:44 +00:00
Simon McVittie 04a59b3c65 Move sort hooks to the IkiWiki::SortSpec namespace
Also rename cmpspec_translate (internal function) to sortspec_translate
for consistency.
2010-04-03 14:28:21 +01:00
Simon McVittie 75fd080465 Remove support for check_cmp_foo (pre-sort checks) 2010-04-03 14:28:21 +01:00
Simon McVittie a875ee8be7 Split out sortnaturally into a plugin 2010-04-03 14:28:21 +01:00
Joey Hess 931c7b00cc response 2010-04-02 22:46:31 -04:00
Joey Hess e4e53d7a18 response 2010-04-02 22:23:36 -04:00
http://smcv.pseudorandom.co.uk/ 5445fe7657 cross-reference 2010-04-03 01:15:28 +00:00
http://smcv.pseudorandom.co.uk/ 3934759592 vague musings about wikilinks 2010-04-03 01:13:08 +00:00
http://smcv.pseudorandom.co.uk/ c4a838b33a perhaps the typedlink(tag foo) pagespec isn't so useful 2010-04-03 00:53:59 +00:00
http://smcv.pseudorandom.co.uk/ 0dad28b353 reduced difference 2010-04-03 00:45:16 +00:00
http://smcv.pseudorandom.co.uk/ c2f54ccfb7 sort-order could usefully be overridden for meta author, too 2010-04-03 00:41:31 +00:00
http://smcv.pseudorandom.co.uk/ 5f87d5d242 actually I can see a second use for "nonlinear" syntax - but I don't think it's worth it 2010-04-03 00:25:28 +00:00
http://smcv.pseudorandom.co.uk/ aec7dec279 make questions to Joey more explicit 2010-04-03 00:12:59 +00:00
http://smcv.pseudorandom.co.uk/ 011fe920d1 respond at some length 2010-04-03 00:00:53 +00:00
http://smcv.pseudorandom.co.uk/ 2c7fe7ae2c respond (also unindent Joey's review to avoid very deep indentation) 2010-04-02 22:25:16 +00:00
Joey Hess 1faf9b08e1 idea 2010-04-02 17:37:38 -04:00
Joey Hess 9e7dcefd7e comments 2010-04-02 17:26:32 -04:00