another.txt

# I deleted this...

commit 94915c43fbe47e3a0f7dbb81affdd0106ba4a72c
Author: Daniel <znowm4n@gmail.com>
Date:   Tue Jul 5 20:56:23 2011 +0200

    update

diff --git a/app/views/layouts/_menu.haml b/app/views/layouts/_menu.haml
index 0a4d03f..8ea6eff 100644
--- a/app/views/layouts/_menu.haml
+++ b/app/views/layouts/_menu.haml
@@ -35,7 +35,7 @@
       %ul.submenu
         - Gallery.all.each do |gallery|
           %li
-            = link_to gallery.title, gallery
+            = link_to gallery.name, gallery
     %li
       = link_to 'Kontakt', contact_path

gistfile1.txt

* 94915c4 update
*   4fcf8c2 Merge pull request #4 from bsodmike/development
|\
| * eec5c0a updated css for freely moving container
* |   1966a99 Merge pull request #3 from bsodmike/development
|\ \
| |/
| * a02c525 undo unnecessary migration for start field; added virtual attribute
| * 888c464 completed skinning of calendar
|/
* dc7651f figured out HAML link_to issue with carrierwave; .kill templates are l
*   9ddce66 Merge pull request #1 from bsodmike/development
|\
| * 9e45eff fix lightbox issue and add missing migration for images
|/
* 218dbf0 update routes for removal of feeds controller
* ea79b6f refactor json feed for events calendar
* bf8f887 basic calendar integration, lot more work needed
* aefc06b update
* 66b6851 update
* 6ba78d7 updated css
* 60bf17a update
* 98c9969 update
* 4d340dd updated news, so it works... trying to fix calendar
* 08a1963 updated views to be danish, updated design structure - css/templates
* 4da0e17 updated stylesheet and structure
* b761fd1 updated alot of stuff
* 9753bd4 updated alot of stuff
* bf321d0 added validations in models, starting to workout design structure from
* ee87aaa update
* 513e7b2 updated stylesheet, gallery index/show view, static pages
* 2b571eb updated gallery index, updated program pages - without content TBD
* 7bd2dda update
* 408ecc6 updated gemfile
* 4299953 updated gemfile
* d4b248e updated gemfile
*   03547bd update
|\
| * 72b042c update
| * 1870fb9 fixed pages model, so pages will be defined in the pages model from
| * 3efd878 updated menu with submenus on hover stuff, implementing pages model
| * 980b0df updated gems with rspec and cucumber
* | 5b20775 d
|/
* 53523a7 fixed forms, added simple admin menu, tried to implement lightbox, but
* 0a78975 update
* f055925 update
* 39dfe69 fixed image upload with gallery connected
* 37522c6 updated image/gallery stuff
* 0c74445 refactored scaffold controllers, fixed image/gallery relations
* 4fbd70b update
* dbc87ce updated
* bd642ea update
* c6a1855 update