Commit Graph

15797 Commits (3f28f5ceb77586891078343ebd743c472e374cc8)

Author SHA1 Message Date
www-data febe494a96 web commit by joey 2006-03-19 21:52:44 +00:00
joey f0d7a5ee1a basewiki integration 2006-03-19 21:51:39 +00:00
www-data 470c46c794 web commit by joey 2006-03-19 21:49:20 +00:00
joey e04018ebc1 added basewiki 2006-03-19 21:44:15 +00:00
joey 317c0275d8 mispaste 2006-03-19 21:42:36 +00:00
joey 1d82816082 link to helponformatting from the edit page 2006-03-19 21:31:11 +00:00
www-data c47d165a33 web commit by joey 2006-03-19 21:30:21 +00:00
joey f24b47d2ea add helponformatting page 2006-03-19 21:25:47 +00:00
www-data 93f8af972b web commit by joey 2006-03-19 20:49:26 +00:00
www-data a4fb4c301f web commit by joey 2006-03-19 20:43:23 +00:00
www-data a53033e3dd web commit by joey 2006-03-19 20:42:12 +00:00
www-data 8db7e3eca9 web commit by joey: conflict and merge is done! 2006-03-19 20:36:50 +00:00
www-data 07504a9c1b web commit by joey 2006-03-19 20:36:05 +00:00
joey 1b4f41de77 non-conficting commit to test merging.. 2006-03-19 20:35:59 +00:00
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