]> sipb.mit.edu Git - ikiwiki.git/log
ikiwiki.git
18 years agoweb commit by joey: conflict and merge is done!
www-data [Sun, 19 Mar 2006 20:36:50 +0000 (20:36 +0000)] 
web commit by joey: conflict and merge is done!

18 years agoweb commit by joey
www-data [Sun, 19 Mar 2006 20:36:05 +0000 (20:36 +0000)] 
web commit by joey

18 years agonon-conficting commit to test merging..
joey [Sun, 19 Mar 2006 20:35:59 +0000 (20:35 +0000)] 
non-conficting commit to test merging..

18 years agoconflict detection, merging, etc should be done now, I think
joey [Sun, 19 Mar 2006 20:34:59 +0000 (20:34 +0000)] 
conflict detection, merging, etc should be done now, I think

18 years agoweb commit by joey: conflict test
www-data [Sun, 19 Mar 2006 20:34:10 +0000 (20:34 +0000)] 
web commit by joey: conflict test

18 years agoweb commit by joey: conflict test
www-data [Sun, 19 Mar 2006 20:17:20 +0000 (20:17 +0000)] 
web commit by joey: conflict test

18 years agoweb commit by joey: conflict test
www-data [Sun, 19 Mar 2006 20:12:15 +0000 (20:12 +0000)] 
web commit by joey: conflict test

18 years agocommitting changes for conflict test
joey [Sun, 19 Mar 2006 20:10:58 +0000 (20:10 +0000)] 
committing changes for conflict test

18 years agosecond try at merging and conflicts support
joey [Sun, 19 Mar 2006 19:51:11 +0000 (19:51 +0000)] 
second try at merging and conflicts support

18 years agostupid mistakes
joey [Sun, 19 Mar 2006 19:29:41 +0000 (19:29 +0000)] 
stupid mistakes

18 years agoweb commit by joey
www-data [Sun, 19 Mar 2006 19:27:59 +0000 (19:27 +0000)] 
web commit by joey

18 years agoweb commit by joey
www-data [Sun, 19 Mar 2006 19:24:40 +0000 (19:24 +0000)] 
web commit by joey

18 years agofirst cut at svn merge and conflict
joey [Sun, 19 Mar 2006 19:09:57 +0000 (19:09 +0000)] 
first cut at svn merge and conflict

18 years agoweb commit by joey
www-data [Sat, 18 Mar 2006 21:39:58 +0000 (21:39 +0000)] 
web commit by joey

18 years agooops, add unlock _before_ svn commit
joey [Sat, 18 Mar 2006 21:36:36 +0000 (21:36 +0000)] 
oops, add unlock _before_ svn commit

18 years agoweb commit by joey: thoughts on conflict resolution, gobbing, locking
www-data [Sat, 18 Mar 2006 21:34:01 +0000 (21:34 +0000)] 
web commit by joey: thoughts on conflict resolution, gobbing, locking

18 years agofix
joey [Fri, 17 Mar 2006 18:44:14 +0000 (18:44 +0000)] 
fix

18 years agoweb commit by joey: test commit
www-data [Fri, 17 Mar 2006 18:43:04 +0000 (18:43 +0000)] 
web commit by joey: test commit

18 years agounlock wiki during svn commit to prevent deadlock with post-commit hook
joey [Fri, 17 Mar 2006 18:34:33 +0000 (18:34 +0000)] 
unlock wiki during svn commit to prevent deadlock with post-commit hook

18 years agoweb commit by BrandenRobinson: Explain why letting users specify regexes is bad.
www-data [Fri, 17 Mar 2006 16:51:14 +0000 (16:51 +0000)] 
web commit by BrandenRobinson: Explain why letting users specify regexes is bad.

18 years agofix update of links to removed pages
joey [Thu, 16 Mar 2006 22:25:17 +0000 (22:25 +0000)] 
fix update of links to removed pages

18 years agoweb commit by joey
www-data [Thu, 16 Mar 2006 22:07:51 +0000 (22:07 +0000)] 
web commit by joey

18 years agoneed to use CGI in rcs_recentchanges to get escapeHTML
joey [Thu, 16 Mar 2006 22:01:33 +0000 (22:01 +0000)] 
need to use CGI in rcs_recentchanges to get escapeHTML

18 years agoadd a header to page preview section
joey [Thu, 16 Mar 2006 21:47:48 +0000 (21:47 +0000)] 
add a header to page preview section

18 years agopreview done
joey [Thu, 16 Mar 2006 21:44:16 +0000 (21:44 +0000)] 
preview done

