Commit Graph

9563 Commits (76e8e4ea838516ebdb8e981fff47efa6af836079)

Author SHA1 Message Date
Joey Hess 8cf6b7abf8 link fix 2010-04-21 21:42:18 -04:00
Joey Hess 6c5f315970 argh. head exploding. 2010-04-21 21:38:58 -04:00
Joey Hess 557912c723 my autotag branch seems ready 2010-04-21 20:47:18 -04:00
Joey Hess d048e9c64a turn on tag_autocreate by default if tagbase is set 2010-04-21 20:39:20 -04:00
Joey Hess 20052f8882 Merge branch 'master' into autotag
Conflicts:
	IkiWiki/Plugin/tag.pm
2010-04-21 20:19:06 -04:00
Joey Hess 129cd00bdb remove broken ./tag support
The commit that added the (working) support for using /tag to override
tagbase also tried to make ./tag work. Problem is, tags are links,
and ./foo is not a valid link (though I think there's a wishlist about it).

So, using ./tag really resulted in tag creation links that led to a
"bad page name" error. And even if the tag were created in the right place,
the link didn't go to it.
2010-04-21 20:15:11 -04:00
Joey Hess 789e68a8b1 Merge branch 'master' into autotag
Conflicts:
	IkiWiki/Plugin/tag.pm
2010-04-21 19:47:38 -04:00
Joey Hess 1336a3270b response 2010-04-21 16:36:58 -04:00
Joey Hess f03d3d8567 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-21 16:34:50 -04:00
Joey Hess 463ba55dce note re includes 2010-04-21 16:33:03 -04:00
http://smcv.pseudorandom.co.uk/ ffe9fd8eb1 suppressing auto-creation can be quite counter-intuitive 2010-04-21 20:30:14 +00:00
http://smcv.pseudorandom.co.uk/ b21db41978 elide an older patch that's no longer under discussion 2010-04-21 20:23:19 +00:00
Joey Hess 760b840e8f update 2010-04-21 16:19:16 -04:00
Joey Hess e9551afc5f Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-21 16:14:23 -04:00
Joey Hess 6a30b45e75 update 2010-04-21 16:07:23 -04:00
Joey Hess 9951060f62 Merge branch 'master' into autotag 2010-04-21 15:53:59 -04:00
Joey Hess e3ea28f8c7 update, tag deletion bug 2010-04-21 15:53:44 -04:00
http://hendry.iki.fi/ 86e73e42e8 2010-04-21 19:48:31 +00:00
Joey Hess 204c0a63f3 document tag_autocreate 2010-04-21 15:22:52 -04:00
http://hendry.iki.fi/ 9ed523d762 2010-04-21 19:21:38 +00:00
Joey Hess 9fa5f71034 update; my branch is (partially) debugged now 2010-04-21 15:18:11 -04:00
http://hendry.iki.fi/ e72973afdb debugging 2010-04-21 19:07:32 +00:00
Joey Hess 9c8761ba49 add_autofile filename should be relative to srcdir 2010-04-21 14:37:03 -04:00
Joey Hess 0fcbcc4815 Merge branch 'master' into autotag 2010-04-21 14:21:40 -04:00
Joey Hess 5c855b2bca applied 2010-04-21 12:50:43 -04:00
http://oblomov.myopenid.com/ 5d2df9651f Missing links with no CGI 2010-04-21 08:17:03 +00:00
Joey Hess 34e8c78c1c Merge branch 'master' into autotag 2010-04-20 18:19:00 -04:00
http://oblomov.myopenid.com/ 4b4fdc85ab Clarifications 2010-04-20 20:18:29 +00:00
http://smcv.pseudorandom.co.uk/ 3b8f4f59d6 internal pages: the revenge? 2010-04-20 15:01:39 +00:00
Jon Dowland 52ccc03d10 clarify whether the raw files would be put in destdir 2010-04-20 15:40:10 +01:00
Joey Hess 1171851934 similarity to internal pages 2010-04-20 01:32:19 -04:00
Joey Hess 563428ebd2 response 2010-04-19 23:52:16 -04:00
http://kerravonsen.dreamwidth.org/ 529929e732 non comprend 2010-04-20 02:45:14 +00:00
http://kerravonsen.dreamwidth.org/ fda191cbbb formatting 2010-04-20 02:43:44 +00:00
http://kerravonsen.dreamwidth.org/ 16afa9e844 further clarification 2010-04-20 02:41:13 +00:00
Joey Hess 9f00692a79 response 2010-04-19 22:37:55 -04:00
http://kerravonsen.dreamwidth.org/ 09c647c177 response 2010-04-20 02:31:00 +00:00
Svend Sorensen 65510a3c05 Merge branch 'master' of git://git.ikiwiki.info 2010-04-19 16:13:10 -07:00
Svend Sorensen e1ebdda72b Remove www prefix from Svend's website URLs 2010-04-19 16:12:09 -07:00
Joey Hess 7c0a2830f2 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-19 16:04:49 -04:00
Joey Hess 1b7c455f4a thinking about changing how templatedir works and allowing wikitemplate files into the srcdir 2010-04-19 16:03:53 -04:00
http://oblomov.myopenid.com/ 99cdd38dd5 Respond 2010-04-19 08:36:38 +00:00
http://kerravonsen.dreamwidth.org/ 63e6c00890 response to the further thoughts 2010-04-19 02:23:12 +00:00
PeteG 472694b8b4 2010-04-18 12:34:20 +00:00
PeteG 56bf9c04a2 2010-04-18 12:33:51 +00:00
Joey Hess 59ceeb5621 improve docs 2010-04-17 17:15:07 -04:00
Joey Hess ca02c57ee4 document add_autofile 2010-04-17 14:07:12 -04:00
Joey Hess e289e0b4ba recommend git 2010-04-17 14:00:25 -04:00
Joey Hess cd8ec309d2 bzr getmtime done 2010-04-17 13:58:31 -04:00
Joey Hess 6f485b8f45 note that tla plugin is not being maintained 2010-04-17 13:57:59 -04:00
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