ba3bf607a1
web commit by http://joey.kitenet.net/ : commit after preview, one last test
2008-02-04 18:48:36 -05:00
f64ef7deb6
proper fix for the preview/will_render issue
2008-02-04 18:46:34 -05:00
5c0e0e19d1
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
2008-02-04 18:45:18 -05:00
b37dc9c926
preview shouldn't show the feed buttons or post form
2008-02-04 18:44:54 -05:00
a637ab5819
web commit by http://edward.myopenid.com/ : had a 'atom' parameter twice
2008-02-04 18:39:18 -05:00
bf522a347f
* inline: Add new `allowrss` and `allowatom` config options. These can be
...
used if you want a wiki that doesn't default to generating rss or atom
feeds, but that does allow them to be turned on for specific blogs.
2008-02-04 18:36:50 -05:00
f7c575bd30
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
2008-02-04 18:36:16 -05:00
9f9bc5607e
web commit by http://joey.kitenet.net/ : turning on non-default atom feed should work now
2008-02-04 18:35:54 -05:00
57567f4168
note about will_render and preview
2008-02-04 18:34:47 -05:00
346fc8f1a5
rm old page
2008-02-04 18:09:01 -05:00
85de2f7bc4
the old code worked, suprisingly, but I prefer this form
2008-02-04 18:05:40 -05:00
6fba45bb56
further comments
2008-02-04 18:03:15 -05:00
b224b25544
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
2008-02-04 17:59:07 -05:00
d1c4899a22
* inline: When previewing, still call will_render on rss/atom files,
...
just avoid actually writing the files. This is necessary because ikiwiki
saves state after a preview (in case it actually *did* write files),
and if will_render isn't called its security checks will get upset
when the page is saved. Thanks to Edward Betts for his help tracking this
tricky bug down.
2008-02-04 17:58:23 -05:00
2eba6f2138
web commit by http://joey.kitenet.net/ : and again..
2008-02-04 17:46:39 -05:00
a17ac6abc2
web commit by http://joey.kitenet.net/ : another test commit
2008-02-04 17:46:05 -05:00
6ab06ed7fa
web commit by http://edward.myopenid.com/ : do i get an error?
2008-02-04 17:40:10 -05:00
d1f88400f2
web commit by http://joey.kitenet.net/ : test commit, only whitespace changes
2008-02-04 17:38:49 -05:00
147106d755
web commit by http://edward.myopenid.com/ : feeds="yes"
2008-02-04 17:28:24 -05:00
cf03646c4d
web commit by http://edward.myopenid.com/ : sort="mtime"
2008-02-04 16:50:36 -05:00
b265861f2d
web commit by http://edward.myopenid.com/ : turn on atom
2008-02-04 16:48:04 -05:00
b150b1f499
web commit by http://edward.myopenid.com/ : use space instead of underscore
2008-02-04 16:46:11 -05:00
46b22b2508
web commit by http://edward.myopenid.com/ : create a watchlist
2008-02-04 16:43:49 -05:00
4f75dccb71
web commit by http://edward.myopenid.com/ : prefix diff with a tab on each line so markdown treats it as code
2008-02-04 06:11:50 -05:00
a3f224cb6c
move saveindex call into preview block
...
This call is only present to handle the case where previewing a page
actually causes files to be rendered.
2008-02-03 19:51:00 -05:00
408419ca3e
remove another commit mail mention
2008-02-03 19:47:01 -05:00
1c60510600
add monotone to list
2008-02-03 18:23:31 -05:00
27d5f91a18
remove spurious EOF
2008-02-03 18:16:19 -05:00
749c1e36d9
* monotone changes by Brian May:
...
- On commits, replace "mtn sync" bidirectional with "mtn push" single
direction. No need to pull changes when doing a commit. mtn sync
is still called in rcs_update.
- Support for viewing differences via patches using viewmtn.
2008-02-03 18:14:39 -05:00
855f28e105
removing old patch that was also sent by mail
2008-02-03 17:48:30 -05:00
9d54cc4659
implement aggregate_locking design
...
Now aggregation will not lock the wiki. Any changes made during aggregaton are
merged in with the changed state accumulated while aggregating. A separate
lock file prevents multiple concurrent aggregators. Garbage collection
of orphaned guids is much improved. loadstate() is only called once
per process, so tricky support for reloading wiki state is not needed.
(Tested fairly thuroughly.)
2008-02-03 16:48:26 -05:00
38affb0c1c
add aggregate locking functions
2008-02-03 15:17:15 -05:00
d8d2b31692
fix broken link
2008-02-03 15:05:31 -05:00
ac58aa804e
update po files
2008-02-03 15:02:34 -05:00
e57749b702
* recentchanges: Exipre all *._change pages, even if the directory
...
they're in has changed.
2008-02-03 14:51:03 -05:00
340fe9707c
* recentchanges: Improve handling of links on the very static changes pages
...
by thunking to the CGI, which can redirect to the page, or allow it to be
created if it doesn't exist.
2008-02-03 14:48:20 -05:00
42e5b8dfdc
prototype fix
2008-02-03 14:22:25 -05:00
858d955acf
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
2008-02-03 13:56:34 -05:00
6afbd9939a
late night thoughts on fixing aggregation locking
...
(still seem to make sense this morning)
2008-02-03 13:56:10 -05:00
6c1cb3f985
web commit by tschwinge: Another minor bug.
2008-02-03 12:18:26 -05:00
58ef55c798
web commit by tschwinge: Thanks!, and a bug report.
2008-02-03 12:16:06 -05:00
97dfdf8c64
web commit by http://edward.myopenid.com/ : fix broken link to http://git.or.cz/gitwiki/GitFaq
2008-02-03 04:28:37 -05:00
09187f83bc
clear %pagestate in loadindex
...
This is to handle the case where loadindex is called multiple times in one run,
as when aggregating.
2008-02-03 03:25:47 -05:00
1f6591f0a6
* aggregate: Revert use of forking to not save state, that was not the right
...
approach.
2008-02-03 03:04:19 -05:00
72bbc41520
rm
2008-02-03 00:32:38 -05:00
89000b48f3
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
2008-02-03 00:32:15 -05:00
f77de93291
web commit by http://joey.kitenet.net/ : poll vote (It's too slow!)
2008-02-03 00:30:38 -05:00
1992d87153
web commit by http://joey.kitenet.net/ : poll vote (No opinion)
2008-02-03 00:30:06 -05:00
0dd4fb5d36
web commit by http://joey.kitenet.net/
2008-02-03 00:29:17 -05:00
9f60272831
* poll: This plugin turns out to have edited pages w/o doing any locking.
...
Oops. Convert it from a cgi to a sessioncgi hook, which will work
much better.
2008-02-03 00:26:00 -05:00
Joey Hess
Joey Hess