18 years agook, so we don't want to re-load page content into the form on preview..
joey [Thu, 16 Mar 2006 21:43:30 +0000 (21:43 +0000)] 
ok, so we don't want to re-load page content into the form on preview..

18 years agodd page preview
joey [Thu, 16 Mar 2006 21:39:45 +0000 (21:39 +0000)] 
dd page preview

18 years agooptimise svn log a bit
joey [Thu, 16 Mar 2006 21:20:33 +0000 (21:20 +0000)] 
optimise svn log a bit

18 years agoweb commit by joey
www-data [Thu, 16 Mar 2006 21:11:17 +0000 (21:11 +0000)] 
web commit by joey

18 years agoweb commit by joey
www-data [Thu, 16 Mar 2006 21:09:41 +0000 (21:09 +0000)] 
web commit by joey

18 years agoweb commit by joey
www-data [Thu, 16 Mar 2006 21:07:32 +0000 (21:07 +0000)] 
web commit by joey

18 years agoweb commit by BrandenRobinson: Add brainstorming about email change notification.
www-data [Thu, 16 Mar 2006 21:06:46 +0000 (21:06 +0000)] 
web commit by BrandenRobinson: Add brainstorming about email change notification.

18 years agolock wiki and refuse to traverse symlinks
joey [Thu, 16 Mar 2006 21:06:33 +0000 (21:06 +0000)] 
lock wiki and refuse to traverse symlinks

18 years agoweb commit by joey
www-data [Thu, 16 Mar 2006 21:06:32 +0000 (21:06 +0000)] 
web commit by joey

18 years agoweb commit by BrandenRobinson: Fix missing end brackets in wikilink.
www-data [Thu, 16 Mar 2006 20:59:19 +0000 (20:59 +0000)] 
web commit by BrandenRobinson: Fix missing end brackets in wikilink.

18 years agoweb commit by joey
www-data [Thu, 16 Mar 2006 20:45:43 +0000 (20:45 +0000)] 
web commit by joey

18 years agoweb commit by joey
www-data [Wed, 15 Mar 2006 06:10:26 +0000 (06:10 +0000)] 
web commit by joey

18 years agoescape html from commit logs
joey [Wed, 15 Mar 2006 06:03:03 +0000 (06:03 +0000)] 
escape html from commit logs

18 years agoweb commit by joey
www-data [Wed, 15 Mar 2006 06:02:57 +0000 (06:02 +0000)] 
web commit by joey

18 years agoweb commit by joey
www-data [Wed, 15 Mar 2006 05:56:48 +0000 (05:56 +0000)] 
web commit by joey

18 years agoweb commit by joey: wikilink escaping supported now
www-data [Wed, 15 Mar 2006 05:54:35 +0000 (05:54 +0000)] 
web commit by joey: wikilink escaping supported now

18 years agoweb commit by joey
www-data [Wed, 15 Mar 2006 05:53:38 +0000 (05:53 +0000)] 
web commit by joey

18 years agoimprove
joey [Wed, 15 Mar 2006 05:49:06 +0000 (05:49 +0000)] 
improve

18 years agofixes
joey [Wed, 15 Mar 2006 04:59:39 +0000 (04:59 +0000)] 
fixes

18 years agoman page generation
joey [Wed, 15 Mar 2006 04:40:32 +0000 (04:40 +0000)] 
man page generation

18 years agodebianise
joey [Wed, 15 Mar 2006 04:05:53 +0000 (04:05 +0000)] 
debianise

18 years agoconfig files now based on perl modules
joey [Wed, 15 Mar 2006 03:24:34 +0000 (03:24 +0000)] 
config files now based on perl modules
add MakeMaker foo for module

18 years agosometims I hate perl
joey [Wed, 15 Mar 2006 02:45:33 +0000 (02:45 +0000)] 
sometims I hate perl

This fixes the bug that made it not update pages linking to a new page

18 years agoadd a special case for discussion pages when determining the links from a
joey [Tue, 14 Mar 2006 06:40:58 +0000 (06:40 +0000)] 
add a special case for discussion pages when determining the links from a
page, since all pages implicitly link to their disussion page

18 years agofix two bugs in page location in new page creation
joey [Tue, 14 Mar 2006 06:19:16 +0000 (06:19 +0000)] 
fix two bugs in page location in new page creation

18 years agofix Discussion links to not take the BestLink.
joey [Tue, 14 Mar 2006 06:04:44 +0000 (06:04 +0000)] 
fix Discussion links to not take the BestLink.

