summaryrefslogtreecommitdiff
path: root/IkiWiki
AgeCommit message (Collapse)Author
2009-07-31Merge commit 'remotes/smcv/ready/inline-pagenames' into stagingJoey Hess
2009-07-31Merge commit 'remotes/smcv/ready/harishcm-map-fix' into stagingJoey Hess
2009-07-31Merge commit 'remotes/smcv/ready/among'Joey Hess
2009-07-27img: Fix adding of dependency from page to the image.Joey Hess
This was impressively broken. add_depends was being called with params backwards, and on parameter was set to the name of the generated file, which isn't in the source. Now updates to images will update the page that contains them, thus updating them. This is unncessary for fullsize images, so skipped.
2009-07-25Fix failure to close <ul> in maps with no itemsharishcm
Signed-off-by: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
2009-07-23revert revertJoey Hess
2009-07-23improve string to be less confusingJoey Hess
2009-07-23reverted a few of the string changesJoey Hess
Improved one string.
2009-07-23Merge branch 'master' of git://git.ikiwiki.infoJonas Smedegaard
2009-07-23Change rendering→building in translatable strings, to ease translations.Jonas Smedegaard
2009-07-23Rephrase suggestion to not get confused as info on action already done.Jonas Smedegaard
2009-07-23Rephrase 'linked to by' confusing for translators.Jonas Smedegaard
2009-07-23Improve translatable texts to ease translation (e.g. to→into and ↵Jonas Smedegaard
from→inside)
2009-07-23Fix typo attepting→attemptingJonas Smedegaard
2009-07-22add --previous at bubulle's suggestionJoey Hess
2009-07-21relocate po directory up a levelJoey Hess
2009-07-21turn off pot file underlay againJoey Hess
2009-07-21improve invalid gettext messageJoey Hess
(and gettext it as translators will see this!)
2009-07-21updateJoey Hess
2009-07-21updateJoey Hess
2009-07-21po: Add support for mo files in underlaysJoey Hess
In order to support translated basewiki and other underlays, we need support for mo files in underlays. The code did not allow this before, because if a mo file was in an underlay, then it might try to update it, and its pot, and write to the underlay, which is guaranteed to either fail due to permissions, or be undesirable. To fix, my approach is to just detect if a mo or pot file that is about to be updated is in an underlay, and skip updating it. This seems to work well: - If the mo is out of date in the underlay, it won't get updated, but this would probably be due to a problem in the underlay, or more likely, the wiki is being rebuilt and so it *thinks* the mo is out of date, but it's really not (and it would be a waste of time to rebuild it anyway). - If a page from the basewiki is edited, it is saved to the srcdir, which causes generation of an updated mo and pot also in the srcdir; the underlay stops being used for that page, and everything seems to work. Note that I am not including an underlay search directory for pot files. They *seem* to be unnecessary for the underlay, since the mo files in there never need to be updated.
2009-07-21fix exampleJoey Hess
2009-07-20po: Support running with a non-english master lang; add translated underlaysJoey Hess
It seem to make sense to remove the check for there being slave languages as part of this, since one might want a wiki that is only in non-English.
2009-07-20remove prototype from renamehookJoey Hess
Recursive calls make perl whine about protypes, and it wasn't adding any value.
2009-07-20create translated underlays in mdwn formatJoey Hess
These are for use by wikis where the primary language is not English. On such a wiki, it makes sense to use an underlay has the source for pages in the native language.
2009-07-20split two helper functions of of render()Joey Hess
2009-07-19s//bad//invalid// # jonas=Joey Hess
2009-07-19avoid Po4a::Common exporting anythingJoey Hess
It exports gettext and stuff by default, which conflicts with IkiWiki exports.
2009-07-19shut up msgmergeJoey Hess
2009-07-19bugfix: Avoid generating po files for files that are not httmlizableJoey Hess
2009-07-19improve error messageJoey Hess
2009-07-19Merge branch 'master' into poJoey Hess
Conflicts: debian/changelog
2009-07-17pagestats: add `among` parameter, which only counts links from specified pagesSimon McVittie
2009-07-17IkiWiki::Render: split out backlink_pages() function from backlinks()Simon McVittie
This separates style from content - backlinks() performs lossy transformations on the page names to get it in the form that the page template wants.
2009-07-17pagestats: when making a tag cloud, don't emit links where the tag is unusedSimon McVittie
2009-07-11Merge commit 'e12b7f5e54730325c751a889ed2e08580b5ef6ba'Joey Hess
2009-07-11img: Pass the align parameter through to the generated img tag.Joey Hess
2009-07-10Move OpenID pretty-printing from openid plugin to coreSimon McVittie
On various sites I have two IkiWiki instances running from the same repository: one accessible via http and only accepting openid logins, and one accessible via authenticated https and only accepting httpauth. The https version should still pretty-print OpenIDs seen in git history, even though it does not itself accept OpenID logins.
2009-07-08svn: Fix rcs_rename to properly scope call to dirname.Joey Hess
2009-07-07highlight: Fix utf-8 encoding bug. Closes: #535028Joey Hess
2009-07-07Update IkiWiki::openiduser to work with Net::OpenID 2.xSimon McVittie
openiduser previously used a constructor that no longer works in 2.x. However, all we actually want is the (undocumented) DisplayOfURL function that is invoked by the display method, so try to use that. (cherry picked from commit c3dd0ff5c7c10743107f203a5b456fdcd1b171df)
2009-07-01typoJoey Hess
2009-06-16img plugin: do not emit a redundant double-quote before alt attributeSimon McVittie
2009-06-16inline: add pagenames parameterSimon McVittie
If given instead of pages, this is interpreted as a space-separated list of links to pages (with the same LinkingRules as in a WikiLink), and they are inlined in exactly the order given. The sort and pages parameters cannot be used in conjunction with this one.
2009-06-12aggregate: Avoid resetting ctime when an item md5 changes.Joey Hess
Besides being wrong to do, this could lead to the wrong item being expired, as follows: If B is added and at the same time A is changed, then A's ctime may be set to the current time, while B's is set to its creation time. Thus the new item, A, is incorrectly removed as older. (This interacted especially badly with the bug fixed by 90b4d079605b72bb50d1da41402d994960e10937.)
2009-06-12aggregate: Fix storing of changed md5.Joey Hess
The aggregate state merge code neglected to merge changes to the md5 field of an item. Therefore, if an item's md5 changed after initial aggregation, it would be updated, and rewritten, each time thereafter. This was wasteful and indirectly led to some expire problems.
2009-06-09Disable the Preferences link if no plugin with an auth hook is enabled.Joey Hess
2009-06-08meta: Add openid delegate parameter to allow delegating only openid or openid2.Joey Hess
2009-06-06Merge commit 'upstream/master' into pub/pointrigeri
Conflicts: debian/changelog debian/control Signed-off-by: intrigeri <intrigeri@boum.org>
2009-06-06Revert "quick fix for ↵intrigeri
http://ikiwiki.info/bugs/unwanted_discussion_links_on_discussion_pages/" This reverts commit 2ed033a4aac0d603c375294bdb19f5b74519f389. It has been more properly fixed in upstream's master, that will be merged in immediately. Signed-off-by: intrigeri <intrigeri@boum.org>