a4a64804e50e4226caae85b9bb7952b53cc98165 Sean Braithwaite brapse@kui-box.local http://github.com/hornbeck/blerb-core/commit/cfbe86545f97d2a058abf3fe7b63bfb22a5c9c3d cfbe86545f97d2a058abf3fe7b63bfb22a5c9c3d

2008-03-24T14:14:32-07:00

Adjusted spec to reflect changes in merb-core - changed rakefile/spec loading mechanism - fixed requiring of merb-core test harness - spec should be running f78b19b6fb2d42b6e0fdeb4fbf579c6cee38d2e9 Sean Braithwaite brapse@kui-box.local e99089e40a93cc1f7612d607515c38481bafd339 Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/a4a64804e50e4226caae85b9bb7952b53cc98165 a4a64804e50e4226caae85b9bb7952b53cc98165

2008-03-04T17:33:10-08:00

minor tweaks for 0.9.1 1aefddaed1ed8808f765c9d7a6493c26edefdfbd Ben Burkert ben@benburkert.com 7bb2cd76e8f68ef8c9f37141a84c8d56462eb2bf Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/e99089e40a93cc1f7612d607515c38481bafd339 e99089e40a93cc1f7612d607515c38481bafd339

2008-02-26T21:39:09-08:00

fixed settings controller stuff 5f81a4320e00c4b87fb592334b3302ee1c2dccf0 Ben Burkert ben@benburkert.com 306733f232f6060717c6abd57e33c806ece489e5 e65004234c79e418b553e381c053c6e24d95b421 Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/7bb2cd76e8f68ef8c9f37141a84c8d56462eb2bf 7bb2cd76e8f68ef8c9f37141a84c8d56462eb2bf

2008-02-26T21:25:27-08:00

merging with route_specs 0734b7ad0c406011f858d1ac711a13e650a7104f Ben Burkert ben@benburkert.com 26574cd69b18c68e7a7ccdce8378771636e8c3c3 Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/e65004234c79e418b553e381c053c6e24d95b421 e65004234c79e418b553e381c053c6e24d95b421

2008-02-26T19:51:58-08:00

updated route specs and the user resource 3c969b89f4dc257941544bfe81edbcb0452300c0 Ben Burkert ben@benburkert.com ea680d5e4137f5470a633f02ca8b8913b51e3788 Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/26574cd69b18c68e7a7ccdce8378771636e8c3c3 26574cd69b18c68e7a7ccdce8378771636e8c3c3

2008-02-24T20:06:23-08:00

fixed bad route in the admin layout. 6ba190db7a5b6bd1a4705e2221262b9042aa39cc Ben Burkert ben@benburkert.com 7fae3eaa7564a108f9ac6262bceb331ad56ab9be Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/306733f232f6060717c6abd57e33c806ece489e5 306733f232f6060717c6abd57e33c806ece489e5

2008-02-24T13:01:25-08:00

all specs are passing. Updated the spec_helper, added temporary fix to init.rb e065c761b06554b058cc519371d9a29b020e7335 Ben Burkert ben@benburkert.com 59c9e2de0d2dff3a4a132f32a4531ce2c779eba7 Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/ea680d5e4137f5470a633f02ca8b8913b51e3788 ea680d5e4137f5470a633f02ca8b8913b51e3788

2008-02-24T12:51:19-08:00

Updated routes to use namespaces correctly, added a temporary fix to init.rb 8c0730ba5b37cd5e53ee9247a1f28628a8bd87f0 Ben Burkert ben@benburkert.com 9c1cfd8e1099909fc0ca963f3ffcc569d53eefb8 brapse brapse@toa-box.(none) http://github.com/hornbeck/blerb-core/commit/7fae3eaa7564a108f9ac6262bceb331ad56ab9be 7fae3eaa7564a108f9ac6262bceb331ad56ab9be

2008-02-23T21:54:20-08:00

2008-02-23T20:58:48-08:00

Gave mailer some love Fixed small template error in the layouts that broke the mailer Fixed small discrepency in the spec Mailer (and all for that matter) specs should now be passing or pending e23b5de521932b1caa6db63d5ae3b22f01f228c9 Ben Burkert ben@benburkert.com c509db02ff038073c65b798c0905416577d8d2ce Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/9c1cfd8e1099909fc0ca963f3ffcc569d53eefb8 9c1cfd8e1099909fc0ca963f3ffcc569d53eefb8

2008-02-23T21:47:54-08:00

ignoring .DS_Store d2168020da49b0346886cf6c60f4a3b7d63027ca Ben Burkert ben@benburkert.com 0de64156f0af73aabd4e8650a7df9005e4659d2e Gavin-John Noonan adulteratedjedi@Memma.local http://github.com/hornbeck/blerb-core/commit/c509db02ff038073c65b798c0905416577d8d2ce c509db02ff038073c65b798c0905416577d8d2ce

