f83dd157f809831b431dc6560c7e594e5f357a8d Steve Cook snarkout+hub@gmail.com http://github.com/sixapart/movable-type-booter/commit/f50a0185b681677f5a199fe4b38ccf969bffba09 f50a0185b681677f5a199fe4b38ccf969bffba09 2009-07-17T19:27:17-07:00 2009-07-17T19:27:17-07:00 Fixing botched merge 149550e0845f94b8449e6244917a7d87558d43eb Steve Cook snarkout+hub@gmail.com b24d0d7cd32eb0a9dfb9143f8c838c1fde30a1b3 3518098a024748c28538371d93a8d7cc4691fb05 Steve Cook snarkout+hub@gmail.com http://github.com/sixapart/movable-type-booter/commit/f83dd157f809831b431dc6560c7e594e5f357a8d f83dd157f809831b431dc6560c7e594e5f357a8d 2009-04-18T12:11:32-07:00 2009-04-18T12:11:32-07:00 Merge branch 'jaybooter/master' Conflicts: plugins/MTBooter/MTBooter.pl plugins/MTBooter/lib/MTBooter/Data.pm plugins/MTBooter/lib/MTBooter/Data/Random.pm plugins/MTBooter/tmpl/booter.tmpl plugins/MTBooter/tmpl/booter_create_blogs.tmpl Resolving confilicts in favor of Jay's whitespace cleanup 482b87f533744d8d698a3dcb03253d2f59c42e89 Steve Cook snarkout+hub@gmail.com 9baacc6c04a1b4ea1713498412e678f103e52b58 c82a22ee38599b7675ad7348845c75ea7a21a10d Steve Cook snarkout+hub@gmail.com http://github.com/sixapart/movable-type-booter/commit/3518098a024748c28538371d93a8d7cc4691fb05 3518098a024748c28538371d93a8d7cc4691fb05 2009-04-18T12:06:47-07:00 2009-04-18T12:06:47-07:00 Merge branch 'master' of git://github.com/jayallen/movable-type-booter into jaybooter/master Conflicts: extlib/Acme/Wabby.pm plugins/MTBooter/MTBooter.pl plugins/MTBooter/lib/MTBooter/App/CMS.pm plugins/MTBooter/lib/MTBooter/Data.pm plugins/MTBooter/lib/MTBooter/Data/Random.pm plugins/MTBooter/tmpl/booter.tmpl plugins/MTBooter/tmpl/booter_config.tmpl plugins/MTBooter/tmpl/booter_config_mt3.tmpl plugins/MTBooter/tmpl/booter_confirm.tmpl plugins/MTBooter/tmpl/booter_create_blogs.tmpl plugins/MTBooter/tmpl/create_demo_confirm.tmpl plugins/MTBooter/tmpl/list_module_caches.tmpl plugins/MTBooter/tmpl/list_template_mappings.tmpl plugins/MTBooter/tools/mtbooter-command.pl 14ef72ad6b0f7f488235b5dfe8c4512ee23dfe34 Steve Cook snarkout+hub@gmail.com 9baacc6c04a1b4ea1713498412e678f103e52b58 Steve Cook snarkout+hub@gmail.com http://github.com/sixapart/movable-type-booter/commit/b24d0d7cd32eb0a9dfb9143f8c838c1fde30a1b3 b24d0d7cd32eb0a9dfb9143f8c838c1fde30a1b3 2009-04-18T11:52:51-07:00 2009-04-18T11:52:51-07:00 Merging in Jay Allen's whitespace cleanup a3f9a54cc913a4fd25f4272d23c9c9b490c77420 Steve Cook snarkout+hub@gmail.com 747d0028a0dbc2f051119ff00ef8c01ba5d1a8ae Jay Allen jay@endevver.com http://github.com/sixapart/movable-type-booter/commit/c82a22ee38599b7675ad7348845c75ea7a21a10d c82a22ee38599b7675ad7348845c75ea7a21a10d 2009-04-13T19:23:55-07:00 2009-04-13T19:23:55-07:00 Missed conversion of Windows line endings (to Unix) in last checkin f2bee802f550f67e6d7371e94a2121b520b93f95 Jay Allen jay@endevver.com 7fb476a1e50c9cba9359c803c76ed966aa83a691 Jay Allen jay@endevver.com http://github.com/sixapart/movable-type-booter/commit/747d0028a0dbc2f051119ff00ef8c01ba5d1a8ae 747d0028a0dbc2f051119ff00ef8c01ba5d1a8ae 2009-04-13T19:09:56-07:00 2009-04-13T19:09:56-07:00 Massive whitespace cleanup (see commit for details): * Converted all tabs to spaces * Change from Windows line-endings to Unix line-endings * Stripped trailing whitespace from all lines c2aec983502e378959be63a68ead1b3ffedd9106 Jay Allen jay@endevver.com e6cdb6fa105e54102d7bba1d30dd7328a33e02d0 enzo enzo@testvm.org http://github.com/sixapart/movable-type-booter/commit/7fb476a1e50c9cba9359c803c76ed966aa83a691 7fb476a1e50c9cba9359c803c76ed966aa83a691 2009-04-07T18:21:28-07:00 2009-04-07T18:21:28-07:00 create_user_set: If user already exists then dont create but still associate them with the blog a13e8fa40ad45d443b0abc90b288fbfcdb51bebd enzo enzo@testvm.org fc1bc8a2c88ee4179027703a98e346e37970e341 enzo enzo@testvm.org http://github.com/sixapart/movable-type-booter/commit/e6cdb6fa105e54102d7bba1d30dd7328a33e02d0 e6cdb6fa105e54102d7bba1d30dd7328a33e02d0 2009-04-06T16:04:56-07:00 2009-04-06T16:04:56-07:00 Added option to specify user number and type when creating a user set for a blog 1c0711bf6b270822e326658da11b91b274407c99 enzo enzo@testvm.org Steve Cook snarkout+hub@gmail.com http://github.com/sixapart/movable-type-booter/commit/fc1bc8a2c88ee4179027703a98e346e37970e341 fc1bc8a2c88ee4179027703a98e346e37970e341 2009-04-03T16:44:08-07:00 2009-04-03T16:44:08-07:00 Initial import from code.sixapart.com afb8bf2958cffabf572acb1aed70f9561e94c93f Steve Cook snarkout+hub@gmail.com Steve Cook snarkout+hub@gmail.com http://github.com/sixapart/movable-type-booter/commit/9baacc6c04a1b4ea1713498412e678f103e52b58 9baacc6c04a1b4ea1713498412e678f103e52b58 2009-04-03T15:41:22-07:00 2009-04-03T15:41:22-07:00 Importing to github from code.sixapart.com afb8bf2958cffabf572acb1aed70f9561e94c93f Steve Cook snarkout+hub@gmail.com