Commit Graph

435 Commits (6b9082c643f4a90625c7bcaa1439846f64ad15ce)

Author SHA1 Message Date
joey 325d5c791f added adminuser settings, globlist support, and used this to implement page
locking
2006-03-23 01:40:46 +00:00
www-data 33b7f3444c web commit by joey 2006-03-22 19:04:41 +00:00
joey 5fe80a6371 prefs page implemented 2006-03-21 02:38:17 +00:00
joey b7d3a12c5c note that format of historyurl changed too.. 2006-03-21 01:27:05 +00:00
www-data 8ca32b69a6 web commit by joey 2006-03-21 01:21:58 +00:00
www-data c9594a0921 web commit by joey 2006-03-21 01:20:09 +00:00
joey 773731743d add --diffurl, if set RecentChanges has links to svn diffs 2006-03-21 01:18:01 +00:00
joey b7c86dda2f added last changed timestamp for pages 2006-03-20 19:56:37 +00:00
www-data 3a6d0d3a77 web commit by joey 2006-03-20 18:27:13 +00:00
joey 0751429ba0 add 2006-03-20 08:04:39 +00:00
joey 1dac1cfc01 fix subpage creation 2006-03-20 05:51:22 +00:00
joey 5cc3d4e4a3 add 2006-03-20 05:11:41 +00:00
joey ba335c94c7 fix setup file error
improve svn log regexp to deal with file copies/moves
2006-03-20 05:09:30 +00:00
joey d1cef7a6ab ugh, use subpages for discussion as a special case 2006-03-19 23:56:50 +00:00
joey 5604901eac switch default new page location to not be a subpage 2006-03-19 22:57:24 +00:00
joey 2f190b3aeb don't lock before setup 2006-03-19 22:51:07 +00:00
www-data ae0475367c web commit by joey 2006-03-19 22:01:43 +00:00
www-data cc5248c5f6 web commit by joey 2006-03-19 22:00:58 +00:00
www-data 1d8e719e6a web commit by joey 2006-03-19 22:00:23 +00:00
www-data f6cf982152 web commit by joey 2006-03-19 21:59:09 +00:00
www-data a80f0c6e4f web commit by joey 2006-03-19 21:58:42 +00:00
www-data 3eb389ca61 web commit by joey 2006-03-19 21:56:42 +00:00
joey f0ff1625e0 foo 2006-03-19 21:54:42 +00:00
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