2008-02-23T13:32:43-08:00

Fixed a typo in the README d81adaf023e2e22ae815d88b01bf4a719371c206 Gavin-John Noonan adulteratedjedi@Memma.local 23ff2003e952e2dac1d60c1cc43211524b7aef92 Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/0de64156f0af73aabd4e8650a7df9005e4659d2e 0de64156f0af73aabd4e8650a7df9005e4659d2e

2008-02-23T12:54:33-08:00

added script/install_merb, updated Rakefile and README f6628974f52a76960c02dc3e14f404e1fb54f737 Ben Burkert ben@benburkert.com 753adbb68e81eaaeeb070f2948671193295e23af Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/59c9e2de0d2dff3a4a132f32a4531ce2c779eba7 59c9e2de0d2dff3a4a132f32a4531ce2c779eba7

2008-02-22T12:45:48-08:00

updated controllers and views for the new routes went through and changed from the old style routes to the new ones. 5ad08960793d7bab358c1196267d80882fa0ab5f Ben Burkert ben@benburkert.com ca57648454253f81e0f5a02a6219fcad62ffd55e Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/753adbb68e81eaaeeb070f2948671193295e23af 753adbb68e81eaaeeb070f2948671193295e23af

2008-02-22T12:37:57-08:00

Added the route specs Added specs for the routes in the spec/routes directory. cf9c7b299d876064449d483443f6070879cce7cb Ben Burkert ben@benburkert.com 08819d2fae2fa2460d4e096bcb43c333ccac1fb6 Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/ca57648454253f81e0f5a02a6219fcad62ffd55e ca57648454253f81e0f5a02a6219fcad62ffd55e

2008-02-22T12:33:44-08:00

router redo reorganized the routes. updated the views/specs to work with the new routes. b498a5b6dacddb41fd4873266b6449d6145c3d4b Ben Burkert ben@benburkert.com 26c76551919f8545c9b15b0c6a6d99ad62f8c346 Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/08819d2fae2fa2460d4e096bcb43c333ccac1fb6 08819d2fae2fa2460d4e096bcb43c333ccac1fb6

2008-02-22T12:25:28-08:00

added controller specific spec helper Updated the controller specs to use a helper for controller specs. Also updated the global spec helper with the new route matchers. a392b5b82d4d5b96600406cc3c114e322354598d Ben Burkert ben@benburkert.com 23ff2003e952e2dac1d60c1cc43211524b7aef92 Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/26c76551919f8545c9b15b0c6a6d99ad62f8c346 26c76551919f8545c9b15b0c6a6d99ad62f8c346

2008-02-22T12:16:08-08:00

removed mailer specs these will be regenerated later and fixed. 1062c309957d93747d5cdb68f7cc065b8c75153c Ben Burkert ben@benburkert.com beb98926ac5cef000eabc8bf3707ad13c5bf4589 William Smith BrianTheCoder http://github.com/hornbeck/blerb-core/commit/23ff2003e952e2dac1d60c1cc43211524b7aef92 23ff2003e952e2dac1d60c1cc43211524b7aef92

2008-02-22T09:26:19-08:00

readme fix dd3a2280b4380c48edda52b0315911bcee73e8c9 William Smith BrianTheCoder ea4266a8387906d0d973b91c8a1ac0969a25afeb 2439ddf33fc1f894fa080934ce25359e3271fcba William Smith BrianTheCoder http://github.com/hornbeck/blerb-core/commit/beb98926ac5cef000eabc8bf3707ad13c5bf4589 beb98926ac5cef000eabc8bf3707ad13c5bf4589

2008-02-22T09:25:36-08:00

minor fixes d74bb8ea9ccf709e52956ae19337324df177e547 William Smith BrianTheCoder 5963e9fdd525cb9053c6014413be287abe6e9bec William Smith BrianTheCoder http://github.com/hornbeck/blerb-core/commit/ea4266a8387906d0d973b91c8a1ac0969a25afeb ea4266a8387906d0d973b91c8a1ac0969a25afeb

2008-02-22T09:22:23-08:00

minor fixes d74bb8ea9ccf709e52956ae19337324df177e547 William Smith BrianTheCoder 5963e9fdd525cb9053c6014413be287abe6e9bec John Hornbeck hornbeck@gmail.com http://github.com/hornbeck/blerb-core/commit/2439ddf33fc1f894fa080934ce25359e3271fcba 2439ddf33fc1f894fa080934ce25359e3271fcba

2008-02-22T09:13:53-08:00

