Commit Graph

7992 Commits (9168dc2e2843fc8445ce97588062c624ba657ced)

Author SHA1 Message Date
Joey Hess 9168dc2e28 bug closures and changelog since smcv's ready branch didn't include them
Which would really make my merging rock if they did in the future.</hint>
2009-07-31 10:16:18 +02:00
Joey Hess 3d27dac809 Merge commit 'remotes/smcv/ready/among' 2009-07-31 10:12:23 +02:00
http://schmonz.livejournal.com/ 74d563f20f progress 2009-07-30 01:45:09 -04:00
http://schmonz.livejournal.com/ d9fa13504d add missing backquote 2009-07-29 22:38:51 -04:00
harishcm ae9b2151ac 2009-07-28 08:43:11 -04:00
Simon McVittie 7922eae327 Implement Will's suggestion 2009-07-27 12:03:11 +01:00
Simon McVittie 9a714e5f44 Flag branches as ready for review, by using a ready/ prefix as Joey suggested 2009-07-27 12:02:34 +01:00
simonraven 2dafc7d1f6 2009-07-27 05:49:59 -04:00
simonraven b25554042e 2009-07-27 05:42:04 -04:00
Joey Hess 0193298177 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2009-07-27 09:35:49 +02:00
Joey Hess 31865519fd merged 2009-07-27 09:34:46 +02:00
http://schmonz.livejournal.com/ 4b80bb5f9c more data 2009-07-27 00:25:37 -04:00
http://schmonz.livejournal.com/ 2774c0a061 CVS work in progress, debugging help appreciated 2009-07-27 00:19:39 -04:00
http://www.cse.unsw.edu.au/~willu/ 58189f90a8 Changes look good to me. 2009-07-26 22:54:00 -04:00
http://smcv.pseudorandom.co.uk/ f5b676bfcc .gitignore merge request 2009-07-26 15:42:36 -04:00
Simon McVittie 13de81ffbb Link to my amended version of Will's plugin 2009-07-26 17:15:01 +01:00
http://smcv.pseudorandom.co.uk/ 0c04985c07 Similar request 2009-07-26 08:56:39 -04:00
http://smcv.pseudorandom.co.uk/ 3c5bb5a01b The 404 plugin also closes an old wishlist item 2009-07-26 08:36:31 -04:00
http://smcv.pseudorandom.co.uk/ 5129b461ab is this in fact WONTFIX? 2009-07-26 08:31:34 -04:00
http://smcv.pseudorandom.co.uk/ e484061c96 See also 2009-07-26 08:27:02 -04:00
http://smcv.pseudorandom.co.uk/ fc18de040c Reference a potentially-useful Perl module 2009-07-26 08:05:36 -04:00
http://smcv.pseudorandom.co.uk/ 5a4e90468c Reference another todo item 2009-07-26 07:56:50 -04:00
http://smcv.pseudorandom.co.uk/ 4be57f2465 pass on Joey's comments from another page 2009-07-26 07:53:52 -04:00
http://smcv.pseudorandom.co.uk/ fd62f3c0eb maybe postform and inline need separating? 2009-07-26 07:47:03 -04:00
http://smcv.pseudorandom.co.uk/ d3cbbfbc96 Fix wtf-8, link to similar todo items, mark Joey's thoughts as such 2009-07-26 07:36:53 -04:00
http://smcv.pseudorandom.co.uk/ a1d31e6db2 plugins/contrib/album will also want attachment uploads into an underlay 2009-07-26 07:23:05 -04:00
http://smcv.pseudorandom.co.uk/ a722a85507 internal pages are already matched specially... 2009-07-26 07:03:32 -04:00
http://smcv.pseudorandom.co.uk/ ea30193af2 html5: reference git branch via template 2009-07-26 06:55:41 -04:00
http://smcv.pseudorandom.co.uk/ d8c5e4ab38 you don't need to copy all the templates, only page.tmpl 2009-07-26 06:48:03 -04:00
http://schmonz.livejournal.com/ 6f88e3631e fix typo 2009-07-26 05:40:58 -04:00
http://schmonz.livejournal.com/ 1896b8bccb spelling 2009-07-25 19:38:19 -04:00
Simon McVittie c2215feedd New branch based on optimize-pagespecs: remove pagespec_merge 2009-07-25 20:46:03 +01:00
Simon McVittie d2633aad3e Link my inline-pagenames branch 2009-07-25 20:39:20 +01:00
Simon McVittie 58bce14496 I now have a git branch with harishcm's [[!map]] bugfix. If I was a reviewer, I'd approve it 2009-07-25 20:28:54 +01:00
Simon McVittie f237ea1b9a Add [[!template id=gitbranch]] for things available from git, and use it
The uses are somewhat biased towards my own branches, because I know
where to find them and what they do :-) but I've tagged some other
people's as well.
2009-07-25 19:55:22 +01:00
http://smcv.pseudorandom.co.uk/ 18a58135fc Fix syntax, remove duplicate entry for Jon's repository 2009-07-25 14:11:08 -04:00
http://smcv.pseudorandom.co.uk/ 03f567ba77 Add all the forks on github, except gmcmanus' which was already there 2009-07-25 14:03:40 -04:00
Joey Hess 0d92055b64 remove ion 2009-07-22 17:28:06 +02:00
Joey Hess 62dd02aa79 oddity 2009-07-21 13:21:16 +02:00
Joey Hess d1b316dc05 add a warning 2009-07-21 13:07:49 +02:00
Jon Dowland c28c7846b4 Merge branch 'master' of git://git.ikiwiki.info 2009-07-21 11:45:29 +01:00
Jon Dowland ddd55037d4 some thoughts in the wake of a spam attack 2009-07-21 11:44:52 +01:00
Joey Hess 8effd48854 one issue with basewiki translations 2009-07-21 12:43:48 +02:00
Joey Hess eca2dbe67f po: Add support for mo files in underlays
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-21 11:31:51 +02:00
harishcm 4954ffb558 2009-07-21 00:33:23 -04:00
harishcm 7d682ef4c2 patch overcoming the issue of <ul> with no <li> 2009-07-21 00:29:42 -04:00
http://smcv.pseudorandom.co.uk/ 6463fe7a6b link to alternative patch 2009-07-20 11:19:46 -04:00
http://smcv.pseudorandom.co.uk/ f900e84416 link to existing bug 2009-07-20 11:16:45 -04:00
harishcm 3fef1fbd0d Issue with ul and div tag closure when returning empty map 2009-07-20 10:40:29 -04:00
harishcm 9fb0d03c5a 2009-07-20 10:29:39 -04:00