f1b6a78ff7c9627e52122fe5598c2d32cb08e39b Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-more/commit/943015a3a61ef29a3dcc3b8f04db85f3cbfd4353 943015a3a61ef29a3dcc3b8f04db85f3cbfd4353 2008-10-12T19:29:46-07:00 2008-10-12T19:29:46-07:00 Fixes the merb-auth file. Changes were not included in the last commit for an unknown reason 996958055f156498984b35436326b6523053ebcf Daniel Neighman has.sox@gmail.com 53a896b57ce0e64993f5fcc634bbf660c2a01365 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-more/commit/f1b6a78ff7c9627e52122fe5598c2d32cb08e39b f1b6a78ff7c9627e52122fe5598c2d32cb08e39b 2008-10-12T19:23:11-07:00 2008-10-12T19:23:11-07:00 Updates the merb-auth to remove magic and change the protect method to authenticate 3ed7191e9692ef8604edb7b32b5945569131aab4 Daniel Neighman has.sox@gmail.com aac79d478bc681d1f43f4e1a38e26db6e7af3da7 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/53a896b57ce0e64993f5fcc634bbf660c2a01365 53a896b57ce0e64993f5fcc634bbf660c2a01365 2008-10-12T12:58:09-07:00 2008-10-12T12:58:09-07:00 Remove --testing-framework and --orm options from Stack generator since DM and RSpec are both assumed by this package. 2851e17c66c0bece279b5f0486e29dd7afd0c87c Michael S. Klishin michael@novemberain.com c0b9b0613298b6be67a757df1a1074f99ea4c251 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/aac79d478bc681d1f43f4e1a38e26db6e7af3da7 aac79d478bc681d1f43f4e1a38e26db6e7af3da7 2008-10-12T12:46:57-07:00 2008-10-12T12:46:57-07:00 Depend on most recent Templater with one more bug fix (closes #545). be877abe12c67d705223d74b75f5436bdfb21e4a Michael S. Klishin michael@novemberain.com 4e5f92dd68f3ea5854ecca58c6c21e112eb830db Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/c0b9b0613298b6be67a757df1a1074f99ea4c251 c0b9b0613298b6be67a757df1a1074f99ea4c251 2008-10-12T11:01:27-07:00 2008-10-12T11:00:49-07:00 Add javascripts/application.js assumed by merb-assets to generated application. 68bcf5ed8ca443ec29e73b72d9db241fd1723e48 Michael S. Klishin michael@novemberain.com 036cba7359041053fb00d9a6750de56f6b16cd03 736679eaba1f713a4a9fa9a31beb727fd375d1f2 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/4e5f92dd68f3ea5854ecca58c6c21e112eb830db 4e5f92dd68f3ea5854ecca58c6c21e112eb830db 2008-10-12T10:28:48-07:00 2008-10-12T10:28:48-07:00 Merge branch 'sprint' of git@github.com:wycats/merb-more into sprint 8d3227333b4e8a8a4d4e9d7be8edacec2b6a09fc Fabien Franzen info@atelierfabien.be 7b7e1ec954aa45738a0b8f4fbefefa83505642c0 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/036cba7359041053fb00d9a6750de56f6b16cd03 036cba7359041053fb00d9a6750de56f6b16cd03 2008-10-12T10:28:06-07:00 2008-10-12T10:28:06-07:00 Added merb-slices to merb-auth-slice-password requires eac4321d4c216b50f8ad5da9d31b48de858673dd Fabien Franzen info@atelierfabien.be 7b7e1ec954aa45738a0b8f4fbefefa83505642c0 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/736679eaba1f713a4a9fa9a31beb727fd375d1f2 736679eaba1f713a4a9fa9a31beb727fd375d1f2 2008-10-12T10:26:19-07:00 2008-10-12T10:26:19-07:00 add jquery + removed controller specs and added a placeholder for request specs f5dfbd33bca7b75adf4e1f682434e9087a45a3dd Matt Aimonetti mattaimonetti@gmail.com d549e3ad67c4a1bc2e4e0073096a793a90a7c4c0 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/7b7e1ec954aa45738a0b8f4fbefefa83505642c0 7b7e1ec954aa45738a0b8f4fbefefa83505642c0 2008-10-12T00:00:08-07:00 2008-10-12T00:00:08-07:00 removed dm-sweatshop dep since it's only needed in the testing env b7c65a0845be500fa86cac048f80ccff05573b40 Matt Aimonetti mattaimonetti@gmail.com d0e1c6aa98e4a94ad214bdfbb56a73bb6b412f5e Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/d549e3ad67c4a1bc2e4e0073096a793a90a7c4c0 d549e3ad67c4a1bc2e4e0073096a793a90a7c4c0 2008-10-11T16:55:01-07:00 2008-10-11T16:55:01-07:00 use the router awesomeness instead of the old routing generation c1720ec189f063d3759fcdefad79e7636e9dcdac Matt Aimonetti mattaimonetti@gmail.com b794b267d1fb96f38cde3c80a829a3acc0f5693f Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/d0e1c6aa98e4a94ad214bdfbb56a73bb6b412f5e d0e1c6aa98e4a94ad214bdfbb56a73bb6b412f5e 2008-10-11T07:51:34-07:00 2008-10-11T07:51:34-07:00 Removed obsolete install_package from -auth/Rakefile be74d19c20b7a0f453696f3ee33de836a7b16caa Fabien Franzen info@atelierfabien.be 853419a0d9206e3ccbd5b2a7cca13c8c63b86873 969c57806b9df30dc80beb64d0416b45fd54619e Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/b794b267d1fb96f38cde3c80a829a3acc0f5693f b794b267d1fb96f38cde3c80a829a3acc0f5693f 2008-10-11T06:07:54-07:00 2008-10-11T06:07:54-07:00 Merge branch 'sprint' of git@github.com:wycats/merb-more into sprint 7d5cb006c02bb352aa9d5cc0b6417f678f9c51fb Fabien Franzen info@atelierfabien.be 69c1b0dffee7d18750051a1d4d9f9deddc5eceb7 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/853419a0d9206e3ccbd5b2a7cca13c8c63b86873 853419a0d9206e3ccbd5b2a7cca13c8c63b86873 2008-10-11T06:07:38-07:00 2008-10-11T06:07:38-07:00 Added the default generated merb-auth.rb 599299be5fba866fab2e3dd4b3a4f0532ea9705d Fabien Franzen info@atelierfabien.be ad3403fa6305ffcb924ff3ad14d402944546c8ae Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/969c57806b9df30dc80beb64d0416b45fd54619e 969c57806b9df30dc80beb64d0416b45fd54619e 2008-10-10T23:58:51-07:00 2008-10-10T23:58:51-07:00 removed useless generated views since we are all in agreement that this is bad form and won't help people 7d5cb006c02bb352aa9d5cc0b6417f678f9c51fb Matt Aimonetti mattaimonetti@gmail.com 588ad8748a1bc9151fadc25da6057d74a76a60ba Lori Holden lholden@yellowpages.com http://github.com/wycats/merb-more/commit/ad3403fa6305ffcb924ff3ad14d402944546c8ae ad3403fa6305ffcb924ff3ad14d402944546c8ae 2008-10-10T23:47:45-07:00 2008-10-10T13:03:19-07:00 Small fix to allow using Sequel. ceee4de33110fbf64e5c8572fa2ecea650cf30d2 Matt Aimonetti mattaimonetti@gmail.com 2323ba29ef931a0ec43fe1ec789baff09d89b348 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-more/commit/588ad8748a1bc9151fadc25da6057d74a76a60ba 588ad8748a1bc9151fadc25da6057d74a76a60ba 2008-10-10T22:45:45-07:00 2008-10-10T22:44:30-07:00 Finishes adding protect to merb-auth for protection on the router. 988eb4d2c8ec311b4086ff702d788a511e70086d Daniel Neighman has.sox@gmail.com 19f864a303dff03411703c4a3f30955e693f010d Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/2323ba29ef931a0ec43fe1ec789baff09d89b348 2323ba29ef931a0ec43fe1ec789baff09d89b348 2008-10-10T19:51:39-07:00 2008-10-10T19:51:39-07:00 fixed layout of generated DM models dd3117f68a0294217d2aaf3e427d00a3fd4b48fa Matt Aimonetti mattaimonetti@gmail.com 5de77f36176e46fac88683b6edb2ad5f8649f9fd Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/19f864a303dff03411703c4a3f30955e693f010d 19f864a303dff03411703c4a3f30955e693f010d 2008-10-10T19:25:37-07:00 2008-10-10T19:25:37-07:00 added merb gem dependencies, and updated the generated default DM model 17e6752a4e74bc944c03f85f640c776b21d856df Matt Aimonetti mattaimonetti@gmail.com 834e18d6a59c930b31987c999b501ed6e96c6d1c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/5de77f36176e46fac88683b6edb2ad5f8649f9fd 5de77f36176e46fac88683b6edb2ad5f8649f9fd 2008-10-10T18:52:24-07:00 2008-10-10T18:52:24-07:00 Depend on most recent Haml with bugfixes. 1e03db357c9ac07f88cade9b0ea15ae469c5d6cc Michael S. Klishin michael@novemberain.com 8faac50fc2ca006680c4e0429162df656c8b52ca Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/834e18d6a59c930b31987c999b501ed6e96c6d1c 834e18d6a59c930b31987c999b501ed6e96c6d1c 2008-10-10T18:52:02-07:00 2008-10-10T18:52:02-07:00 Where are my generators, dude\? 21c779e6e69fe910c26c36e5b31685d08a19c826 Michael S. Klishin michael@novemberain.com 586b7d8128ffd49a884d1bdf523d505def3beeaf Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/8faac50fc2ca006680c4e0429162df656c8b52ca 8faac50fc2ca006680c4e0429162df656c8b52ca 2008-10-10T18:43:22-07:00 2008-10-10T18:43:22-07:00 Ditto. 39bd4a6d54156d1d72322f5a0edcae59535590e5 Michael S. Klishin michael@novemberain.com 4c2b8fd613d7bba471d481005812c793c54ddc23 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/586b7d8128ffd49a884d1bdf523d505def3beeaf 586b7d8128ffd49a884d1bdf523d505def3beeaf 2008-10-10T18:43:06-07:00 2008-10-10T18:43:06-07:00 Do not process file that should be just copied with Erb. 4c172ee402205d2f364e70ef0d5f561a026b2ae4 Michael S. Klishin michael@novemberain.com a58f35e333276994535b9d2cd9ba319fc2fef32b Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/4c2b8fd613d7bba471d481005812c793c54ddc23 4c2b8fd613d7bba471d481005812c793c54ddc23 2008-10-10T18:39:38-07:00 2008-10-10T18:39:38-07:00 Fixes public/dotaccess issue, improves generator performance a bit. a2aa785aeb9a5c27dfe0c33da93d327963a1cb80 Michael S. Klishin michael@novemberain.com c4c120e0fa828f87d682bcec8b2d46361f6afa11 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/a58f35e333276994535b9d2cd9ba319fc2fef32b a58f35e333276994535b9d2cd9ba319fc2fef32b 2008-10-10T18:31:33-07:00 2008-10-10T18:30:05-07:00 Removed extra dependency (Templater) from Merb DM plugin gemspec. 27c9d84ed13f627e408b5d73e7b695b66b300309 Michael S. Klishin michael@novemberain.com 55d9a31b126de8a55d7dfb17ac744651eb615268 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/c4c120e0fa828f87d682bcec8b2d46361f6afa11 c4c120e0fa828f87d682bcec8b2d46361f6afa11 2008-10-10T18:16:16-07:00 2008-10-10T18:15:41-07:00 Make merb_datamapper generators discoverable again. 1c75a7b9b806a37b9d6ff186205b79626b42182e Michael S. Klishin michael@novemberain.com 84527c9b4a2f3173f22d3629327a4217d8adff23 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/55d9a31b126de8a55d7dfb17ac744651eb615268 55d9a31b126de8a55d7dfb17ac744651eb615268 2008-10-10T17:31:43-07:00 2008-10-10T17:31:43-07:00 added message commented out so people using stack can easily figure out how to get the messages from merb-auth 12bf97c71d0cf140fbe4efc02ed4bff058eed838 Matt Aimonetti mattaimonetti@gmail.com 7f76bfe088a2e2ad3710d06a42a8a943876edd61 be2e39cbaeceac4b957b4872108be8f3e5bc31ca Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/84527c9b4a2f3173f22d3629327a4217d8adff23 84527c9b4a2f3173f22d3629327a4217d8adff23 2008-10-10T16:57:50-07:00 2008-10-10T16:57:50-07:00 Merge commit 'monki/master' into sprint 24a322ed7bc058eb3b8621060930bdb538ab7c96 Yehuda Katz wycats@gmail.com e46ba28234725eeda1363dc4a58a271d88bd619d Wesley Beary monki@geemus.com http://github.com/wycats/merb-more/commit/be2e39cbaeceac4b957b4872108be8f3e5bc31ca be2e39cbaeceac4b957b4872108be8f3e5bc31ca 2008-10-10T16:43:28-07:00 2008-10-10T16:43:28-07:00 update rakefile for content and consistancy 84b224f2435fb5c41cde785c24947de370b55fca Wesley Beary monki@geemus.com 6e9847e882a4e1d512aafd2a1ceda1d9a9d157c1 Wesley Beary monki@geemus.com http://github.com/wycats/merb-more/commit/e46ba28234725eeda1363dc4a58a271d88bd619d e46ba28234725eeda1363dc4a58a271d88bd619d 2008-10-10T16:43:07-07:00 2008-10-10T16:43:07-07:00 update docs db2188c3d169d4275851f0315d6dc05833fc7e0b Wesley Beary monki@geemus.com ab67c95d261841b2ea4c60e89191e3ce8043e2f6 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/7f76bfe088a2e2ad3710d06a42a8a943876edd61 7f76bfe088a2e2ad3710d06a42a8a943876edd61 2008-10-10T16:33:58-07:00 2008-10-10T16:33:58-07:00 Always require discovered generators. efc25c00e19cc26b99e546cd8a0a3aa29ceb8306 Michael S. Klishin michael@novemberain.com