fixing the Rakefile bbcb9f1338420210fa52fdf7eeca007638556a84 John Hornbeck hornbeck@gmail.com 3a40871067a78adcbaee319bf796025d86d28b8b Josh Nichols josh@technicalpickles.com http://github.com/hornbeck/blerb-core/commit/5963e9fdd525cb9053c6014413be287abe6e9bec 5963e9fdd525cb9053c6014413be287abe6e9bec

2008-02-21T16:09:53-08:00

Added a few rdoc comments about Setting. 6bfecd4eca0fcb0d5636061a2202ebcc3654cf35 Josh Nichols josh@technicalpickles.com 35e3ec58298504e8206d25831b7eba11a0493f07 Josh Nichols josh@technicalpickles.com http://github.com/hornbeck/blerb-core/commit/3a40871067a78adcbaee319bf796025d86d28b8b 3a40871067a78adcbaee319bf796025d86d28b8b

2008-02-21T16:05:12-08:00

Fixed save to not use hard coded path. d95c64c270c42614f600565c14a755222081276c Josh Nichols josh@technicalpickles.com 05127587442e5f988e4bf9ca73c122b4f0d11736 Josh Nichols josh@technicalpickles.com http://github.com/hornbeck/blerb-core/commit/35e3ec58298504e8206d25831b7eba11a0493f07 35e3ec58298504e8206d25831b7eba11a0493f07

2008-02-21T16:02:26-08:00

Renamed Setting#load to Setting#instance. Renamed config/settings.sample.yml to config/settings.default.yml. If config/settings.yml doesn't exist, config/settings.default.yml will be used. 0d2542ef0f8e935c293d6fb2c8cfcda3394fce7f Josh Nichols josh@technicalpickles.com 03593ab0cc538b9bf19c014752ac3e1cad61f5dd Josh Nichols josh@technicalpickles.com http://github.com/hornbeck/blerb-core/commit/05127587442e5f988e4bf9ca73c122b4f0d11736 05127587442e5f988e4bf9ca73c122b4f0d11736

2008-02-20T14:37:02-08:00

Reformated master.css. Added style for links. 26ecce17fd463466d41a8d96d3b6f58e975691e7 Josh Nichols josh@technicalpickles.com 5ab434c2fe245621673ecd805ab9439bc114c82a Josh Nichols josh@technicalpickles.com http://github.com/hornbeck/blerb-core/commit/03593ab0cc538b9bf19c014752ac3e1cad61f5dd 03593ab0cc538b9bf19c014752ac3e1cad61f5dd

2008-02-19T21:56:52-08:00

Fixed javascript include of jquery. 11910f1ec282ad5013fa1edae040dac30a613607 Josh Nichols josh@technicalpickles.com a5272828f943448866647e170fda994cb38c8362 Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/5ab434c2fe245621673ecd805ab9439bc114c82a 5ab434c2fe245621673ecd805ab9439bc114c82a

2008-02-19T21:46:21-08:00

updated the Rakefile to use Merb.load_dependencies and fixed the session and user specs. 7f9c7e4c6bb7089c139d6335f3c336da21efbc0a Ben Burkert ben@benburkert.com 158e636ba85a7f5cb7e64ca110c9984895c52436 Tim Connor timocratic@gmail.com http://github.com/hornbeck/blerb-core/commit/a5272828f943448866647e170fda994cb38c8362 a5272828f943448866647e170fda994cb38c8362

2008-02-18T17:32:08-08:00

Some more README tweaks automigrate is fixed in HEAD of merb_datamapper, so took out aside on that database.yml.sample got added to repo, so changed instructions to match 6b3602d13b3917d9a49a8100d1227cff625c7e35 Tim Connor timocratic@gmail.com 7de2f1e1502801d4dffbb1b4e83c60f804965522 Tim Connor timocratic@gmail.com http://github.com/hornbeck/blerb-core/commit/158e636ba85a7f5cb7e64ca110c9984895c52436 158e636ba85a7f5cb7e64ca110c9984895c52436

2008-02-17T18:00:16-08:00

adding reference to DataObject driver dependency ffb826106ef260b2fa4314ad605e1cece2978206 Tim Connor timocratic@gmail.com 2e9a84a4c24b904a64408ed3a246d8083a4934c8 Tim Connor timocratic@gmail.com http://github.com/hornbeck/blerb-core/commit/7de2f1e1502801d4dffbb1b4e83c60f804965522 7de2f1e1502801d4dffbb1b4e83c60f804965522

2008-02-17T17:46:12-08:00

adding merb-mailer to the setup directions 1d66c01eb5d0f69536668535dc868e447f13eb74 Tim Connor timocratic@gmail.com