Commit Graph

3898 Commits (dd09470c57053d89f9b14947170e8bb9f5f9b6c6)

Author SHA1 Message Date
joey 6b6fd778c7 conflict detection, merging, etc should be done now, I think 2006-03-19 20:34:59 +00:00
www-data 4d50e71d31 web commit by joey: conflict test 2006-03-19 20:34:10 +00:00
www-data 72f0753c30 web commit by joey: conflict test 2006-03-19 20:17:20 +00:00
www-data 6d098608e6 web commit by joey: conflict test 2006-03-19 20:12:15 +00:00
joey 6dc29ca72a committing changes for conflict test 2006-03-19 20:10:58 +00:00
joey ae66554115 second try at merging and conflicts support 2006-03-19 19:51:11 +00:00
joey 9b769c751a stupid mistakes 2006-03-19 19:29:41 +00:00
www-data 52db4a50f6 web commit by joey 2006-03-19 19:27:59 +00:00
www-data 53146f395c web commit by joey 2006-03-19 19:24:40 +00:00
joey 3c239b14bc first cut at svn merge and conflict 2006-03-19 19:09:57 +00:00
www-data c7e9c36926 web commit by joey 2006-03-18 21:39:58 +00:00
joey 2ab8951296 oops, add unlock _before_ svn commit 2006-03-18 21:36:36 +00:00
www-data 22f3f422af web commit by joey: thoughts on conflict resolution, gobbing, locking 2006-03-18 21:34:01 +00:00
joey 2971c4293a fix 2006-03-17 18:44:14 +00:00
www-data f180afec6c web commit by joey: test commit 2006-03-17 18:43:04 +00:00
joey 7fca2e01f8 unlock wiki during svn commit to prevent deadlock with post-commit hook 2006-03-17 18:34:33 +00:00
www-data 2aa5962115 web commit by BrandenRobinson: Explain why letting users specify regexes is bad. 2006-03-17 16:51:14 +00:00
joey b93e189934 fix update of links to removed pages 2006-03-16 22:25:17 +00:00
www-data 4102ac826d web commit by joey 2006-03-16 22:07:51 +00:00
joey fd2683b8a1 need to use CGI in rcs_recentchanges to get escapeHTML 2006-03-16 22:01:33 +00:00
joey 685475ba8c add a header to page preview section 2006-03-16 21:47:48 +00:00
joey e57ee3aaea preview done 2006-03-16 21:44:16 +00:00
joey 3a31d28970 ok, so we don't want to re-load page content into the form on preview.. 2006-03-16 21:43:30 +00:00
joey 44eefb7f22 dd page preview 2006-03-16 21:39:45 +00:00
joey 7bbfbf82fb optimise svn log a bit 2006-03-16 21:20:33 +00:00
www-data f4d6635512 web commit by joey 2006-03-16 21:11:17 +00:00
www-data c0a2814124 web commit by joey 2006-03-16 21:09:41 +00:00
www-data c868d08aeb web commit by joey 2006-03-16 21:07:32 +00:00
www-data e4da88917e web commit by BrandenRobinson: Add brainstorming about email change notification. 2006-03-16 21:06:46 +00:00
joey d623952512 lock wiki and refuse to traverse symlinks 2006-03-16 21:06:33 +00:00
www-data 18879c0a14 web commit by joey 2006-03-16 21:06:32 +00:00
www-data 3b17a59734 web commit by BrandenRobinson: Fix missing end brackets in wikilink. 2006-03-16 20:59:19 +00:00
www-data 3815b952fa web commit by joey 2006-03-16 20:45:43 +00:00
www-data 0340c45ea1 web commit by joey 2006-03-15 06:10:26 +00:00
joey 5e84e37721 escape html from commit logs 2006-03-15 06:03:03 +00:00
www-data 7f6610f249 web commit by joey 2006-03-15 06:02:57 +00:00
www-data 4c232a06de web commit by joey 2006-03-15 05:56:48 +00:00
www-data ca0a240f31 web commit by joey: wikilink escaping supported now 2006-03-15 05:54:35 +00:00
www-data 2ee121fca4 web commit by joey 2006-03-15 05:53:38 +00:00
joey 5efb84517b improve 2006-03-15 05:49:06 +00:00
joey befdf00f8a fixes 2006-03-15 04:59:39 +00:00
joey a1a7019f27 man page generation 2006-03-15 04:40:32 +00:00
joey 1186094987 debianise 2006-03-15 04:05:53 +00:00
joey 0a52e8fd82 config files now based on perl modules
add MakeMaker foo for module
2006-03-15 03:24:34 +00:00
joey 2d1989983e sometims I hate perl
This fixes the bug that made it not update pages linking to a new page
2006-03-15 02:45:33 +00:00
joey b8af4e74f7 add a special case for discussion pages when determining the links from a
page, since all pages implicitly link to their disussion page
2006-03-14 06:40:58 +00:00
joey b26de7676b fix two bugs in page location in new page creation 2006-03-14 06:19:16 +00:00
joey 7f8efe4524 fix Discussion links to not take the BestLink.
As a bonus we now have meta Disussion/Discussion pages available, etc. Oh
well.. :-)
2006-03-14 06:04:44 +00:00
joey 2885278ebd remove quotes, actualy messed up ikiwiki $(wrapper --params) --foo 2006-03-14 05:51:57 +00:00
joey c768f9a2e9 load/save index when rendering a page in cgi mode for svn-less wikis 2006-03-14 05:37:34 +00:00