As a bonus we now have meta Disussion/Discussion pages available, etc. Oh
well.. :-)

18 years agoremove quotes, actualy messed up ikiwiki $(wrapper --params) --foo
joey [Tue, 14 Mar 2006 05:51:57 +0000 (05:51 +0000)] 
remove quotes, actualy messed up ikiwiki $(wrapper --params) --foo

18 years agoload/save index when rendering a page in cgi mode for svn-less wikis
joey [Tue, 14 Mar 2006 05:37:34 +0000 (05:37 +0000)] 
load/save index when rendering a page in cgi mode for svn-less wikis

18 years agoSome fixes to the parent links, I think the link to the index will be right
joey [Tue, 14 Mar 2006 05:33:44 +0000 (05:33 +0000)] 
Some fixes to the parent links, I think the link to the index will be right
in all cases now.

18 years agougly fix for parentlink back to top of wiki
joey [Tue, 14 Mar 2006 04:54:50 +0000 (04:54 +0000)] 
ugly fix for parentlink back to top of wiki

18 years agoimproved setup file more
joey [Mon, 13 Mar 2006 19:53:13 +0000 (19:53 +0000)] 
improved setup file more

18 years agofoo
joey [Mon, 13 Mar 2006 19:31:05 +0000 (19:31 +0000)] 
foo

18 years agodocument setup files
joey [Mon, 13 Mar 2006 19:29:21 +0000 (19:29 +0000)] 
document setup files

18 years agoadd rebuild after calling setup, better format for setup files
joey [Mon, 13 Mar 2006 19:10:29 +0000 (19:10 +0000)] 
add rebuild after calling setup, better format for setup files

18 years agoavoid linkifying escaped wikilinks
joey [Mon, 13 Mar 2006 18:45:38 +0000 (18:45 +0000)] 
avoid linkifying escaped wikilinks

18 years agoadd --setup, --wrappermode
joey [Mon, 13 Mar 2006 18:35:23 +0000 (18:35 +0000)] 
add --setup, --wrappermode
allow filename param to --wrapper

18 years agospeed up cgis
joey [Mon, 13 Mar 2006 02:29:32 +0000 (02:29 +0000)] 
speed up cgis

18 years agohide markdown goo away, it also speeds up the cgis a bit
joey [Mon, 13 Mar 2006 02:22:42 +0000 (02:22 +0000)] 
hide markdown goo away, it also speeds up the cgis a bit

18 years agoreorganized code
joey [Mon, 13 Mar 2006 02:19:15 +0000 (02:19 +0000)] 
reorganized code

18 years ago- add --exclude
joey [Mon, 13 Mar 2006 02:08:04 +0000 (02:08 +0000)] 
- add --exclude
- move all the config vars into %config

18 years agoweb commit by webtest
www-data [Mon, 13 Mar 2006 01:07:50 +0000 (01:07 +0000)] 
web commit by webtest

18 years agoweb commit by webtest
www-data [Mon, 13 Mar 2006 01:06:10 +0000 (01:06 +0000)] 
web commit by webtest

18 years agoweb commit by webtest
www-data [Mon, 13 Mar 2006 01:01:52 +0000 (01:01 +0000)] 
web commit by webtest

18 years agoweb commit by webtest
www-data [Mon, 13 Mar 2006 01:01:38 +0000 (01:01 +0000)] 
web commit by webtest

18 years agoweb commit by webtest
www-data [Mon, 13 Mar 2006 01:01:22 +0000 (01:01 +0000)] 
web commit by webtest

18 years agoweb commit by webtest
www-data [Mon, 13 Mar 2006 01:01:02 +0000 (01:01 +0000)] 
web commit by webtest

18 years agoimprove quoting of --params
joey [Mon, 13 Mar 2006 00:57:37 +0000 (00:57 +0000)] 
improve quoting of --params

18 years agosupport --nocgi, --norebuild, and --nowrapper
joey [Mon, 13 Mar 2006 00:55:43 +0000 (00:55 +0000)] 
support --nocgi, --norebuild, and --nowrapper

18 years agonbsp hack to separate out the buttons a bit.
joey [Mon, 13 Mar 2006 00:54:33 +0000 (00:54 +0000)] 
nbsp hack to separate out the buttons a bit.
should really use css for this..

18 years ago- Add Discussion links to the button bar, these will automatically create
joey [Mon, 13 Mar 2006 00:52:57 +0000 (00:52 +0000)] 
- Add Discussion links to the button bar, these will automatically create
  /Discussion subpages.
