e1e4f029508989cafafffc0de49ace3169ff043a AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/160aa83ee44d0055f6464c769601d35a59cfe472 160aa83ee44d0055f6464c769601d35a59cfe472 2008-07-21T03:49:46-07:00 2008-07-21T03:49:46-07:00 Merb-action-arged the MA users controller.. Makin' it perrrty 6d23f284b153e322df9e445e31b1fc615d30ac66 AJ Christensen aj@junglist.gen.nz d06b02b52a66b8a0219a9c9fcf3bb71d1ec18fa9 Scott M. Likens damm@livid.dk http://github.com/mleung/feather/commit/e1e4f029508989cafafffc0de49ace3169ff043a e1e4f029508989cafafffc0de49ace3169ff043a 2008-07-21T03:10:02-07:00 2008-07-21T03:10:02-07:00 Added to the controller def delete, as it was lacking, and you could not delete users with edge. Corrected, you can now delete. e947a2de470b292e9a6b6866a2078c9d712b8201 Scott M. Likens damm@livid.dk 261681fe782c39aa65ec41c33f9ff94e1886bf10 Scott M. Likens damm@livid.dk http://github.com/mleung/feather/commit/d06b02b52a66b8a0219a9c9fcf3bb71d1ec18fa9 d06b02b52a66b8a0219a9c9fcf3bb71d1ec18fa9 2008-07-21T02:13:54-07:00 2008-07-21T02:13:54-07:00 Haml + MA Slice Form. Signed-off-by: Scott M. Likens <damm@livid.dk> ae6786617716b0c9c56937e835db7a1881382bdc Scott M. Likens damm@livid.dk d9fdcdc6d8770b111dbf9df8835d92c89aeec166 AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/261681fe782c39aa65ec41c33f9ff94e1886bf10 261681fe782c39aa65ec41c33f9ff94e1886bf10 2008-07-20T04:43:43-07:00 2008-07-20T04:43:43-07:00 Somehow my render_plugin_views fix was lost in the Ether. From my original commit: Fixed the render_plugin_views helper to correctly render plugin hooks on Merb edge. Unfortunately we have to perform a fairly large assumption here, that is, we have to assume that you'd like to use the Object being passed (with :with =>) inside the partial as the singular, downcased version. e.g., you use <%= render_plugin_views "last_article_in_list", :with => {:last => @articles.last} %>. In your plugin hook partial, you *have* to use the singular downcased representation of the Object(s) you're passing. Articles => article 11:48 < fujin> e.g. the view I'm testing uses 'article.something', because it's expecting an Articles to be passed in /as/ 'article' 11:51 < fujin> very hard assumption to make - I either have to *blanket* say that we'll be passing a singular downcased version of the Object you're passing to :with 11:51 < fujin> or work out something else to do 11:52 < TheWordNerd> Doesn't seem like a bad assumption. 11:53 < fujin> output << partial(template_location, { :with => options[:with], :as => options[:with].class.to_s.downcase.singular }) 680cac669a14d84a0b3e13b0e6f101a5bf313b7b AJ Christensen aj@junglist.gen.nz eafb1861bfdc0f92b07282451731d59c3ba7a11d 658fab8c25a8670708f811533cca6a7076720f08 El Draper el@eldiablo.co.uk http://github.com/mleung/feather/commit/d9fdcdc6d8770b111dbf9df8835d92c89aeec166 d9fdcdc6d8770b111dbf9df8835d92c89aeec166 2008-07-18T14:14:02-07:00 2008-07-18T14:14:02-07:00 fixed conflicts Merge branch 'master' of git://github.com/thewordnerd/feather into thewordnerd/master Conflicts: config/init.rb spec/controllers/admin/articles_spec.rb spec/models/user_spec.rb c0776e53a7068c7173dedb53f3e38cb9734e84de El Draper el@eldiablo.co.uk 38a942e51b5909f781376a4ae9dcce072328b30f El Draper el@eldiablo.co.uk http://github.com/mleung/feather/commit/eafb1861bfdc0f92b07282451731d59c3ba7a11d eafb1861bfdc0f92b07282451731d59c3ba7a11d 2008-07-18T13:08:19-07:00 2008-07-18T13:08:19-07:00 quick typo fix 56166af5ab9c0ff8031a44d7a12b8fbd06507781 El Draper el@eldiablo.co.uk e0f8a5ab5655ec6fac68305704496819dc882e24 Alexander Flatter flatter@alexander-flatters-macbook-pro.local http://github.com/mleung/feather/commit/38a942e51b5909f781376a4ae9dcce072328b30f 38a942e51b5909f781376a4ae9dcce072328b30f 2008-07-18T13:06:29-07:00 2008-06-26T15:24:33-07:00 Some dependencies were added twice; Disable page caching in development mode [#6] 01c6a2fdaf0b217d687dc90484c790b29160cf00 El Draper el@eldiablo.co.uk a2e98b422d0aed46c5af28bbb3de7244f09c5151 Alexander Flatter flatter@alexander-flatters-macbook-pro.local http://github.com/mleung/feather/commit/e0f8a5ab5655ec6fac68305704496819dc882e24 e0f8a5ab5655ec6fac68305704496819dc882e24 2008-07-18T13:06:09-07:00 2008-06-26T11:03:06-07:00 Fix usage of DataMapper::ValidationErrors#add [#16] baf7a1626a5d651d6bfaf2c972011dd1d5aeb96a El Draper el@eldiablo.co.uk 4d00c4bfe62c5800fb8c01ba2323f047b09e1b6b El Draper el@eldiablo.co.uk http://github.com/mleung/feather/commit/a2e98b422d0aed46c5af28bbb3de7244f09c5151 a2e98b422d0aed46c5af28bbb3de7244f09c5151 2008-07-18T13:03:25-07:00 2008-07-18T13:03:25-07:00 removing rack.rb as we have no custom modifications, and so it's un-necessary 604646874236f606d9e55250f1dfd269e34fad2e El Draper el@eldiablo.co.uk 2169ebf4bf96c9a3c715fc37b7a98041ee483223 41be02ea6a26193d5dfee02e71b2b67f0b69edb4 El Draper el@eldiablo.co.uk http://github.com/mleung/feather/commit/4d00c4bfe62c5800fb8c01ba2323f047b09e1b6b 4d00c4bfe62c5800fb8c01ba2323f047b09e1b6b 2008-07-18T12:59:03-07:00 2008-07-18T12:59:03-07:00 Merge branch 'master' of git://github.com/dstrelau/feather into dstrelau/master c237472ecfcc237707150acd035ef84a66942e28 El Draper el@eldiablo.co.uk 75283c3122f0490e32ac5ad93780d6e9f27f7e33 AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/2169ebf4bf96c9a3c715fc37b7a98041ee483223 2169ebf4bf96c9a3c715fc37b7a98041ee483223 2008-07-18T12:55:55-07:00 2008-07-16T19:14:53-07:00 Using .config instead of .full_config, as full_config was occasionally returning a hash of strings instead of a hash of symbols, whereas .config seems to not exhibit this behaviour. 6f133bd6c41545444cb50699747b03ffbed70751 El Draper el@eldiablo.co.uk 2a8771e796a02c864f6e5552b254ad309bcc0e54 AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/75283c3122f0490e32ac5ad93780d6e9f27f7e33 75283c3122f0490e32ac5ad93780d6e9f27f7e33 2008-07-18T12:55:38-07:00 2008-07-08T15:52:58-07:00 Updated dashboard spec to be compatible with dm0.9 0a4e544fe3e33d9e899c07a34c44c8ded1759ff9 El Draper el@eldiablo.co.uk 4cb5174ced58d3801765518821dab78cc8bb8bf9 AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/2a8771e796a02c864f6e5552b254ad309bcc0e54 2a8771e796a02c864f6e5552b254ad309bcc0e54 2008-07-18T12:55:27-07:00 2008-07-08T15:52:30-07:00 Updated articles spec to be compatible with dm0.9 bc92e9c4c65db723c6c1b846fc25e0f68a6bd712 El Draper el@eldiablo.co.uk ddc2ff6934ccac018927ac406a28a1c9408b0621 AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/4cb5174ced58d3801765518821dab78cc8bb8bf9 4cb5174ced58d3801765518821dab78cc8bb8bf9 2008-07-18T12:55:15-07:00 2008-07-08T15:45:30-07:00 Added an autotest rspec initialiser 9c50690335ca5beb19ae2fb5a8f2f8ed98eee98e El Draper el@eldiablo.co.uk 4904834fe0ae86fefa5ddbec97036aec104938e9 AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/ddc2ff6934ccac018927ac406a28a1c9408b0621 ddc2ff6934ccac018927ac406a28a1c9408b0621 2008-07-18T12:54:57-07:00 2008-07-08T15:44:55-07:00 Updated User model specs that were broken a few patches back by me (doh) Updated spec.opts to print coloured specdocs when you rake spec 54d8b5739abf5bdd49c790e8885a7df17037ce7a El Draper el@eldiablo.co.uk 3ecb1bc008c4d7156f2e4dc6e3fe95b8e8726c0d AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/4904834fe0ae86fefa5ddbec97036aec104938e9 4904834fe0ae86fefa5ddbec97036aec104938e9 2008-07-18T12:54:13-07:00 2008-07-08T15:25:11-07:00 Fixed the archive searcher to use repository.adapter.query instead of self.find_by_sql as the behaviour has changed. Also fixed the specific_date_function to no longer load up the config/database.yml 7937a38eb0efb934acbe87196d08a9331501d1c9 El Draper el@eldiablo.co.uk fc84d605255b31906249dab6d3f1c195b96815e3 AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/3ecb1bc008c4d7156f2e4dc6e3fe95b8e8726c0d 3ecb1bc008c4d7156f2e4dc6e3fe95b8e8726c0d 2008-07-18T12:54:01-07:00 2008-07-08T15:25:01-07:00 Reenabled the Archive getter b5e47637f802004850e3d6f102b21d1c3c760542 El Draper el@eldiablo.co.uk 25a0b3710ed0bafdfadd10ec29030f0aa76efc4f AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/fc84d605255b31906249dab6d3f1c195b96815e3 fc84d605255b31906249dab6d3f1c195b96815e3 2008-07-18T12:53:19-07:00 2008-07-03T16:54:29-07:00 Updated the ignore file to ignore my favicon 6b7a84e095c0ec2cbdfa12770a91ae538e9adb9e El Draper el@eldiablo.co.uk 19a470729cf7df52c4e38d7f64f36d8ec0df4c18 Nolan Darilek nolan@thewordnerd.info http://github.com/mleung/feather/commit/658fab8c25a8670708f811533cca6a7076720f08 658fab8c25a8670708f811533cca6a7076720f08 2008-06-29T16:54:41-07:00 2008-06-29T16:54:41-07:00 Ignore any database.yml files in config. f3e6b7ebd52e260585081300cd0f72bcecb23f1d Nolan Darilek nolan@thewordnerd.info 25a0b3710ed0bafdfadd10ec29030f0aa76efc4f 7ab429a1d723c3ad933d2f45d348bf624de57f3c Nolan Darilek nolan@thewordnerd.info http://github.com/mleung/feather/commit/19a470729cf7df52c4e38d7f64f36d8ec0df4c18 19a470729cf7df52c4e38d7f64f36d8ec0df4c18 2008-06-29T16:53:14-07:00 2008-06-29T16:53:14-07:00 Merge branch 'master' of git://github.com/thewordnerd/feather into slices Conflicts: app/controllers/admin/sessions.rb app/controllers/admin/users.rb app/views/admin/users/_user.html.erb config/router.rb lib/authenticated_system/authenticated_dependencies.rb lib/authenticated_system/authenticated_routes.rb lib/authenticated_system/authenticated_system_controller.rb lib/authenticated_system/authenticated_system_model.rb lib/authenticated_system/authenticated_system_orm_map.rb slices/merb-auth/app/views/users/show.html.erb spec/authenticated_system_spec_helper.rb spec/controllers/admin/sessions_spec.rb spec/controllers/admin/users_spec.rb spec/helpers/admin/sessions_helper_spec.rb spec/helpers/admin/users_helper_spec.rb spec/models/user_spec.rb spec/user_spec_helper.rb 736586e422bcc2be3580ea51fba1405a9a290cd9 Nolan Darilek nolan@thewordnerd.info cd979c3253173fc802b9fa62bd9afab2ab97fe09 Dean Strelau dean@strelau.net http://github.com/mleung/feather/commit/41be02ea6a26193d5dfee02e71b2b67f0b69edb4 41be02ea6a26193d5dfee02e71b2b67f0b69edb4 2008-06-27T14:05:35-07:00 2008-06-27T14:05:35-07:00 Un-set published_at and permalink when un-publishing an Article. d8da107104a69eede72c5573f0b2ad39ba0b947f Dean Strelau dean@strelau.net b38aecb1fbcc97c8fcd580b3fb6b5bab987bba27 Dean Strelau dean@strelau.net http://github.com/mleung/feather/commit/cd979c3253173fc802b9fa62bd9afab2ab97fe09 cd979c3253173fc802b9fa62bd9afab2ab97fe09 2008-06-26T21:06:46-07:00 2008-06-26T21:06:46-07:00 Cleaned up setting the :published attribute * No more Article#is_published. Just use the built-in #published? 2d69b8b52db8e9cf4f919d420245d71dd92c2170 Dean Strelau dean@strelau.net 25a0b3710ed0bafdfadd10ec29030f0aa76efc4f Dean Strelau dean@strelau.net http://github.com/mleung/feather/commit/b38aecb1fbcc97c8fcd580b3fb6b5bab987bba27 b38aecb1fbcc97c8fcd580b3fb6b5bab987bba27 2008-06-26T20:55:26-07:00 2008-06-26T20:55:26-07:00 Static files should be served through merb by default. f13e558eb78a2c9bd7bd37cd6fa85432eb955394 Dean Strelau dean@strelau.net b046b684dc92353bbbaa81715c948853adff6687 7bc4c5be0eae82339c0d33be5e790713c14a9af1 El Draper el@eldiablo.co.uk http://github.com/mleung/feather/commit/25a0b3710ed0bafdfadd10ec29030f0aa76efc4f 25a0b3710ed0bafdfadd10ec29030f0aa76efc4f 2008-06-24T14:55:48-07:00 2008-06-24T14:55:48-07:00 Merge branch 'master' of git://github.com/ivey/feather into ivey/master 828f3564a28151cc108fb729b23758dee6812a9b El Draper el@eldiablo.co.uk 5a0d6a4db28b15d010057ad7907d89acb74d0fbc El Draper el@eldiablo.co.uk http://github.com/mleung/feather/commit/b046b684dc92353bbbaa81715c948853adff6687 b046b684dc92353bbbaa81715c948853adff6687 2008-06-24T14:51:03-07:00 2008-06-24T14:51:03-07:00 adding session table to database setup 7b7da7d3341caf91193ec698cefb9a5cb8886848 El Draper el@eldiablo.co.uk 06f99deb3bd728836404c117e559ecd84780a8ef El Draper el@eldiablo.co.uk http://github.com/mleung/feather/commit/5a0d6a4db28b15d010057ad7907d89acb74d0fbc 5a0d6a4db28b15d010057ad7907d89acb74d0fbc 2008-06-24T14:46:20-07:00 2008-06-24T14:46:20-07:00 removing debugging statement f173347fc1995f08b4cc0a284ad51890e6247222 El Draper el@eldiablo.co.uk 6d3575f18f1c2b080c5965c7f173883d9ed045d1 222e6ba6750bc76466873965f2c49d24d7c6385b El Draper el@eldiablo.co.uk http://github.com/mleung/feather/commit/06f99deb3bd728836404c117e559ecd84780a8ef 06f99deb3bd728836404c117e559ecd84780a8ef 2008-06-24T14:41:05-07:00 2008-06-24T14:41:05-07:00 Merge branch 'junglist' of git://github.com/fujin/feather into fujin/junglist 6bd7c8ff52ff72c283e8d78464c03a366ab9d06e El Draper el@eldiablo.co.uk 8dd5f85add347863e548dc49ddd25638c563e8af Nolan Darilek nolan@thewordnerd.info http://github.com/mleung/feather/commit/7ab429a1d723c3ad933d2f45d348bf624de57f3c 7ab429a1d723c3ad933d2f45d348bf624de57f3c 2008-06-24T09:29:54-07:00 2008-06-24T09:29:54-07:00 Ported user display/edit functionality to merb-auth. d3f3e4be30c06676fcc0089e0802bfb8fa333011 Nolan Darilek nolan@thewordnerd.info 10d2f27a0dd9740ddf836e0dc75db7d577d9add9 Nolan Darilek nolan@thewordnerd.info http://github.com/mleung/feather/commit/8dd5f85add347863e548dc49ddd25638c563e8af 8dd5f85add347863e548dc49ddd25638c563e8af 2008-06-24T08:44:29-07:00 2008-06-24T08:44:29-07:00 Remove call to ruby-debugger. b6a0ee420802e3d3bf040b46658515f024b9ad1a Nolan Darilek nolan@thewordnerd.info 749739aaa25ec4ae3dcc43f222ec1ec680995246 Nolan Darilek nolan@thewordnerd.info http://github.com/mleung/feather/commit/10d2f27a0dd9740ddf836e0dc75db7d577d9add9 10d2f27a0dd9740ddf836e0dc75db7d577d9add9 2008-06-24T08:40:52-07:00 2008-06-24T08:40:52-07:00 Committed autotest code. 1b0f81675d8ee891510ea1f42108a95ddeb28e61 Nolan Darilek nolan@thewordnerd.info