- Fix linking to DNE pages in some edge cases.
- Fix --rebuild (oops)
- Fix propigation of "from" field trru the login process when creating a
  new page.a
- Ideas for change notification.

18 years agoweb commit by webtest
www-data [Sun, 12 Mar 2006 22:35:14 +0000 (22:35 +0000)] 
web commit by webtest

18 years agoweb commit by webtest
www-data [Sun, 12 Mar 2006 20:47:48 +0000 (20:47 +0000)] 
web commit by webtest

18 years agohmm..
joey [Sun, 12 Mar 2006 20:47:26 +0000 (20:47 +0000)] 
hmm..

18 years agoweb commit by webtest
www-data [Sun, 12 Mar 2006 20:46:20 +0000 (20:46 +0000)] 
web commit by webtest

18 years agoadd cencel link to edit page
joey [Sun, 12 Mar 2006 20:45:36 +0000 (20:45 +0000)] 
add cencel link to edit page

18 years agoweb commit by webtest
www-data [Sun, 12 Mar 2006 20:43:33 +0000 (20:43 +0000)] 
web commit by webtest

18 years agolinify user in recenthanges
joey [Sun, 12 Mar 2006 20:40:40 +0000 (20:40 +0000)] 
linify user in recenthanges

18 years agoweb commit by webtest
www-data [Sun, 12 Mar 2006 20:37:12 +0000 (20:37 +0000)] 
web commit by webtest

18 years agoweb commit by webtest
www-data [Sun, 12 Mar 2006 20:35:51 +0000 (20:35 +0000)] 
web commit by webtest

18 years agoweb commit by joey
www-data [Sun, 12 Mar 2006 20:32:14 +0000 (20:32 +0000)] 
web commit by joey

18 years agodon't allow saving empty page
joey [Sun, 12 Mar 2006 20:31:02 +0000 (20:31 +0000)] 
don't allow saving empty page

18 years agooo
joey [Sun, 12 Mar 2006 20:25:56 +0000 (20:25 +0000)] 
oo

18 years agofoo
joey [Sun, 12 Mar 2006 20:25:06 +0000 (20:25 +0000)] 
foo

18 years agotemplatize commit types, so it could use icons, or whatever
joey [Sun, 12 Mar 2006 20:24:10 +0000 (20:24 +0000)] 
templatize commit types, so it could use icons, or whatever

18 years agofoo
joey [Sun, 12 Mar 2006 20:21:12 +0000 (20:21 +0000)] 
foo

18 years agofoo
joey [Sun, 12 Mar 2006 20:19:52 +0000 (20:19 +0000)] 
foo

18 years agoweb commit normalisation
joey [Sun, 12 Mar 2006 20:18:17 +0000 (20:18 +0000)] 
web commit normalisation

18 years agoweb commit by joey: test logged in commit
www-data [Sun, 12 Mar 2006 20:14:45 +0000 (20:14 +0000)] 
web commit by joey: test logged in commit

18 years agoweb commit by joey
www-data [Sun, 12 Mar 2006 20:13:02 +0000 (20:13 +0000)] 
web commit by joey

18 years ago- finish user registration and password request email
joey [Sun, 12 Mar 2006 20:10:42 +0000 (20:10 +0000)] 
- finish user registration and password request email
- make sure a user is in the userdb before assuming they're logged on based
  on session info (allows deleting uerdb item and invalidating all
  sessions)

18 years agoforce session flush with safe umask
joey [Sun, 12 Mar 2006 18:10:43 +0000 (18:10 +0000)] 
force session flush with safe umask

18 years agosecurity improvements, switched to single session db file
joey [Sun, 12 Mar 2006 18:07:14 +0000 (18:07 +0000)] 
security improvements, switched to single session db file

18 years agosort backlinks by page name
joey [Sun, 12 Mar 2006 16:46:00 +0000 (16:46 +0000)] 
sort backlinks by page name

18 years agofix
joey [Sun, 12 Mar 2006 16:38:54 +0000 (16:38 +0000)] 
fix

18 years ago- use templates for signin form, error messages
joey [Sun, 12 Mar 2006 16:37:26 +0000 (16:37 +0000)] 
- use templates for signin form, error messages
- use FormBuilder for edit page forms (also use template)
- print debug to stderr in cgi mode to avoid breaking http headers
- fix links to page in parentlinks if $url is unset
- reorganise how wikilink is used in templates
- only make recentchanes link if svn is enabled
- change session id cookie to something we control
- add support for logging committer name for web commits from signed in
  users (untested)
- probably more changes I forgot